diff options
Diffstat (limited to 'gdb/linux-fork.c')
| -rw-r--r-- | gdb/linux-fork.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index ef9015d..4b7e177 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -83,14 +83,14 @@ add_fork (pid_t pid) { struct fork_info *fp; - if (fork_list == NULL && pid != ptid_get_pid (inferior_ptid)) + if (fork_list == NULL && pid != inferior_ptid.pid ()) { /* Special case -- if this is the first fork in the list (the list is hitherto empty), and if this new fork is NOT the current inferior_ptid, then add inferior_ptid first, as a special zeroeth fork id. */ highest_fork_num = -1; - add_fork (ptid_get_pid (inferior_ptid)); /* safe recursion */ + add_fork (inferior_ptid.pid ()); /* safe recursion */ } fp = XCNEW (struct fork_info); @@ -141,7 +141,7 @@ delete_fork (ptid_t ptid) fpprev = NULL; - linux_target->low_forget_process (ptid_get_pid (ptid)); + linux_target->low_forget_process (ptid.pid ()); for (fp = fork_list; fp; fpprev = fp, fp = fp->next) if (ptid_equal (fp->ptid, ptid)) @@ -203,7 +203,7 @@ find_fork_pid (pid_t pid) struct fork_info *fp; for (fp = fork_list; fp; fp = fp->next) - if (pid == ptid_get_pid (fp->ptid)) + if (pid == fp->ptid.pid ()) return fp; return NULL; @@ -305,7 +305,7 @@ fork_save_infrun_state (struct fork_info *fp, int clobber_regs) /* Now save the 'state' (file position) of all open file descriptors. Unfortunately fork does not take care of that for us... */ snprintf (path, PATH_MAX, "/proc/%ld/fd", - (long) ptid_get_pid (fp->ptid)); + (long) fp->ptid.pid ()); if ((d = opendir (path)) != NULL) { long tmp; @@ -355,7 +355,7 @@ linux_fork_killall (void) for (fp = fork_list; fp; fp = fp->next) { - pid = ptid_get_pid (fp->ptid); + pid = fp->ptid.pid (); do { /* Use SIGKILL instead of PTRACE_KILL because the former works even if the thread is running, while the later doesn't. */ @@ -383,7 +383,7 @@ linux_fork_mourn_inferior (void) Do not check whether this succeeds though, since we may be dealing with a process that we attached to. Such a process will only report its exit status to its original parent. */ - waitpid (ptid_get_pid (inferior_ptid), &status, 0); + waitpid (inferior_ptid.pid (), &status, 0); /* OK, presumably inferior_ptid is the one who has exited. We need to delete that one from the fork_list, and switch @@ -416,7 +416,7 @@ linux_fork_detach (int from_tty) delete it from the fork_list, and switch to the next available fork. */ - if (ptrace (PTRACE_DETACH, ptid_get_pid (inferior_ptid), 0, 0)) + if (ptrace (PTRACE_DETACH, inferior_ptid.pid (), 0, 0)) error (_("Unable to detach %s"), target_pid_to_str (inferior_ptid)); delete_fork (inferior_ptid); @@ -522,7 +522,7 @@ delete_checkpoint_command (const char *args, int from_tty) error (_("\ Please switch to another checkpoint before deleting the current one")); - if (ptrace (PTRACE_KILL, ptid_get_pid (ptid), 0, 0)) + if (ptrace (PTRACE_KILL, ptid.pid (), 0, 0)) error (_("Unable to kill pid %s"), target_pid_to_str (ptid)); fi = find_fork_ptid (ptid); @@ -542,7 +542,7 @@ Please switch to another checkpoint before deleting the current one")); if ((parent == NULL && find_fork_ptid (pptid)) || (parent != NULL && parent->state == THREAD_STOPPED)) { - if (inferior_call_waitpid (pptid, ptid_get_pid (ptid))) + if (inferior_call_waitpid (pptid, ptid.pid ())) warning (_("Unable to wait pid %s"), target_pid_to_str (ptid)); } } @@ -563,7 +563,7 @@ detach_checkpoint_command (const char *args, int from_tty) error (_("\ Please switch to another checkpoint before detaching the current one")); - if (ptrace (PTRACE_DETACH, ptid_get_pid (ptid), 0, 0)) + if (ptrace (PTRACE_DETACH, ptid.pid (), 0, 0)) error (_("Unable to detach %s"), target_pid_to_str (ptid)); if (from_tty) @@ -649,7 +649,7 @@ inf_has_multiple_thread_cb (struct thread_info *tp, void *data) { int *count_p = (int *) data; - if (current_inferior ()->pid == ptid_get_pid (tp->ptid)) + if (current_inferior ()->pid == tp->ptid.pid ()) (*count_p)++; /* Stop the iteration if multiple threads have been detected. */ @@ -702,7 +702,7 @@ checkpoint_command (const char *args, int from_tty) /* Tell linux-nat.c that we're checkpointing this inferior. */ { scoped_restore save_pid - = make_scoped_restore (&checkpointing_pid, ptid_get_pid (inferior_ptid)); + = make_scoped_restore (&checkpointing_pid, inferior_ptid.pid ()); ret = call_function_by_hand (fork_fn, NULL, 0, &ret); } @@ -725,7 +725,7 @@ checkpoint_command (const char *args, int from_tty) { parent_pid = ptid_get_lwp (last_target_ptid); if (parent_pid == 0) - parent_pid = ptid_get_pid (last_target_ptid); + parent_pid = last_target_ptid.pid (); printf_filtered (_(" gdb says parent = %ld.\n"), (long) parent_pid); } |