X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Finf-ttrace.c;h=2eec951c2185069dae879e44cc49d1981112f54b;hb=9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763;hp=b34e02e4607521eec714daf8a79b54a30f732d95;hpb=7f9f62ba187205cd123fd2e96909e6d19ad708eb;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/inf-ttrace.c b/gdb/inf-ttrace.c index b34e02e460..2eec951c21 100644 --- a/gdb/inf-ttrace.c +++ b/gdb/inf-ttrace.c @@ -1,6 +1,6 @@ /* Low-level child interface to ttrace. - Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2004-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -27,19 +27,19 @@ #include "gdbcore.h" #include "gdbthread.h" #include "inferior.h" +#include "terminal.h" #include "target.h" #include "gdb_assert.h" -#include "gdb_string.h" +#include #include #include #include #include "inf-child.h" #include "inf-ttrace.h" +#include "common/filestuff.h" -/* HACK: Save the ttrace ops returned by inf_ttrace_target. */ -static struct target_ops *ttrace_ops_hack; /* HP-UX uses a threading model where each user-space thread @@ -195,7 +195,7 @@ inf_ttrace_add_page (pid_t pid, CORE_ADDR addr) addr, 0, (uintptr_t)&prot) == -1) perror_with_name (("ttrace")); - page = XMALLOC (struct inf_ttrace_page); + page = XNEW (struct inf_ttrace_page); page->addr = addr; page->prot = prot; page->refcount = 0; @@ -314,7 +314,8 @@ inf_ttrace_disable_page_protections (pid_t pid) type TYPE. */ static int -inf_ttrace_insert_watchpoint (CORE_ADDR addr, int len, int type) +inf_ttrace_insert_watchpoint (CORE_ADDR addr, int len, int type, + struct expression *cond) { const int pagesize = inf_ttrace_page_dict.pagesize; pid_t pid = ptid_get_pid (inferior_ptid); @@ -337,7 +338,8 @@ inf_ttrace_insert_watchpoint (CORE_ADDR addr, int len, int type) type TYPE. */ static int -inf_ttrace_remove_watchpoint (CORE_ADDR addr, int len, int type) +inf_ttrace_remove_watchpoint (CORE_ADDR addr, int len, int type, + struct expression *cond) { const int pagesize = inf_ttrace_page_dict.pagesize; pid_t pid = ptid_get_pid (inferior_ptid); @@ -407,30 +409,19 @@ inf_ttrace_stopped_by_watchpoint (void) static pid_t inf_ttrace_vfork_ppid = -1; static int -inf_ttrace_follow_fork (struct target_ops *ops, int follow_child) +inf_ttrace_follow_fork (struct target_ops *ops, int follow_child, + int detach_fork) { pid_t pid, fpid; lwpid_t lwpid, flwpid; ttstate_t tts; - struct thread_info *last_tp = NULL; - struct breakpoint *step_resume_breakpoint = NULL; - CORE_ADDR step_range_start = 0, step_range_end = 0; - struct frame_id step_frame_id = null_frame_id; - - /* FIXME: kettenis/20050720: This stuff should really be passed as - an argument by our caller. */ - { - ptid_t ptid; - struct target_waitstatus status; - - get_last_target_status (&ptid, &status); - gdb_assert (status.kind == TARGET_WAITKIND_FORKED - || status.kind == TARGET_WAITKIND_VFORKED); - - pid = ptid_get_pid (ptid); - lwpid = ptid_get_lwp (ptid); - last_tp = find_thread_pid (ptid); - } + struct thread_info *tp = inferior_thread (); + + gdb_assert (tp->pending_follow.kind == TARGET_WAITKIND_FORKED + || tp->pending_follow.kind == TARGET_WAITKIND_VFORKED); + + pid = ptid_get_pid (inferior_ptid); + lwpid = ptid_get_lwp (inferior_ptid); /* Get all important details that core GDB doesn't (and shouldn't) know about. */ @@ -457,32 +448,37 @@ inf_ttrace_follow_fork (struct target_ops *ops, int follow_child) if (follow_child) { - /* Copy user stepping state to the new inferior thread. */ - step_resume_breakpoint = last_tp->step_resume_breakpoint; - step_range_start = last_tp->step_range_start; - step_range_end = last_tp->step_range_end; - step_frame_id = last_tp->step_frame_id; + struct inferior *inf; + struct inferior *parent_inf; - /* Otherwise, deleting the parent would get rid of this - breakpoint. */ - last_tp->step_resume_breakpoint = NULL; + parent_inf = find_inferior_pid (pid); inferior_ptid = ptid_build (fpid, flwpid, 0); - add_inferior (fpid); - detach_breakpoints (pid); + inf = add_inferior (fpid); + inf->attach_flag = parent_inf->attach_flag; + inf->pspace = parent_inf->pspace; + inf->aspace = parent_inf->aspace; + copy_terminal_info (inf, parent_inf); + detach_breakpoints (ptid_build (pid, lwpid, 0)); target_terminal_ours (); - fprintf_unfiltered (gdb_stdlog, _("\ -Attaching after fork to child process %ld.\n"), (long)fpid); + fprintf_unfiltered (gdb_stdlog, + _("Attaching after fork to child process %ld.\n"), + (long)fpid); } else { inferior_ptid = ptid_build (pid, lwpid, 0); - detach_breakpoints (fpid); + /* Detach any remaining breakpoints in the child. In the case + of fork events, we do not need to do this, because breakpoints + should have already been removed earlier. */ + if (tts.tts_event == TTEVT_VFORK) + detach_breakpoints (ptid_build (fpid, flwpid, 0)); target_terminal_ours (); - fprintf_unfiltered (gdb_stdlog, _("\ -Detaching after fork from child process %ld.\n"), (long)fpid); + fprintf_unfiltered (gdb_stdlog, + _("Detaching after fork from child process %ld.\n"), + (long)fpid); } if (tts.tts_event == TTEVT_VFORK) @@ -546,14 +542,6 @@ Detaching after fork from child process %ld.\n"), (long)fpid); xmalloc (sizeof (struct inf_ttrace_private_thread_info)); memset (ti->private, 0, sizeof (struct inf_ttrace_private_thread_info)); - - ti->step_resume_breakpoint = step_resume_breakpoint; - ti->step_range_start = step_range_start; - ti->step_range_end = step_range_end; - ti->step_frame_id = step_frame_id; - - /* Reset breakpoints in the child as appropriate. */ - follow_inferior_reset_breakpoints (); } return 0; @@ -572,6 +560,11 @@ do_cleanup_pfds (void *dummy) close (inf_ttrace_pfd1[1]); close (inf_ttrace_pfd2[0]); close (inf_ttrace_pfd2[1]); + + unmark_fd_no_cloexec (inf_ttrace_pfd1[0]); + unmark_fd_no_cloexec (inf_ttrace_pfd1[1]); + unmark_fd_no_cloexec (inf_ttrace_pfd2[0]); + unmark_fd_no_cloexec (inf_ttrace_pfd2[1]); } static void @@ -586,6 +579,11 @@ inf_ttrace_prepare (void) close (inf_ttrace_pfd2[0]); perror_with_name (("pipe")); } + + mark_fd_no_cloexec (inf_ttrace_pfd1[0]); + mark_fd_no_cloexec (inf_ttrace_pfd1[1]); + mark_fd_no_cloexec (inf_ttrace_pfd2[0]); + mark_fd_no_cloexec (inf_ttrace_pfd2[1]); } /* Prepare to be traced. */ @@ -614,7 +612,7 @@ inf_ttrace_me (void) /* Start tracing PID. */ static void -inf_ttrace_him (int pid) +inf_ttrace_him (struct target_ops *ops, int pid) { struct cleanup *old_chain = make_cleanup (do_cleanup_pfds, 0); ttevent_t tte; @@ -642,18 +640,8 @@ inf_ttrace_him (int pid) do_cleanups (old_chain); - push_target (ttrace_ops_hack); - - /* On some targets, there must be some explicit synchronization - between the parent and child processes after the debugger forks, - and before the child execs the debuggee program. This call - basically gives permission for the child to exec. */ - - target_acknowledge_created_inferior (pid); + push_target (ops); - /* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h, and will - be 1 or 2 depending on whether we're starting without or with a - shell. */ startup_inferior (START_INFERIOR_TRAPS_EXPECTED); /* On some targets, there must be some explicit actions taken after @@ -662,21 +650,25 @@ inf_ttrace_him (int pid) } static void -inf_ttrace_create_inferior (char *exec_file, char *allargs, char **env, - int from_tty) +inf_ttrace_create_inferior (struct target_ops *ops, char *exec_file, + char *allargs, char **env, int from_tty) { + int pid; + gdb_assert (inf_ttrace_num_lwps == 0); gdb_assert (inf_ttrace_num_lwps_in_syscall == 0); gdb_assert (inf_ttrace_page_dict.count == 0); gdb_assert (inf_ttrace_reenable_page_protections == 0); gdb_assert (inf_ttrace_vfork_ppid == -1); - fork_inferior (exec_file, allargs, env, inf_ttrace_me, inf_ttrace_him, - inf_ttrace_prepare, NULL); + pid = fork_inferior (exec_file, allargs, env, inf_ttrace_me, NULL, + inf_ttrace_prepare, NULL, NULL); + + inf_ttrace_him (ops, pid); } static void -inf_ttrace_mourn_inferior (void) +inf_ttrace_mourn_inferior (struct target_ops *ops) { const int num_buckets = ARRAY_SIZE (inf_ttrace_page_dict.buckets); int bucket; @@ -699,25 +691,66 @@ inf_ttrace_mourn_inferior (void) } inf_ttrace_page_dict.count = 0; - unpush_target (ttrace_ops_hack); + unpush_target (ops); generic_mourn_inferior (); } +/* Assuming we just attached the debugger to a new inferior, create + a new thread_info structure for each thread, and add it to our + list of threads. */ + static void -inf_ttrace_attach (char *args, int from_tty) +inf_ttrace_create_threads_after_attach (int pid) +{ + int status; + ptid_t ptid; + ttstate_t tts; + struct thread_info *ti; + + status = ttrace (TT_PROC_GET_FIRST_LWP_STATE, pid, 0, + (uintptr_t) &tts, sizeof (ttstate_t), 0); + if (status < 0) + perror_with_name (_("TT_PROC_GET_FIRST_LWP_STATE ttrace call failed")); + gdb_assert (tts.tts_pid == pid); + + /* Add the stopped thread. */ + ptid = ptid_build (pid, tts.tts_lwpid, 0); + ti = add_thread (ptid); + ti->private = xzalloc (sizeof (struct inf_ttrace_private_thread_info)); + inf_ttrace_num_lwps++; + + /* We use the "first stopped thread" as the currently active thread. */ + inferior_ptid = ptid; + + /* Iterative over all the remaining threads. */ + + for (;;) + { + ptid_t ptid; + + status = ttrace (TT_PROC_GET_NEXT_LWP_STATE, pid, 0, + (uintptr_t) &tts, sizeof (ttstate_t), 0); + if (status < 0) + perror_with_name (_("TT_PROC_GET_NEXT_LWP_STATE ttrace call failed")); + if (status == 0) + break; /* End of list. */ + + ptid = ptid_build (tts.tts_pid, tts.tts_lwpid, 0); + ti = add_thread (ptid); + ti->private = xzalloc (sizeof (struct inf_ttrace_private_thread_info)); + inf_ttrace_num_lwps++; + } +} + +static void +inf_ttrace_attach (struct target_ops *ops, char *args, int from_tty) { char *exec_file; pid_t pid; - char *dummy; ttevent_t tte; + struct inferior *inf; - if (!args) - error_no_arg (_("process-id to attach")); - - dummy = args; - pid = strtol (args, &dummy, 0); - if (pid == 0 && args == dummy) - error (_("Illegal process-id: %s."), args); + pid = parse_pid_to_attach (args); if (pid == getpid ()) /* Trying to masturbate? */ error (_("I refuse to debug myself!")); @@ -742,9 +775,10 @@ inf_ttrace_attach (char *args, int from_tty) if (ttrace (TT_PROC_ATTACH, pid, 0, TT_KILL_ON_EXIT, TT_VERSION, 0) == -1) perror_with_name (("ttrace")); - attach_flag = 1; - add_inferior (pid); + inf = current_inferior (); + inferior_appeared (inf, pid); + inf->attach_flag = 1; /* Set the initial event mask. */ memset (&tte, 0, sizeof (tte)); @@ -758,17 +792,13 @@ inf_ttrace_attach (char *args, int from_tty) (uintptr_t)&tte, sizeof tte, 0) == -1) perror_with_name (("ttrace")); - push_target (ttrace_ops_hack); + push_target (ops); - /* We'll bump inf_ttrace_num_lwps up and add the private data to the - thread as soon as we get to inf_ttrace_wait. At this point, we - don't have lwpid info yet. */ - inferior_ptid = pid_to_ptid (pid); - add_thread_silent (inferior_ptid); + inf_ttrace_create_threads_after_attach (pid); } static void -inf_ttrace_detach (char *args, int from_tty) +inf_ttrace_detach (struct target_ops *ops, const char *args, int from_tty) { pid_t pid = ptid_get_pid (inferior_ptid); int sig = 0; @@ -803,11 +833,11 @@ inf_ttrace_detach (char *args, int from_tty) inferior_ptid = null_ptid; detach_inferior (pid); - unpush_target (ttrace_ops_hack); + unpush_target (ops); } static void -inf_ttrace_kill (void) +inf_ttrace_kill (struct target_ops *ops) { pid_t pid = ptid_get_pid (inferior_ptid); @@ -886,11 +916,12 @@ inf_ttrace_resume_callback (struct thread_info *info, void *arg) } static void -inf_ttrace_resume (ptid_t ptid, int step, enum target_signal signal) +inf_ttrace_resume (struct target_ops *ops, + ptid_t ptid, int step, enum gdb_signal signal) { int resume_all; ttreq_t request = step ? TT_LWP_SINGLE : TT_LWP_CONTINUE; - int sig = target_signal_to_host (signal); + int sig = gdb_signal_to_host (signal); struct thread_info *info; /* A specific PTID means `step only this process id'. */ @@ -901,7 +932,7 @@ inf_ttrace_resume (ptid_t ptid, int step, enum target_signal signal) if (resume_all) ptid = inferior_ptid; - info = find_thread_pid (ptid); + info = find_thread_ptid (ptid); inf_ttrace_resume_lwp (info, request, sig); if (resume_all) @@ -910,7 +941,8 @@ inf_ttrace_resume (ptid_t ptid, int step, enum target_signal signal) } static ptid_t -inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) +inf_ttrace_wait (struct target_ops *ops, + ptid_t ptid, struct target_waitstatus *ourstatus, int options) { pid_t pid = ptid_get_pid (ptid); lwpid_t lwpid = ptid_get_lwp (ptid); @@ -929,7 +961,6 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) do { set_sigint_trap (); - set_sigio_trap (); if (ttrace_wait (pid, lwpid, TTRACE_WAITOK, &tts, sizeof tts) == -1) perror_with_name (("ttrace_wait")); @@ -948,7 +979,6 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) tts.tts_event = TTEVT_NONE; } - clear_sigio_trap (); clear_sigint_trap (); } while (tts.tts_event == TTEVT_NONE); @@ -975,7 +1005,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) /* We haven't set the private member on the main thread yet. Do it now. */ - ti = find_thread_pid (inferior_ptid); + ti = find_thread_ptid (inferior_ptid); gdb_assert (ti != NULL && ti->private == NULL); ti->private = xmalloc (sizeof (struct inf_ttrace_private_thread_info)); @@ -993,7 +1023,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) case TTEVT_BPT_SSTEP: /* Make it look like a breakpoint. */ ourstatus->kind = TARGET_WAITKIND_STOPPED; - ourstatus->value.sig = TARGET_SIGNAL_TRAP; + ourstatus->value.sig = GDB_SIGNAL_TRAP; break; #endif @@ -1076,7 +1106,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) case TTEVT_LWP_EXIT: if (print_thread_events) printf_unfiltered (_("[%s exited]\n"), target_pid_to_str (ptid)); - ti = find_thread_pid (ptid); + ti = find_thread_ptid (ptid); gdb_assert (ti != NULL); ((struct inf_ttrace_private_thread_info *)ti->private)->dying = 1; inf_ttrace_num_lwps--; @@ -1093,7 +1123,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) if (print_thread_events) printf_unfiltered(_("[%s has been terminated]\n"), target_pid_to_str (ptid)); - ti = find_thread_pid (ptid); + ti = find_thread_ptid (ptid); gdb_assert (ti != NULL); ((struct inf_ttrace_private_thread_info *)ti->private)->dying = 1; inf_ttrace_num_lwps--; @@ -1109,7 +1139,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) case TTEVT_SIGNAL: ourstatus->kind = TARGET_WAITKIND_STOPPED; ourstatus->value.sig = - target_signal_from_host (tts.tts_u.tts_signal.tts_signo); + gdb_signal_from_host (tts.tts_u.tts_signal.tts_signo); break; case TTEVT_SYSCALL_ENTRY: @@ -1122,7 +1152,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) inf_ttrace_disable_page_protections (tts.tts_pid); } ourstatus->kind = TARGET_WAITKIND_SYSCALL_ENTRY; - ourstatus->value.syscall_id = tts.tts_scno; + ourstatus->value.syscall_number = tts.tts_scno; break; case TTEVT_SYSCALL_RETURN: @@ -1137,7 +1167,7 @@ inf_ttrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus) inf_ttrace_num_lwps_in_syscall--; } ourstatus->kind = TARGET_WAITKIND_SYSCALL_RETURN; - ourstatus->value.syscall_id = tts.tts_scno; + ourstatus->value.syscall_number = tts.tts_scno; break; default: @@ -1192,27 +1222,38 @@ inf_ttrace_xfer_memory (CORE_ADDR addr, ULONGEST len, return len; } -static LONGEST +static enum target_xfer_status inf_ttrace_xfer_partial (struct target_ops *ops, enum target_object object, const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, ULONGEST offset, LONGEST len) + const gdb_byte *writebuf, + ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { switch (object) { case TARGET_OBJECT_MEMORY: - return inf_ttrace_xfer_memory (offset, len, readbuf, writebuf); + { + LONGEST val = inf_ttrace_xfer_memory (offset, len, readbuf, writebuf); + + if (val == 0) + return TARGET_XFER_EOF; + else + { + *xfered_len = (ULONGEST) val; + return TARGET_XFER_OK; + } + } case TARGET_OBJECT_UNWIND_TABLE: - return -1; + return TARGET_XFER_E_IO; case TARGET_OBJECT_AUXV: - return -1; + return TARGET_XFER_E_IO; case TARGET_OBJECT_WCOOKIE: - return -1; + return TARGET_XFER_E_IO; default: - return -1; + return TARGET_XFER_E_IO; } } @@ -1221,13 +1262,14 @@ inf_ttrace_xfer_partial (struct target_ops *ops, enum target_object object, static void inf_ttrace_files_info (struct target_ops *ignore) { + struct inferior *inf = current_inferior (); printf_filtered (_("\tUsing the running image of %s %s.\n"), - attach_flag ? "attached" : "child", + inf->attach_flag ? "attached" : "child", target_pid_to_str (inferior_ptid)); } static int -inf_ttrace_thread_alive (ptid_t ptid) +inf_ttrace_thread_alive (struct target_ops *ops, ptid_t ptid) { return 1; } @@ -1248,7 +1290,7 @@ inf_ttrace_extra_thread_info (struct thread_info *info) } static char * -inf_ttrace_pid_to_str (ptid_t ptid) +inf_ttrace_pid_to_str (struct target_ops *ops, ptid_t ptid) { pid_t pid = ptid_get_pid (ptid); lwpid_t lwpid = ptid_get_lwp (ptid); @@ -1264,6 +1306,15 @@ inf_ttrace_pid_to_str (ptid_t ptid) } +/* Implement the get_ada_task_ptid target_ops method. */ + +static ptid_t +inf_ttrace_get_ada_task_ptid (long lwp, long thread) +{ + return ptid_build (ptid_get_pid (inferior_ptid), lwp, 0); +} + + struct target_ops * inf_ttrace_target (void) { @@ -1288,15 +1339,15 @@ inf_ttrace_target (void) t->to_extra_thread_info = inf_ttrace_extra_thread_info; t->to_pid_to_str = inf_ttrace_pid_to_str; t->to_xfer_partial = inf_ttrace_xfer_partial; + t->to_get_ada_task_ptid = inf_ttrace_get_ada_task_ptid; - ttrace_ops_hack = t; return t; } #endif /* Prevent warning from -Wmissing-prototypes. */ -void _initialize_hppa_hpux_nat (void); +void _initialize_inf_ttrace (void); void _initialize_inf_ttrace (void)