GDBserver: Pass process_info pointer to target_detach and target_join

[deliverable/binutils-gdb.git] / gdb / gdbserver / nto-low.c

diff --git a/gdb/gdbserver/nto-low.c b/gdb/gdbserver/nto-low.c
index ed2842654270b80ad516f110ec81ae322d5d07d3..05ab6fc4edf9d44b667cd1a896586bc4d8e99deb 100644 (file)
--- a/gdb/gdbserver/nto-low.c
+++ b/gdb/gdbserver/nto-low.c
@@ -91,13 +91,13 @@ nto_set_thread (ptid_t ptid)
 {
   int res = 0;
 
-  TRACE ("%s pid: %d tid: %ld\n", __func__, ptid_get_pid (ptid),
-        ptid_get_lwp (ptid));
+  TRACE ("%s pid: %d tid: %ld\n", __func__, ptid.pid (),
+        ptid.lwp ());
   if (nto_inferior.ctl_fd != -1
-      && !ptid_equal (ptid, null_ptid)
-      && !ptid_equal (ptid, minus_one_ptid))
+      && ptid != null_ptid
+      && ptid != minus_one_ptid)
     {
-      pthread_t tid = ptid_get_lwp (ptid);
+      pthread_t tid = ptid.lwp ();
 
       if (EOK == devctl (nto_inferior.ctl_fd, DCMD_PROC_CURTHREAD, &tid,
          sizeof (tid), 0))
@@ -213,7 +213,7 @@ do_attach (pid_t pid)
       proc = add_process (status.pid, 1);
       proc->tdesc = nto_tdesc;
       TRACE ("Adding thread: pid=%d tid=%ld\n", status.pid,
-            ptid_get_lwp (ptid));
+            ptid.lwp ());
       nto_find_new_threads (&nto_inferior);
     }
   else
@@ -408,9 +408,9 @@ nto_kill (int pid)
 /* Detach from process PID.  */
 
 static int
-nto_detach (int pid)
+nto_detach (process_info *proc)
 {
-  TRACE ("%s %d\n", __func__, pid);
+  TRACE ("%s %d\n", __func__, proc->pid);
   do_detach ();
   return 0;
 }
@@ -430,9 +430,9 @@ nto_thread_alive (ptid_t ptid)
 {
   int res;
 
-  TRACE ("%s pid:%d tid:%d\n", __func__, ptid_get_pid (ptid),
-        ptid_get_lwp (ptid));
-  if (SignalKill (0, ptid_get_pid (ptid), ptid_get_lwp (ptid),
+  TRACE ("%s pid:%d tid:%d\n", __func__, ptid.pid (),
+        ptid.lwp ());
+  if (SignalKill (0, ptid.pid (), ptid.lwp (),
                  0, 0, 0) == -1)
     res = 0;
   else
@@ -582,7 +582,7 @@ nto_wait (ptid_t ptid,
            int waitval = 0;
 
            TRACE ("  TERMINATED\n");
-           waitpid (ptid_get_pid (ptid), &waitval, WNOHANG);
+           waitpid (ptid.pid (), &waitval, WNOHANG);
            if (nto_inferior.exit_signo)
              {
                /* Abnormal death.  */