* Makefile.in (i386nbsd-tdep.o): Add $(arch_utils_h),

[deliverable/binutils-gdb.git] / gdb / thread-db.c

diff --git a/gdb/thread-db.c b/gdb/thread-db.c
index 364dcc70b4011a7e9d0a0c60838a444fec11ce2c..d38db74b4b13c510b2266dda156705c1983d5f7f 100644 (file)
--- a/gdb/thread-db.c
+++ b/gdb/thread-db.c
@@ -37,7 +37,8 @@
 #define LIBTHREAD_DB_SO "libthread_db.so.1"
 #endif
 
-/* If we're running on Linux, we must explicitly attach to any new threads.  */
+/* If we're running on GNU/Linux, we must explicitly attach to any new
+   threads.  */
 
 /* FIXME: There is certainly some room for improvements:
    - Cache LWP ids.
@@ -123,7 +124,6 @@ static void thread_db_find_new_threads (void);
 
 /* Building process ids.  */
 
-
 #define GET_PID(ptid)          ptid_get_pid (ptid)
 #define GET_LWP(ptid)          ptid_get_lwp (ptid)
 #define GET_THREAD(ptid)       ptid_get_tid (ptid)
@@ -133,7 +133,6 @@ static void thread_db_find_new_threads (void);
 
 #define BUILD_LWP(lwp, pid)    ptid_build (pid, lwp, 0)
 #define BUILD_THREAD(tid, pid) ptid_build (pid, 0, tid)
-
 \f
 
 struct private_thread_info
@@ -141,8 +140,8 @@ struct private_thread_info
   /* Cached LWP id.  Must come first, see lin-lwp.c.  */
   lwpid_t lwpid;
 };
-
 \f
+
 static char *
 thread_db_err_str (td_err_e err)
 {
@@ -240,7 +239,7 @@ thread_from_lwp (ptid_t ptid)
 
   err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th);
   if (err != TD_OK)
-    error ("Cannot find user-level thread for LWP %d: %s",
+    error ("Cannot find user-level thread for LWP %ld: %s",
           GET_LWP (ptid), thread_db_err_str (err));
 
   err = td_thr_get_info_p (&th, &ti);
@@ -257,7 +256,7 @@ lwp_from_thread (ptid_t ptid)
   td_thrhandle_t th;
   td_err_e err;
 
-  if (! is_thread (ptid))
+  if (!is_thread (ptid))
     return ptid;
 
   err = td_ta_map_id2thr_p (thread_agent, GET_THREAD (ptid), &th);
@@ -404,7 +403,7 @@ enable_thread_event_reporting (void)
   err = td_ta_event_addr_p (thread_agent, TD_DEATH, &notify);
   if (err != TD_OK)
     {
-      warning ("Unable to get location for thread creation breakpoint: %s",
+      warning ("Unable to get location for thread death breakpoint: %s",
               thread_db_err_str (err));
       return;
     }
@@ -434,7 +433,7 @@ static void
 check_thread_signals (void)
 {
 #ifdef GET_THREAD_SIGNALS
-  if (! thread_signals)
+  if (!thread_signals)
     {
       sigset_t mask;
       int i;
@@ -484,7 +483,9 @@ thread_db_new_objfile (struct objfile *objfile)
 {
   td_err_e err;
 
-  if (objfile == NULL)
+  /* Don't attempt to use thread_db on targets which can not run
+     (core files).  */
+  if (objfile == NULL || !target_has_execution)
     {
       /* All symbols have been discarded.  If the thread_db target is
          active, deactivate it now.  */
@@ -573,11 +574,10 @@ attach_thread (ptid_t ptid, const td_thrhandle_t *th_p,
   tp->private = xmalloc (sizeof (struct private_thread_info));
   tp->private->lwpid = ti_p->ti_lid;
 
-  if (ti_p->ti_state == TD_THR_UNKNOWN ||
-      ti_p->ti_state == TD_THR_ZOMBIE)
-    return;/* A zombie thread that's been joined -- do not attach. */
+  if (ti_p->ti_state == TD_THR_UNKNOWN || ti_p->ti_state == TD_THR_ZOMBIE)
+    return;                    /* A zombie thread -- do not attach.  */
 
-  /* Under Linux, we have to attach to each and every thread.  */
+  /* Under GNU/Linux, we have to attach to each and every thread.  */
 #ifdef ATTACH_LWP
   ATTACH_LWP (BUILD_LWP (ti_p->ti_lid, GET_PID (ptid)), 0);
 #endif
@@ -691,7 +691,7 @@ check_event (ptid_t ptid)
       /* We may already know about this thread, for instance when the
          user has issued the `info threads' command before the SIGTRAP
          for hitting the thread creation breakpoint was reported.  */
-      if (! in_thread_list (ptid))
+      if (!in_thread_list (ptid))
        attach_thread (ptid, msg.th_p, &ti, 1);
       return;
 
@@ -703,7 +703,7 @@ check_event (ptid_t ptid)
        error ("Thread death event doesn't match breakpoint.");
 #endif
 
-      if (! in_thread_list (ptid))
+      if (!in_thread_list (ptid))
        error ("Spurious thread death event.");
 
       detach_thread (ptid, 1);
@@ -756,7 +756,7 @@ thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
     {
       /* FIXME: This seems to be necessary to make sure breakpoints
          are removed.  */
-      if (! target_thread_alive (inferior_ptid))
+      if (!target_thread_alive (inferior_ptid))
        inferior_ptid = pid_to_ptid (GET_PID (inferior_ptid));
       else
        inferior_ptid = lwp_from_thread (inferior_ptid);
@@ -776,7 +776,7 @@ thread_db_fetch_registers (int regno)
   gdb_prfpregset_t fpregset;
   td_err_e err;
 
-  if (! is_thread (inferior_ptid))
+  if (!is_thread (inferior_ptid))
     {
       /* Pass the request to the target beneath us.  */
       target_beneath->to_fetch_registers (regno);
@@ -813,7 +813,7 @@ thread_db_store_registers (int regno)
   gdb_prfpregset_t fpregset;
   td_err_e err;
 
-  if (! is_thread (inferior_ptid))
+  if (!is_thread (inferior_ptid))
     {
       /* Pass the request to the target beneath us.  */
       target_beneath->to_store_registers (regno);
@@ -859,7 +859,7 @@ thread_db_kill (void)
 static void
 thread_db_create_inferior (char *exec_file, char *allargs, char **env)
 {
-  if (! keep_thread_db)
+  if (!keep_thread_db)
     {
       unpush_target (&thread_db_ops);
       using_thread_db = 0;
@@ -879,7 +879,7 @@ thread_db_post_startup_inferior (ptid_t ptid)
 
       /* ...and perform the remaining initialization steps.  */
       enable_thread_event_reporting ();
-      thread_db_find_new_threads();
+      thread_db_find_new_threads ();
     }
 }
 
@@ -899,8 +899,8 @@ static int
 thread_db_thread_alive (ptid_t ptid)
 {
   td_thrhandle_t th;
-  td_thrinfo_t   ti;
-  td_err_e       err;
+  td_thrinfo_t ti;
+  td_err_e err;
 
   if (is_thread (ptid))
     {
@@ -916,9 +916,8 @@ thread_db_thread_alive (ptid_t ptid)
       if (err != TD_OK)
        return 0;
 
-      if (ti.ti_state == TD_THR_UNKNOWN ||
-         ti.ti_state == TD_THR_ZOMBIE)
-       return 0;       /* A zombie thread that's been joined. */
+      if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE)
+       return 0;               /* A zombie thread.  */
 
       return 1;
     }
@@ -940,14 +939,12 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data)
   if (err != TD_OK)
     error ("Cannot get thread info: %s", thread_db_err_str (err));
 
-  if (ti.ti_state == TD_THR_UNKNOWN ||
-      ti.ti_state == TD_THR_ZOMBIE)
-
-    return 0;  /* A zombie that's been reaped -- ignore. */
+  if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE)
+    return 0;                  /* A zombie -- ignore.  */
 
   ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid));
 
-  if (! in_thread_list (ptid))
+  if (!in_thread_list (ptid))
     attach_thread (ptid, th_p, &ti, 1);
 
   return 0;