X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Finf-ttrace.c;h=511a67cbcbc3e59300bcb2b2d16539a123de627c;hb=21ff46861c35d99dbbafc42d0854128270ef8f30;hp=ffec586ed923215baf7953a6eb79acca017fa22d;hpb=e58b0e63bb0a42e99f6fb1e6d697a1b29caa02c2;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/inf-ttrace.c b/gdb/inf-ttrace.c index ffec586ed9..511a67cbcb 100644 --- a/gdb/inf-ttrace.c +++ b/gdb/inf-ttrace.c @@ -1,7 +1,6 @@ /* Low-level child interface to ttrace. - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 - Free Software Foundation, Inc. + Copyright (C) 2004-2013 Free Software Foundation, Inc. This file is part of GDB. @@ -39,6 +38,7 @@ #include "inf-child.h" #include "inf-ttrace.h" +#include "common/filestuff.h" @@ -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); @@ -453,21 +455,29 @@ inf_ttrace_follow_fork (struct target_ops *ops, int follow_child) inferior_ptid = ptid_build (fpid, flwpid, 0); 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 (pid); + 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) @@ -549,6 +559,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 @@ -563,6 +578,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. */ @@ -621,13 +641,6 @@ inf_ttrace_him (struct target_ops *ops, int pid) push_target (ops); - /* 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); - /* 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. */ @@ -651,7 +664,7 @@ inf_ttrace_create_inferior (struct target_ops *ops, char *exec_file, gdb_assert (inf_ttrace_vfork_ppid == -1); pid = fork_inferior (exec_file, allargs, env, inf_ttrace_me, NULL, - inf_ttrace_prepare, NULL); + inf_ttrace_prepare, NULL, NULL); inf_ttrace_him (ops, pid); } @@ -684,22 +697,62 @@ inf_ttrace_mourn_inferior (struct target_ops *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_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!")); @@ -725,7 +778,8 @@ inf_ttrace_attach (struct target_ops *ops, char *args, int from_tty) if (ttrace (TT_PROC_ATTACH, pid, 0, TT_KILL_ON_EXIT, TT_VERSION, 0) == -1) perror_with_name (("ttrace")); - inf = add_inferior (pid); + inf = current_inferior (); + inferior_appeared (inf, pid); inf->attach_flag = 1; /* Set the initial event mask. */ @@ -742,11 +796,7 @@ inf_ttrace_attach (struct target_ops *ops, char *args, int from_tty) 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 @@ -869,11 +919,11 @@ inf_ttrace_resume_callback (struct thread_info *info, void *arg) static void inf_ttrace_resume (struct target_ops *ops, - ptid_t ptid, int step, enum target_signal signal) + 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'. */ @@ -884,7 +934,7 @@ inf_ttrace_resume (struct target_ops *ops, 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) @@ -957,7 +1007,7 @@ inf_ttrace_wait (struct target_ops *ops, /* 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)); @@ -975,7 +1025,7 @@ inf_ttrace_wait (struct target_ops *ops, 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 @@ -1058,7 +1108,7 @@ inf_ttrace_wait (struct target_ops *ops, 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--; @@ -1075,7 +1125,7 @@ inf_ttrace_wait (struct target_ops *ops, 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--; @@ -1091,7 +1141,7 @@ inf_ttrace_wait (struct target_ops *ops, 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: @@ -1104,7 +1154,7 @@ inf_ttrace_wait (struct target_ops *ops, 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: @@ -1119,7 +1169,7 @@ inf_ttrace_wait (struct target_ops *ops, 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: @@ -1177,7 +1227,8 @@ inf_ttrace_xfer_memory (CORE_ADDR addr, ULONGEST len, static LONGEST 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, LONGEST len) { switch (object) { @@ -1247,6 +1298,15 @@ inf_ttrace_pid_to_str (struct target_ops *ops, 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) { @@ -1271,6 +1331,7 @@ 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; return t; } @@ -1278,7 +1339,7 @@ inf_ttrace_target (void) /* Prevent warning from -Wmissing-prototypes. */ -void _initialize_hppa_hpux_nat (void); +void _initialize_inf_ttrace (void); void _initialize_inf_ttrace (void)