fix typo in previous entry

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

diff --git a/gdb/dec-thread.c b/gdb/dec-thread.c
index aa40c5988a92432f895d44072971fa328eb83787..01191ea101c21dffa886816fda12b66f8c4cb7d8 100644 (file)
--- a/gdb/dec-thread.c
+++ b/gdb/dec-thread.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -311,6 +311,30 @@ ptid_build_from_info (struct dec_thread_info info)
   return ptid_build (pid, 0, (long) info.thread);
 }
 
+/* Return non-zero if PTID is still alive.
+
+   Assumes that DEC_THREAD_LIST is up to date.  */
+static int
+dec_thread_ptid_is_alive (ptid_t ptid)
+{
+  pthreadDebugId_t tid = ptid_get_tid (ptid);
+  int i;
+  struct dec_thread_info *info;
+
+  if (tid == 0)
+    /* This is the thread corresponding to the process.  This ptid
+       is always alive until the program exits.  */
+    return 1;
+
+  /* Search whether an entry with the same tid exists in the dec-thread
+     list of threads.  If it does, then the thread is still alive.
+     No match found means that the thread must be dead, now.  */
+  for (i = 0; VEC_iterate (dec_thread_info_s, dec_thread_list, i, info); i++)
+    if (info->thread == tid)
+      return 1;
+  return 0;
+}
+
 /* Recompute the list of user threads and store the result in
    DEC_THREAD_LIST.  */
 
@@ -352,7 +376,7 @@ dec_thread_count_gdb_threads (struct thread_info *ignored, void *context)
 {
   int *count = (int *) context;
 
-  *count++;
+  *count = *count + 1;
   return 0;
 }
 
@@ -366,7 +390,7 @@ dec_thread_add_gdb_thread (struct thread_info *info, void *context)
   struct thread_info ***listp = (struct thread_info ***) context;
   
   **listp = info;
-  *listp++;
+  *listp = *listp + 1;
   return 0;
 }
 
@@ -386,8 +410,7 @@ resync_thread_list (void)
 
   /* Add new threads.  */
 
-  for (i = 0; VEC_iterate (dec_thread_info_s, dec_thread_list, i, info);
-       i++)
+  for (i = 0; VEC_iterate (dec_thread_info_s, dec_thread_list, i, info); i++)
     {
       ptid_t ptid = ptid_build_from_info (*info);
 
@@ -404,17 +427,10 @@ resync_thread_list (void)
   gdb_thread_list = alloca (num_gdb_threads * sizeof (struct thread_info *));
   next_thread_info = gdb_thread_list;
   iterate_over_threads (dec_thread_add_gdb_thread, (void *) &next_thread_info);
-  for (i = 0; i < num_gdb_threads; i++)
-    {
-      int j;
 
-      for (j = 0; VEC_iterate (dec_thread_info_s, dec_thread_list, j, info);
-           j++)
-        if (ptid_equal (gdb_thread_list[i]->ptid,
-                         ptid_build_from_info (*info)))
-          break;
+  for (i = 0; i < num_gdb_threads; i++)
+    if (!dec_thread_ptid_is_alive (gdb_thread_list[i]->ptid))
       delete_thread (gdb_thread_list[i]->ptid);
-    }
 }
 
 /* The "to_detach" method of the dec_thread_ops.  */
@@ -452,14 +468,14 @@ get_active_ptid (void)
 
 static ptid_t
 dec_thread_wait (struct target_ops *ops,
-                ptid_t ptid, struct target_waitstatus *status)
+                ptid_t ptid, struct target_waitstatus *status, int options)
 {
   ptid_t active_ptid;
   struct target_ops *beneath = find_target_beneath (ops);
 
   debug ("dec_thread_wait");
 
-  ptid = beneath->to_wait (beneath, ptid, status);
+  ptid = beneath->to_wait (beneath, ptid, status, options);
 
   /* The ptid returned by the target beneath us is the ptid of the process.
      We need to find which thread is currently active and return its ptid.  */