Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / nptl_db / td_ta_thr_iter.c

diff --git a/nptl_db/td_ta_thr_iter.c b/nptl_db/td_ta_thr_iter.c
index 9f83974dea3ecbba00fd6130827723234ae0375b..43b7ffbc227727f55784877648e4104aeee129d7 100644 (file)
--- a/nptl_db/td_ta_thr_iter.c
+++ b/nptl_db/td_ta_thr_iter.c
@@ -1,5 +1,5 @@
 /* Iterate over a process's threads.
-   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 1999.
 
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include "thread_dbP.h"
 
@@ -23,7 +23,7 @@
 static td_err_e
 iterate_thread_list (td_thragent_t *ta, td_thr_iter_f *callback,
                     void *cbdata_p, td_thr_state_e state, int ti_pri,
-                    psaddr_t head, bool fake_empty, pid_t match_pid)
+                    psaddr_t head, bool fake_empty)
 {
   td_err_e err;
   psaddr_t next, ofs;
@@ -76,48 +76,28 @@ iterate_thread_list (td_thragent_t *ta, td_thr_iter_f *callback,
       if (ps_pdread (ta->ph, addr, copy, ta->ta_sizeof_pthread) != PS_OK)
        return TD_ERR;
 
-      /* Verify that this thread's pid field matches the child PID.
-        If its pid field is negative, it's about to do a fork or it
-        is the sole thread in a fork child.  */
-      psaddr_t pid;
-      err = DB_GET_FIELD_LOCAL (pid, ta, copy, pthread, pid, 0);
-      if (err == TD_OK && (pid_t) (uintptr_t) pid < 0)
-       {
-         if (-(pid_t) (uintptr_t) pid == match_pid)
-           /* It is about to do a fork, but is really still the parent PID.  */
-           pid = (psaddr_t) (uintptr_t) match_pid;
-         else
-           /* It must be a fork child, whose new PID is in the tid field.  */
-           err = DB_GET_FIELD_LOCAL (pid, ta, copy, pthread, tid, 0);
-       }
+      err = DB_GET_FIELD_LOCAL (schedpolicy, ta, copy, pthread,
+                               schedpolicy, 0);
       if (err != TD_OK)
        break;
+      err = DB_GET_FIELD_LOCAL (schedprio, ta, copy, pthread,
+                               schedparam_sched_priority, 0);
+      if (err != TD_OK)
+       break;
+
+      /* Now test whether this thread matches the specified conditions.  */
 
-      if ((pid_t) (uintptr_t) pid == match_pid)
+      /* Only if the priority level is as high or higher.  */
+      int descr_pri = ((uintptr_t) schedpolicy == SCHED_OTHER
+                      ? 0 : (uintptr_t) schedprio);
+      if (descr_pri >= ti_pri)
        {
-         err = DB_GET_FIELD_LOCAL (schedpolicy, ta, copy, pthread,
-                                   schedpolicy, 0);
-         if (err != TD_OK)
-           break;
-         err = DB_GET_FIELD_LOCAL (schedprio, ta, copy, pthread,
-                                   schedparam_sched_priority, 0);
-         if (err != TD_OK)
-           break;
-
-         /* Now test whether this thread matches the specified conditions.  */
-
-         /* Only if the priority level is as high or higher.  */
-         int descr_pri = ((uintptr_t) schedpolicy == SCHED_OTHER
-                          ? 0 : (uintptr_t) schedprio);
-         if (descr_pri >= ti_pri)
-           {
-             /* Yep, it matches.  Call the callback function.  */
-             td_thrhandle_t th;
-             th.th_ta_p = (td_thragent_t *) ta;
-             th.th_unique = addr;
-             if (callback (&th, cbdata_p) != 0)
-               return TD_DBERR;
-           }
+         /* Yep, it matches.  Call the callback function.  */
+         td_thrhandle_t th;
+         th.th_ta_p = (td_thragent_t *) ta;
+         th.th_unique = addr;
+         if (callback (&th, cbdata_p) != 0)
+           return TD_DBERR;
        }
 
       /* Get the pointer to the next element.  */
@@ -153,18 +133,17 @@ td_ta_thr_iter (const td_thragent_t *ta_arg, td_thr_iter_f *callback,
      have to iterate over both lists separately.  We start with the
      list of threads with user-defined stacks.  */
 
-  pid_t pid = ps_getpid (ta->ph);
   err = DB_GET_SYMBOL (list, ta, __stack_user);
   if (err == TD_OK)
     err = iterate_thread_list (ta, callback, cbdata_p, state, ti_pri,
-                              list, true, pid);
+                              list, true);
 
   /* And the threads with stacks allocated by the implementation.  */
   if (err == TD_OK)
     err = DB_GET_SYMBOL (list, ta, stack_used);
   if (err == TD_OK)
     err = iterate_thread_list (ta, callback, cbdata_p, state, ti_pri,
-                              list, false, pid);
+                              list, false);
 
   return err;
 }