Add overloads of for_each_thread/find_thread that filter on pid
It happens often that we want to iterate or find threads restricted to a given pid. I think it's worth having an overload to help with this. Right now there is a single user of each of the find_thread and for_each_thread overload, but as we replace the usages of find_inferior with for_each_thread/find_thread, more usages will pop up. gdb/gdbserver/ChangeLog: * gdbthread.h (find_thread, for_each_thread): New functions. * inferiors.c (thread_of_pid): Remove. (find_any_thread_of_pid): Use find_thread. * linux-low.c (num_lwps): Use for_each_thread.
This commit is contained in:
parent
a664f67e50
commit
4d3bb80e5d
|
@ -1,3 +1,10 @@
|
||||||
|
2017-10-21 Simon Marchi <simon.marchi@ericsson.com>
|
||||||
|
|
||||||
|
* gdbthread.h (find_thread, for_each_thread): New functions.
|
||||||
|
* inferiors.c (thread_of_pid): Remove.
|
||||||
|
(find_any_thread_of_pid): Use find_thread.
|
||||||
|
* linux-low.c (num_lwps): Use for_each_thread.
|
||||||
|
|
||||||
2017-10-17 Yao Qi <yao.qi@linaro.org>
|
2017-10-17 Yao Qi <yao.qi@linaro.org>
|
||||||
|
|
||||||
* Makefile.in: Remove one rule.
|
* Makefile.in: Remove one rule.
|
||||||
|
|
|
@ -111,6 +111,18 @@ find_thread (Func func)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Like the above, but only consider threads with pid PID. */
|
||||||
|
|
||||||
|
template <typename Func>
|
||||||
|
static thread_info *
|
||||||
|
find_thread (int pid, Func func)
|
||||||
|
{
|
||||||
|
return find_thread ([&] (thread_info *thread)
|
||||||
|
{
|
||||||
|
return thread->id.pid () == pid && func (thread);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/* Invoke FUNC for each thread. */
|
/* Invoke FUNC for each thread. */
|
||||||
|
|
||||||
template <typename Func>
|
template <typename Func>
|
||||||
|
@ -128,6 +140,19 @@ for_each_thread (Func func)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Like the above, but only consider threads with pid PID. */
|
||||||
|
|
||||||
|
template <typename Func>
|
||||||
|
static void
|
||||||
|
for_each_thread (int pid, Func func)
|
||||||
|
{
|
||||||
|
for_each_thread ([&] (thread_info *thread)
|
||||||
|
{
|
||||||
|
if (pid == thread->id.pid ())
|
||||||
|
func (thread);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/* Find the a random thread for which FUNC (THREAD) returns true. If
|
/* Find the a random thread for which FUNC (THREAD) returns true. If
|
||||||
no entry is found then return NULL. */
|
no entry is found then return NULL. */
|
||||||
|
|
||||||
|
|
|
@ -132,23 +132,14 @@ find_thread_process (const struct process_info *const process)
|
||||||
return find_any_thread_of_pid (process->pid);
|
return find_any_thread_of_pid (process->pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Helper for find_any_thread_of_pid. Returns true if a thread
|
|
||||||
matches a PID. */
|
|
||||||
|
|
||||||
static int
|
|
||||||
thread_of_pid (thread_info *entry, void *pid_p)
|
|
||||||
{
|
|
||||||
int pid = *(int *) pid_p;
|
|
||||||
|
|
||||||
return (ptid_get_pid (entry->id) == pid);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* See gdbthread.h. */
|
/* See gdbthread.h. */
|
||||||
|
|
||||||
struct thread_info *
|
struct thread_info *
|
||||||
find_any_thread_of_pid (int pid)
|
find_any_thread_of_pid (int pid)
|
||||||
{
|
{
|
||||||
return find_inferior (&all_threads, thread_of_pid, &pid);
|
return find_thread (pid, [] (thread_info *thread) {
|
||||||
|
return true;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -1869,8 +1869,8 @@ num_lwps (int pid)
|
||||||
{
|
{
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
for_each_thread ([&] (thread_info *thread) {
|
for_each_thread (pid, [&] (thread_info *thread)
|
||||||
if (thread->id.pid () == pid)
|
{
|
||||||
count++;
|
count++;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue