/* libthread_db assisted debugging support, generic parts.
- Copyright (C) 1999-2001, 2003-2012 Free Software Foundation, Inc.
+ Copyright (C) 1999-2017 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-#include "gdb_assert.h"
#include <dlfcn.h>
#include "gdb_proc_service.h"
-#include "gdb_thread_db.h"
+#include "nat/gdb_thread_db.h"
#include "gdb_vecs.h"
#include "bfd.h"
#include "command.h"
-#include "exceptions.h"
#include "gdbcmd.h"
#include "gdbthread.h"
#include "inferior.h"
+#include "infrun.h"
#include "symfile.h"
#include "objfiles.h"
#include "target.h"
#include "gdbcore.h"
#include "observer.h"
#include "linux-nat.h"
-#include "linux-procfs.h"
-#include "linux-osdata.h"
+#include "nat/linux-procfs.h"
+#include "nat/linux-ptrace.h"
+#include "nat/linux-osdata.h"
#include "auto-load.h"
-
+#include "cli/cli-utils.h"
#include <signal.h>
#include <ctype.h>
+#include "nat/linux-namespaces.h"
+#include <algorithm>
/* GNU/Linux libthread_db support.
created, thread IDs (usually, the result of pthread_self), and
thread-local variables.
- The libthread_db interface originates on Solaris, where it is
- both more powerful and more complicated. This implementation
- only works for LinuxThreads and NPTL, the two glibc threading
- libraries. It assumes that each thread is permanently assigned
- to a single light-weight process (LWP).
+ The libthread_db interface originates on Solaris, where it is both
+ more powerful and more complicated. This implementation only works
+ for NPTL, the glibc threading library. It assumes that each thread
+ is permanently assigned to a single light-weight process (LWP). At
+ some point it also supported the older LinuxThreads library, but it
+ no longer does.
libthread_db-specific information is stored in the "private" field
of struct thread_info. When the field is NULL we do not yet have
}
static void
-set_libthread_db_search_path (char *ignored, int from_tty,
+set_libthread_db_search_path (const char *ignored, int from_tty,
struct cmd_list_element *c)
{
if (*libthread_db_search_path == '\0')
be able to ignore such stale entries. */
int need_stale_parent_threads_check;
- /* Location of the thread creation event breakpoint. The code at
- this location in the child process will be called by the pthread
- library whenever a new thread is created. By setting a special
- breakpoint at this location, GDB can detect when a new thread is
- created. We obtain this location via the td_ta_event_addr
- call. */
- CORE_ADDR td_create_bp_addr;
-
- /* Location of the thread death event breakpoint. */
- CORE_ADDR td_death_bp_addr;
-
/* Pointers to the libthread_db functions. */
- td_err_e (*td_init_p) (void);
-
- td_err_e (*td_ta_new_p) (struct ps_prochandle * ps,
- td_thragent_t **ta);
- td_err_e (*td_ta_map_id2thr_p) (const td_thragent_t *ta, thread_t pt,
- td_thrhandle_t *__th);
- td_err_e (*td_ta_map_lwp2thr_p) (const td_thragent_t *ta,
- lwpid_t lwpid, td_thrhandle_t *th);
- td_err_e (*td_ta_thr_iter_p) (const td_thragent_t *ta,
- td_thr_iter_f *callback, void *cbdata_p,
- td_thr_state_e state, int ti_pri,
- sigset_t *ti_sigmask_p,
- unsigned int ti_user_flags);
- td_err_e (*td_ta_event_addr_p) (const td_thragent_t *ta,
- td_event_e event, td_notify_t *ptr);
- td_err_e (*td_ta_set_event_p) (const td_thragent_t *ta,
- td_thr_events_t *event);
- td_err_e (*td_ta_clear_event_p) (const td_thragent_t *ta,
- td_thr_events_t *event);
- td_err_e (*td_ta_event_getmsg_p) (const td_thragent_t *ta,
- td_event_msg_t *msg);
-
- td_err_e (*td_thr_validate_p) (const td_thrhandle_t *th);
- td_err_e (*td_thr_get_info_p) (const td_thrhandle_t *th,
- td_thrinfo_t *infop);
- td_err_e (*td_thr_event_enable_p) (const td_thrhandle_t *th,
- int event);
-
- td_err_e (*td_thr_tls_get_addr_p) (const td_thrhandle_t *th,
- psaddr_t map_address,
- size_t offset, psaddr_t *address);
+ td_init_ftype *td_init_p;
+ td_ta_new_ftype *td_ta_new_p;
+ td_ta_map_lwp2thr_ftype *td_ta_map_lwp2thr_p;
+ td_ta_thr_iter_ftype *td_ta_thr_iter_p;
+ td_thr_get_info_ftype *td_thr_get_info_p;
+ td_thr_tls_get_addr_ftype *td_thr_tls_get_addr_p;
+ td_thr_tlsbase_ftype *td_thr_tlsbase_p;
};
/* List of known processes using thread_db, and the required
static void thread_db_find_new_threads_1 (ptid_t ptid);
static void thread_db_find_new_threads_2 (ptid_t ptid, int until_no_new);
+static void check_thread_signals (void);
+
+static struct thread_info *record_thread
+ (struct thread_db_info *info, struct thread_info *tp,
+ ptid_t ptid, const td_thrhandle_t *th_p, const td_thrinfo_t *ti_p);
+
/* Add the current inferior to the list of processes using libpthread.
Return a pointer to the newly allocated object that was added to
THREAD_DB_LIST. HANDLE is the handle returned by dlopen'ing
static struct thread_db_info *
add_thread_db_info (void *handle)
{
- struct thread_db_info *info;
+ struct thread_db_info *info = XCNEW (struct thread_db_info);
- info = xcalloc (1, sizeof (*info));
info->pid = ptid_get_pid (inferior_ptid);
info->handle = handle;
xfree (info);
}
-/* Prototypes for local functions. */
-static int attach_thread (ptid_t ptid, const td_thrhandle_t *th_p,
- const td_thrinfo_t *ti_p);
-static void detach_thread (ptid_t ptid);
-\f
-
/* Use "struct private_thread_info" to cache thread state. This is
a substantial optimization. */
-struct private_thread_info
+struct thread_db_thread_info : public private_thread_info
{
/* Flag set when we see a TD_DEATH event for this thread. */
- unsigned int dying:1;
+ bool dying = false;
/* Cached thread state. */
- td_thrhandle_t th;
- thread_t tid;
+ td_thrhandle_t th {};
+ thread_t tid {};
};
-\f
-static char *
+static thread_db_thread_info *
+get_thread_db_thread_info (thread_info *thread)
+{
+ return static_cast<thread_db_thread_info *> (thread->priv.get ());
+}
+
+static const char *
thread_db_err_str (td_err_e err)
{
static char buf[64];
return buf;
}
}
-\f
-/* Return 1 if any threads have been registered. There may be none if
- the threading library is not fully initialized yet. */
-
-static int
-have_threads_callback (struct thread_info *thread, void *args)
-{
- int pid = * (int *) args;
-
- if (ptid_get_pid (thread->ptid) != pid)
- return 0;
-
- return thread->private != NULL;
-}
-
-static int
-have_threads (ptid_t ptid)
-{
- int pid = ptid_get_pid (ptid);
-
- return iterate_over_threads (have_threads_callback, &pid) != NULL;
-}
-
-struct thread_get_info_inout
-{
- struct thread_info *thread_info;
- struct thread_db_info *thread_db_info;
-};
-
-/* A callback function for td_ta_thr_iter, which we use to map all
- threads to LWPs.
-
- THP is a handle to the current thread; if INFOP is not NULL, the
- struct thread_info associated with this thread is returned in
- *INFOP.
-
- If the thread is a zombie, TD_THR_ZOMBIE is returned. Otherwise,
- zero is returned to indicate success. */
-
-static int
-thread_get_info_callback (const td_thrhandle_t *thp, void *argp)
-{
- td_thrinfo_t ti;
- td_err_e err;
- ptid_t thread_ptid;
- struct thread_get_info_inout *inout;
- struct thread_db_info *info;
-
- inout = argp;
- info = inout->thread_db_info;
-
- err = info->td_thr_get_info_p (thp, &ti);
- if (err != TD_OK)
- error (_("thread_get_info_callback: cannot get thread info: %s"),
- thread_db_err_str (err));
- /* Fill the cache. */
- thread_ptid = ptid_build (info->pid, ti.ti_lid, 0);
- inout->thread_info = find_thread_ptid (thread_ptid);
-
- if (inout->thread_info == NULL)
- {
- /* New thread. Attach to it now (why wait?). */
- if (!have_threads (thread_ptid))
- thread_db_find_new_threads_1 (thread_ptid);
- else
- attach_thread (thread_ptid, thp, &ti);
- inout->thread_info = find_thread_ptid (thread_ptid);
- gdb_assert (inout->thread_info != NULL);
- }
-
- return 0;
-}
-\f
/* Fetch the user-level thread id of PTID. */
-static void
+static struct thread_info *
thread_from_lwp (ptid_t ptid)
{
td_thrhandle_t th;
+ td_thrinfo_t ti;
td_err_e err;
struct thread_db_info *info;
- struct thread_get_info_inout io = {0};
+ struct thread_info *tp;
/* Just in case td_ta_map_lwp2thr doesn't initialize it completely. */
th.th_unique = 0;
/* This ptid comes from linux-nat.c, which should always fill in the
LWP. */
- gdb_assert (GET_LWP (ptid) != 0);
+ gdb_assert (ptid_get_lwp (ptid) != 0);
- info = get_thread_db_info (GET_PID (ptid));
+ info = get_thread_db_info (ptid_get_pid (ptid));
/* Access an lwp we know is stopped. */
info->proc_handle.ptid = ptid;
- err = info->td_ta_map_lwp2thr_p (info->thread_agent, GET_LWP (ptid), &th);
+ err = info->td_ta_map_lwp2thr_p (info->thread_agent, ptid_get_lwp (ptid),
+ &th);
if (err != TD_OK)
error (_("Cannot find user-level thread for LWP %ld: %s"),
- GET_LWP (ptid), thread_db_err_str (err));
+ ptid_get_lwp (ptid), thread_db_err_str (err));
- /* Long-winded way of fetching the thread info. */
- io.thread_db_info = info;
- io.thread_info = NULL;
- thread_get_info_callback (&th, &io);
+ err = info->td_thr_get_info_p (&th, &ti);
+ if (err != TD_OK)
+ error (_("thread_get_info_callback: cannot get thread info: %s"),
+ thread_db_err_str (err));
+
+ /* Fill the cache. */
+ tp = find_thread_ptid (ptid);
+ return record_thread (info, tp, ptid, &th, &ti);
}
\f
-/* Attach to lwp PTID, doing whatever else is required to have this
- LWP under the debugger's control --- e.g., enabling event
- reporting. Returns true on success. */
+/* See linux-nat.h. */
+
int
-thread_db_attach_lwp (ptid_t ptid)
+thread_db_notice_clone (ptid_t parent, ptid_t child)
{
- td_thrhandle_t th;
- td_thrinfo_t ti;
- td_err_e err;
struct thread_db_info *info;
- info = get_thread_db_info (GET_PID (ptid));
+ info = get_thread_db_info (ptid_get_pid (child));
if (info == NULL)
return 0;
- /* This ptid comes from linux-nat.c, which should always fill in the
- LWP. */
- gdb_assert (GET_LWP (ptid) != 0);
+ thread_from_lwp (child);
- /* Access an lwp we know is stopped. */
- info->proc_handle.ptid = ptid;
-
- /* If we have only looked at the first thread before libpthread was
- initialized, we may not know its thread ID yet. Make sure we do
- before we add another thread to the list. */
- if (!have_threads (ptid))
- thread_db_find_new_threads_1 (ptid);
-
- err = info->td_ta_map_lwp2thr_p (info->thread_agent, GET_LWP (ptid), &th);
- if (err != TD_OK)
- /* Cannot find user-level thread. */
- return 0;
-
- err = info->td_thr_get_info_p (&th, &ti);
- if (err != TD_OK)
- {
- warning (_("Cannot get thread info: %s"), thread_db_err_str (err));
- return 0;
- }
-
- attach_thread (ptid, &th, &ti);
+ /* If we do not know about the main thread yet, this would be a good
+ time to find it. */
+ thread_from_lwp (parent);
return 1;
}
return sym;
}
-static td_err_e
-enable_thread_event (int event, CORE_ADDR *bp)
-{
- td_notify_t notify;
- td_err_e err;
- struct thread_db_info *info;
-
- info = get_thread_db_info (GET_PID (inferior_ptid));
-
- /* Access an lwp we know is stopped. */
- info->proc_handle.ptid = inferior_ptid;
-
- /* Get the breakpoint address for thread EVENT. */
- err = info->td_ta_event_addr_p (info->thread_agent, event, ¬ify);
- if (err != TD_OK)
- return err;
-
- /* Set up the breakpoint. */
- gdb_assert (exec_bfd);
- (*bp) = (gdbarch_convert_from_func_ptr_addr
- (target_gdbarch (),
- /* Do proper sign extension for the target. */
- (bfd_get_sign_extend_vma (exec_bfd) > 0
- ? (CORE_ADDR) (intptr_t) notify.u.bptaddr
- : (CORE_ADDR) (uintptr_t) notify.u.bptaddr),
- ¤t_target));
- create_thread_event_breakpoint (target_gdbarch (), *bp);
-
- return TD_OK;
-}
-
/* Verify inferior's '\0'-terminated symbol VER_SYMBOL starts with "%d.%d" and
return 1 if this version is lower (and not equal) to
VER_MAJOR_MIN.VER_MINOR_MIN. Return 0 in all other cases. */
static int
inferior_has_bug (const char *ver_symbol, int ver_major_min, int ver_minor_min)
{
- struct minimal_symbol *version_msym;
+ struct bound_minimal_symbol version_msym;
CORE_ADDR version_addr;
char *version;
int err, got, retval = 0;
version_msym = lookup_minimal_symbol (ver_symbol, NULL, NULL);
- if (version_msym == NULL)
+ if (version_msym.minsym == NULL)
return 0;
- version_addr = SYMBOL_VALUE_ADDRESS (version_msym);
+ version_addr = BMSYMBOL_VALUE_ADDRESS (version_msym);
got = target_read_string (version_addr, &version, 32, &err);
if (err == 0 && memchr (version, 0, got) == &version[got -1])
{
return retval;
}
-static void
-enable_thread_event_reporting (void)
-{
- td_thr_events_t events;
- td_err_e err;
- struct thread_db_info *info;
-
- info = get_thread_db_info (GET_PID (inferior_ptid));
-
- /* We cannot use the thread event reporting facility if these
- functions aren't available. */
- if (info->td_ta_event_addr_p == NULL
- || info->td_ta_set_event_p == NULL
- || info->td_ta_event_getmsg_p == NULL
- || info->td_thr_event_enable_p == NULL)
- return;
-
- /* Set the process wide mask saying which events we're interested in. */
- td_event_emptyset (&events);
- td_event_addset (&events, TD_CREATE);
-
- /* There is a bug fixed between linuxthreads 2.1.3 and 2.2 by
- commit 2e4581e4fba917f1779cd0a010a45698586c190a
- * manager.c (pthread_exited): Correctly report event as TD_REAP
- instead of TD_DEATH. Fix comments.
- where event reporting facility is broken for TD_DEATH events,
- so don't enable it if we have glibc but a lower version. */
- if (!inferior_has_bug ("__linuxthreads_version", 2, 2))
- td_event_addset (&events, TD_DEATH);
-
- err = info->td_ta_set_event_p (info->thread_agent, &events);
- if (err != TD_OK)
- {
- warning (_("Unable to set global thread event mask: %s"),
- thread_db_err_str (err));
- return;
- }
-
- /* Delete previous thread event breakpoints, if any. */
- remove_thread_event_breakpoints ();
- info->td_create_bp_addr = 0;
- info->td_death_bp_addr = 0;
-
- /* Set up the thread creation event. */
- err = enable_thread_event (TD_CREATE, &info->td_create_bp_addr);
- if (err != TD_OK)
- {
- warning (_("Unable to get location for thread creation breakpoint: %s"),
- thread_db_err_str (err));
- return;
- }
-
- /* Set up the thread death event. */
- err = enable_thread_event (TD_DEATH, &info->td_death_bp_addr);
- if (err != TD_OK)
- {
- warning (_("Unable to get location for thread death breakpoint: %s"),
- thread_db_err_str (err));
- return;
- }
-}
-
/* Similar as thread_db_find_new_threads_1, but try to silently ignore errors
if appropriate.
static int
thread_db_find_new_threads_silently (ptid_t ptid)
{
- volatile struct gdb_exception except;
- TRY_CATCH (except, RETURN_MASK_ERROR)
+ TRY
{
thread_db_find_new_threads_2 (ptid, 1);
}
- if (except.reason < 0)
+ CATCH (except, RETURN_MASK_ERROR)
{
if (libthread_db_debug)
- exception_fprintf (gdb_stderr, except,
+ exception_fprintf (gdb_stdlog, except,
"Warning: thread_db_find_new_threads_silently: ");
/* There is a bug fixed between nptl 2.6.1 and 2.7 by
return 1;
}
}
+ END_CATCH
+
return 0;
}
/* Initialize pointers to the dynamic library functions we will use.
Essential functions first. */
- info->td_init_p = verbose_dlsym (info->handle, "td_init");
- if (info->td_init_p == NULL)
- return 0;
+#define TDB_VERBOSE_DLSYM(info, func) \
+ info->func ## _p = (func ## _ftype *) verbose_dlsym (info->handle, #func)
+
+#define TDB_DLSYM(info, func) \
+ info->func ## _p = (func ## _ftype *) dlsym (info->handle, #func)
+
+#define CHK(a) \
+ do \
+ { \
+ if ((a) == NULL) \
+ return 0; \
+ } while (0)
+
+ CHK (TDB_VERBOSE_DLSYM (info, td_init));
err = info->td_init_p ();
if (err != TD_OK)
return 0;
}
- info->td_ta_new_p = verbose_dlsym (info->handle, "td_ta_new");
- if (info->td_ta_new_p == NULL)
- return 0;
+ CHK (TDB_VERBOSE_DLSYM (info, td_ta_new));
/* Initialize the structure that identifies the child process. */
info->proc_handle.ptid = inferior_ptid;
if (err != TD_OK)
{
if (libthread_db_debug)
- printf_unfiltered (_("td_ta_new failed: %s\n"),
- thread_db_err_str (err));
+ fprintf_unfiltered (gdb_stdlog, _("td_ta_new failed: %s\n"),
+ thread_db_err_str (err));
else
switch (err)
{
return 0;
}
- info->td_ta_map_id2thr_p = verbose_dlsym (info->handle, "td_ta_map_id2thr");
- if (info->td_ta_map_id2thr_p == NULL)
- return 0;
+ /* These are essential. */
+ CHK (TDB_VERBOSE_DLSYM (info, td_ta_map_lwp2thr));
+ CHK (TDB_VERBOSE_DLSYM (info, td_thr_get_info));
- info->td_ta_map_lwp2thr_p = verbose_dlsym (info->handle,
- "td_ta_map_lwp2thr");
- if (info->td_ta_map_lwp2thr_p == NULL)
- return 0;
+ /* These are not essential. */
+ TDB_DLSYM (info, td_thr_tls_get_addr);
+ TDB_DLSYM (info, td_thr_tlsbase);
+
+ /* It's best to avoid td_ta_thr_iter if possible. That walks data
+ structures in the inferior's address space that may be corrupted,
+ or, if the target is running, may change while we walk them. If
+ there's execution (and /proc is mounted), then we're already
+ attached to all LWPs. Use thread_from_lwp, which uses
+ td_ta_map_lwp2thr instead, which does not walk the thread list.
+
+ td_ta_map_lwp2thr uses ps_get_thread_area, but we can't use that
+ currently on core targets, as it uses ptrace directly. */
+ if (target_has_execution
+ && linux_proc_task_list_dir_exists (ptid_get_pid (inferior_ptid)))
+ info->td_ta_thr_iter_p = NULL;
+ else
+ CHK (TDB_VERBOSE_DLSYM (info, td_ta_thr_iter));
+
+#undef TDB_VERBOSE_DLSYM
+#undef TDB_DLSYM
+#undef CHK
- info->td_ta_thr_iter_p = verbose_dlsym (info->handle, "td_ta_thr_iter");
if (info->td_ta_thr_iter_p == NULL)
- return 0;
+ {
+ struct lwp_info *lp;
+ int pid = ptid_get_pid (inferior_ptid);
- info->td_thr_validate_p = verbose_dlsym (info->handle, "td_thr_validate");
- if (info->td_thr_validate_p == NULL)
- return 0;
+ linux_stop_and_wait_all_lwps ();
- info->td_thr_get_info_p = verbose_dlsym (info->handle, "td_thr_get_info");
- if (info->td_thr_get_info_p == NULL)
- return 0;
+ ALL_LWPS (lp)
+ if (ptid_get_pid (lp->ptid) == pid)
+ thread_from_lwp (lp->ptid);
- /* These are not essential. */
- info->td_ta_event_addr_p = dlsym (info->handle, "td_ta_event_addr");
- info->td_ta_set_event_p = dlsym (info->handle, "td_ta_set_event");
- info->td_ta_clear_event_p = dlsym (info->handle, "td_ta_clear_event");
- info->td_ta_event_getmsg_p = dlsym (info->handle, "td_ta_event_getmsg");
- info->td_thr_event_enable_p = dlsym (info->handle, "td_thr_event_enable");
- info->td_thr_tls_get_addr_p = dlsym (info->handle, "td_thr_tls_get_addr");
-
- if (thread_db_find_new_threads_silently (inferior_ptid) != 0)
+ linux_unstop_all_lwps ();
+ }
+ else if (thread_db_find_new_threads_silently (inferior_ptid) != 0)
{
/* Even if libthread_db initializes, if the thread list is
corrupted, we'd not manage to list any threads. Better reject this
printf_unfiltered (_("[Thread debugging using libthread_db enabled]\n"));
- if (libthread_db_debug || *libthread_db_search_path)
+ if (*libthread_db_search_path || libthread_db_debug)
{
+ struct ui_file *file;
const char *library;
- library = dladdr_to_soname (*info->td_ta_new_p);
+ library = dladdr_to_soname ((const void *) *info->td_ta_new_p);
if (library == NULL)
library = LIBTHREAD_DB_SO;
- printf_unfiltered (_("Using host libthread_db library \"%s\".\n"),
- library);
+ /* If we'd print this to gdb_stdout when debug output is
+ disabled, still print it to gdb_stdout if debug output is
+ enabled. User visible output should not depend on debug
+ settings. */
+ file = *libthread_db_search_path != '\0' ? gdb_stdout : gdb_stdlog;
+ fprintf_unfiltered (file, _("Using host libthread_db library \"%s\".\n"),
+ library);
}
/* The thread library was detected. Activate the thread_db target
if (thread_db_list->next == NULL)
push_target (&thread_db_ops);
- /* Enable event reporting, but not when debugging a core file. */
- if (target_has_execution)
- enable_thread_event_reporting ();
-
return 1;
}
relative, or just LIBTHREAD_DB. */
static int
-try_thread_db_load (const char *library)
+try_thread_db_load (const char *library, int check_auto_load_safe)
{
void *handle;
struct thread_db_info *info;
if (libthread_db_debug)
- printf_unfiltered (_("Trying host libthread_db library: %s.\n"),
- library);
+ fprintf_unfiltered (gdb_stdlog,
+ _("Trying host libthread_db library: %s.\n"),
+ library);
+
+ if (check_auto_load_safe)
+ {
+ if (access (library, R_OK) != 0)
+ {
+ /* Do not print warnings by file_is_auto_load_safe if the library does
+ not exist at this place. */
+ if (libthread_db_debug)
+ fprintf_unfiltered (gdb_stdlog, _("open failed: %s.\n"),
+ safe_strerror (errno));
+ return 0;
+ }
+
+ if (!file_is_auto_load_safe (library, _("auto-load: Loading libthread-db "
+ "library \"%s\" from explicit "
+ "directory.\n"),
+ library))
+ return 0;
+ }
+
handle = dlopen (library, RTLD_NOW);
if (handle == NULL)
{
if (libthread_db_debug)
- printf_unfiltered (_("dlopen failed: %s.\n"), dlerror ());
+ fprintf_unfiltered (gdb_stdlog, _("dlopen failed: %s.\n"), dlerror ());
return 0;
}
const char *const libpath = dladdr_to_soname (td_init);
if (libpath != NULL)
- printf_unfiltered (_("Host %s resolved to: %s.\n"),
+ fprintf_unfiltered (gdb_stdlog, _("Host %s resolved to: %s.\n"),
library, libpath);
}
}
/* Do not save system library name, that one is always trusted. */
if (strchr (library, '/') != NULL)
- info->filename = gdb_realpath (library);
+ info->filename = gdb_realpath (library).release ();
if (try_thread_db_load_1 (info))
return 1;
/* This library "refused" to work on current inferior. */
- delete_thread_db_info (GET_PID (inferior_ptid));
+ delete_thread_db_info (ptid_get_pid (inferior_ptid));
return 0;
}
struct cleanup *cleanup;
char *path, *cp;
int result;
+ const char *obj_name = objfile_name (obj);
+ int alloc_len;
- if (obj->name[0] != '/')
+ if (obj_name[0] != '/')
{
warning (_("Expected absolute pathname for libpthread in the"
- " inferior, but got %s."), obj->name);
+ " inferior, but got %s."), obj_name);
return 0;
}
- path = xmalloc (strlen (obj->name) + (subdir ? strlen (subdir) + 1 : 0)
- + 1 + strlen (LIBTHREAD_DB_SO) + 1);
+ alloc_len = (strlen (obj_name)
+ + (subdir ? strlen (subdir) + 1 : 0)
+ + 1 + strlen (LIBTHREAD_DB_SO) + 1);
+ path = (char *) xmalloc (alloc_len);
cleanup = make_cleanup (xfree, path);
- strcpy (path, obj->name);
+ strcpy (path, obj_name);
cp = strrchr (path, '/');
/* This should at minimum hit the first character. */
gdb_assert (cp != NULL);
}
strcat (cp, LIBTHREAD_DB_SO);
- if (!file_is_auto_load_safe (path, _("auto-load: Loading libthread-db "
- "library \"%s\" from $pdir.\n"),
- path))
- result = 0;
- else
- result = try_thread_db_load (path);
+ result = try_thread_db_load (path, 1);
do_cleanups (cleanup);
return result;
return 0;
ALL_OBJFILES (obj)
- if (libpthread_name_p (obj->name))
+ if (libpthread_name_p (objfile_name (obj)))
{
if (try_thread_db_load_from_pdir_1 (obj, subdir))
return 1;
static int
try_thread_db_load_from_sdir (void)
{
- return try_thread_db_load (LIBTHREAD_DB_SO);
+ return try_thread_db_load (LIBTHREAD_DB_SO, 0);
}
/* Try to load libthread_db from directory DIR of length DIR_LEN.
if (!auto_load_thread_db)
return 0;
- path = xmalloc (dir_len + 1 + strlen (LIBTHREAD_DB_SO) + 1);
+ path = (char *) xmalloc (dir_len + 1 + strlen (LIBTHREAD_DB_SO) + 1);
cleanup = make_cleanup (xfree, path);
memcpy (path, dir, dir_len);
path[dir_len] = '/';
strcpy (path + dir_len + 1, LIBTHREAD_DB_SO);
- if (!file_is_auto_load_safe (path, _("auto-load: Loading libthread-db "
- "library \"%s\" from explicit "
- "directory.\n"),
- path))
- result = 0;
- else
- result = try_thread_db_load (path);
+ result = try_thread_db_load (path, 1);
do_cleanups (cleanup);
return result;
|| this_dir[pdir_len] == '/'))
{
char *subdir = NULL;
- struct cleanup *free_subdir_cleanup = NULL;
+ struct cleanup *free_subdir_cleanup
+ = make_cleanup (null_cleanup, NULL);
if (this_dir[pdir_len] == '/')
{
- subdir = xmalloc (strlen (this_dir));
- free_subdir_cleanup = make_cleanup (xfree, subdir);
+ subdir = (char *) xmalloc (strlen (this_dir));
+ make_cleanup (xfree, subdir);
strcpy (subdir, this_dir + pdir_len + 1);
}
rc = try_thread_db_load_from_pdir (subdir);
- if (free_subdir_cleanup != NULL)
- do_cleanups (free_subdir_cleanup);
+ do_cleanups (free_subdir_cleanup);
if (rc)
break;
}
do_cleanups (cleanups);
if (libthread_db_debug)
- printf_unfiltered (_("thread_db_load_search returning %d\n"), rc);
+ fprintf_unfiltered (gdb_stdlog,
+ _("thread_db_load_search returning %d\n"), rc);
return rc;
}
struct objfile *obj;
ALL_OBJFILES (obj)
- if (libpthread_name_p (obj->name))
+ if (libpthread_name_p (objfile_name (obj)))
return 1;
return 0;
{
struct thread_db_info *info;
- info = get_thread_db_info (GET_PID (inferior_ptid));
+ info = get_thread_db_info (ptid_get_pid (inferior_ptid));
if (info != NULL)
return 1;
return 0;
}
-static void
-disable_thread_event_reporting (struct thread_db_info *info)
-{
- if (info->td_ta_clear_event_p != NULL)
- {
- td_thr_events_t events;
-
- /* Set the process wide mask saying we aren't interested in any
- events anymore. */
- td_event_fillset (&events);
- info->td_ta_clear_event_p (info->thread_agent, &events);
- }
-
- info->td_create_bp_addr = 0;
- info->td_death_bp_addr = 0;
-}
-
static void
check_thread_signals (void)
{
of the list of shared libraries to load, and in an app of several
thousand shared libraries, this can otherwise be painful. */
&& ((objfile->flags & OBJF_MAINLINE) != 0
- || libpthread_name_p (objfile->name)))
+ || libpthread_name_p (objfile_name (objfile))))
check_for_thread_db ();
}
+static void
+check_pid_namespace_match (void)
+{
+ /* Check is only relevant for local targets targets. */
+ if (target_can_run (¤t_target))
+ {
+ /* If the child is in a different PID namespace, its idea of its
+ PID will differ from our idea of its PID. When we scan the
+ child's thread list, we'll mistakenly think it has no threads
+ since the thread PID fields won't match the PID we give to
+ libthread_db. */
+ if (!linux_ns_same (ptid_get_pid (inferior_ptid), LINUX_NS_PID))
+ {
+ warning (_ ("Target and debugger are in different PID "
+ "namespaces; thread lists and other data are "
+ "likely unreliable. "
+ "Connect to gdbserver inside the container."));
+ }
+ }
+}
+
/* This function is called via the inferior_created observer.
This handles the case of debugging statically linked executables. */
static void
thread_db_inferior_created (struct target_ops *target, int from_tty)
{
+ check_pid_namespace_match ();
check_for_thread_db ();
}
-/* Attach to a new thread. This function is called when we receive a
- TD_CREATE event or when we iterate over all threads and find one
- that wasn't already in our list. Returns true on success. */
+/* Update the thread's state (what's displayed in "info threads"),
+ from libthread_db thread state information. */
-static int
-attach_thread (ptid_t ptid, const td_thrhandle_t *th_p,
- const td_thrinfo_t *ti_p)
+static void
+update_thread_state (thread_db_thread_info *priv,
+ const td_thrinfo_t *ti_p)
{
- struct private_thread_info *private;
- struct thread_info *tp;
- td_err_e err;
- struct thread_db_info *info;
-
- /* If we're being called after a TD_CREATE event, we may already
- know about this thread. There are two ways this can happen. We
- may have iterated over all threads between the thread creation
- and the TD_CREATE event, for instance when the user has issued
- the `info threads' command before the SIGTRAP for hitting the
- thread creation breakpoint was reported. Alternatively, the
- thread may have exited and a new one been created with the same
- thread ID. In the first case we don't need to do anything; in
- the second case we should discard information about the dead
- thread and attach to the new one. */
- tp = find_thread_ptid (ptid);
- if (tp != NULL)
- {
- /* If tp->private is NULL, then GDB is already attached to this
- thread, but we do not know anything about it. We can learn
- about it here. This can only happen if we have some other
- way besides libthread_db to notice new threads (i.e.
- PTRACE_EVENT_CLONE); assume the same mechanism notices thread
- exit, so this can not be a stale thread recreated with the
- same ID. */
- if (tp->private != NULL)
- {
- if (!tp->private->dying)
- return 0;
-
- delete_thread (ptid);
- tp = NULL;
- }
- }
+ priv->dying = (ti_p->ti_state == TD_THR_UNKNOWN
+ || ti_p->ti_state == TD_THR_ZOMBIE);
+}
- if (target_has_execution)
- check_thread_signals ();
+/* Record a new thread in GDB's thread list. Creates the thread's
+ private info. If TP is NULL or TP is marked as having exited,
+ creates a new thread. Otherwise, uses TP. */
- /* Under GNU/Linux, we have to attach to each and every thread. */
- if (target_has_execution
- && tp == NULL)
- {
- int res;
+static struct thread_info *
+record_thread (struct thread_db_info *info,
+ struct thread_info *tp,
+ ptid_t ptid, const td_thrhandle_t *th_p,
+ const td_thrinfo_t *ti_p)
+{
+ /* A thread ID of zero may mean the thread library has not
+ initialized yet. Leave private == NULL until the thread library
+ has initialized. */
+ if (ti_p->ti_tid == 0)
+ return tp;
- res = lin_lwp_attach_lwp (BUILD_LWP (ti_p->ti_lid, GET_PID (ptid)));
- if (res < 0)
- {
- /* Error, stop iterating. */
- return 0;
- }
- else if (res > 0)
- {
- /* Pretend this thread doesn't exist yet, and keep
- iterating. */
- return 1;
- }
+ /* Construct the thread's private data. */
+ thread_db_thread_info *priv = new thread_db_thread_info;
- /* Otherwise, we sucessfully attached to the thread. */
- }
+ priv->th = *th_p;
+ priv->tid = ti_p->ti_tid;
+ update_thread_state (priv, ti_p);
- /* Construct the thread's private data. */
- private = xmalloc (sizeof (struct private_thread_info));
- memset (private, 0, sizeof (struct private_thread_info));
-
- /* A thread ID of zero may mean the thread library has not initialized
- yet. But we shouldn't even get here if that's the case. FIXME:
- if we change GDB to always have at least one thread in the thread
- list this will have to go somewhere else; maybe private == NULL
- until the thread_db target claims it. */
- gdb_assert (ti_p->ti_tid != 0);
- private->th = *th_p;
- private->tid = ti_p->ti_tid;
- if (ti_p->ti_state == TD_THR_UNKNOWN || ti_p->ti_state == TD_THR_ZOMBIE)
- private->dying = 1;
-
- /* Add the thread to GDB's thread list. */
- if (tp == NULL)
- add_thread_with_info (ptid, private);
+ /* Add the thread to GDB's thread list. If we already know about a
+ thread with this PTID, but it's marked exited, then the kernel
+ reused the tid of an old thread. */
+ if (tp == NULL || tp->state == THREAD_EXITED)
+ tp = add_thread_with_info (ptid, priv);
else
- tp->private = private;
-
- info = get_thread_db_info (GET_PID (ptid));
+ tp->priv.reset (priv);
- /* Enable thread event reporting for this thread, except when
- debugging a core file. */
if (target_has_execution)
- {
- err = info->td_thr_event_enable_p (th_p, 1);
- if (err != TD_OK)
- error (_("Cannot enable thread event reporting for %s: %s"),
- target_pid_to_str (ptid), thread_db_err_str (err));
- }
-
- return 1;
-}
-
-static void
-detach_thread (ptid_t ptid)
-{
- struct thread_info *thread_info;
+ check_thread_signals ();
- /* Don't delete the thread now, because it still reports as active
- until it has executed a few instructions after the event
- breakpoint - if we deleted it now, "info threads" would cause us
- to re-attach to it. Just mark it as having had a TD_DEATH
- event. This means that we won't delete it from our thread list
- until we notice that it's dead (via prune_threads), or until
- something re-uses its thread ID. We'll report the thread exit
- when the underlying LWP dies. */
- thread_info = find_thread_ptid (ptid);
- gdb_assert (thread_info != NULL && thread_info->private != NULL);
- thread_info->private->dying = 1;
+ return tp;
}
static void
-thread_db_detach (struct target_ops *ops, char *args, int from_tty)
+thread_db_detach (struct target_ops *ops, const char *args, int from_tty)
{
struct target_ops *target_beneath = find_target_beneath (ops);
struct thread_db_info *info;
- info = get_thread_db_info (GET_PID (inferior_ptid));
+ info = get_thread_db_info (ptid_get_pid (inferior_ptid));
if (info)
- {
- if (target_has_execution)
- {
- disable_thread_event_reporting (info);
-
- /* Delete the old thread event breakpoints. Note that
- unlike when mourning, we can remove them here because
- there's still a live inferior to poke at. In any case,
- GDB will not try to insert anything in the inferior when
- removing a breakpoint. */
- remove_thread_event_breakpoints ();
- }
-
- delete_thread_db_info (GET_PID (inferior_ptid));
- }
+ delete_thread_db_info (ptid_get_pid (inferior_ptid));
target_beneath->to_detach (target_beneath, args, from_tty);
unpush_target (&thread_db_ops);
}
-/* Check if PID is currently stopped at the location of a thread event
- breakpoint location. If it is, read the event message and act upon
- the event. */
-
-static void
-check_event (ptid_t ptid)
-{
- struct regcache *regcache = get_thread_regcache (ptid);
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
- td_event_msg_t msg;
- td_thrinfo_t ti;
- td_err_e err;
- CORE_ADDR stop_pc;
- int loop = 0;
- struct thread_db_info *info;
-
- info = get_thread_db_info (GET_PID (ptid));
-
- /* Bail out early if we're not at a thread event breakpoint. */
- stop_pc = regcache_read_pc (regcache)
- - gdbarch_decr_pc_after_break (gdbarch);
- if (stop_pc != info->td_create_bp_addr
- && stop_pc != info->td_death_bp_addr)
- return;
-
- /* Access an lwp we know is stopped. */
- info->proc_handle.ptid = ptid;
-
- /* If we have only looked at the first thread before libpthread was
- initialized, we may not know its thread ID yet. Make sure we do
- before we add another thread to the list. */
- if (!have_threads (ptid))
- thread_db_find_new_threads_1 (ptid);
-
- /* If we are at a create breakpoint, we do not know what new lwp
- was created and cannot specifically locate the event message for it.
- We have to call td_ta_event_getmsg() to get
- the latest message. Since we have no way of correlating whether
- the event message we get back corresponds to our breakpoint, we must
- loop and read all event messages, processing them appropriately.
- This guarantees we will process the correct message before continuing
- from the breakpoint.
-
- Currently, death events are not enabled. If they are enabled,
- the death event can use the td_thr_event_getmsg() interface to
- get the message specifically for that lwp and avoid looping
- below. */
-
- loop = 1;
-
- do
- {
- err = info->td_ta_event_getmsg_p (info->thread_agent, &msg);
- if (err != TD_OK)
- {
- if (err == TD_NOMSG)
- return;
-
- error (_("Cannot get thread event message: %s"),
- thread_db_err_str (err));
- }
-
- err = info->td_thr_get_info_p (msg.th_p, &ti);
- if (err != TD_OK)
- error (_("Cannot get thread info: %s"), thread_db_err_str (err));
-
- ptid = ptid_build (GET_PID (ptid), ti.ti_lid, 0);
-
- switch (msg.event)
- {
- case TD_CREATE:
- /* Call attach_thread whether or not we already know about a
- thread with this thread ID. */
- attach_thread (ptid, msg.th_p, &ti);
-
- break;
-
- case TD_DEATH:
-
- if (!in_thread_list (ptid))
- error (_("Spurious thread death event."));
-
- detach_thread (ptid);
-
- break;
-
- default:
- error (_("Spurious thread event."));
- }
- }
- while (loop);
-}
-
static ptid_t
thread_db_wait (struct target_ops *ops,
ptid_t ptid, struct target_waitstatus *ourstatus,
ptid = beneath->to_wait (beneath, ptid, ourstatus, options);
- if (ourstatus->kind == TARGET_WAITKIND_IGNORE)
- return ptid;
-
- if (ourstatus->kind == TARGET_WAITKIND_EXITED
- || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
- return ptid;
+ switch (ourstatus->kind)
+ {
+ case TARGET_WAITKIND_IGNORE:
+ case TARGET_WAITKIND_EXITED:
+ case TARGET_WAITKIND_THREAD_EXITED:
+ case TARGET_WAITKIND_SIGNALLED:
+ return ptid;
+ }
- info = get_thread_db_info (GET_PID (ptid));
+ info = get_thread_db_info (ptid_get_pid (ptid));
/* If this process isn't using thread_db, we're done. */
if (info == NULL)
{
/* New image, it may or may not end up using thread_db. Assume
not unless we find otherwise. */
- delete_thread_db_info (GET_PID (ptid));
+ delete_thread_db_info (ptid_get_pid (ptid));
if (!thread_db_list)
unpush_target (&thread_db_ops);
- /* Thread event breakpoints are deleted by
- update_breakpoints_after_exec. */
-
return ptid;
}
- /* If we do not know about the main thread yet, this would be a good time to
- find it. */
- if (ourstatus->kind == TARGET_WAITKIND_STOPPED && !have_threads (ptid))
- thread_db_find_new_threads_1 (ptid);
-
- if (ourstatus->kind == TARGET_WAITKIND_STOPPED
- && ourstatus->value.sig == GDB_SIGNAL_TRAP)
- /* Check for a thread event. */
- check_event (ptid);
-
- if (have_threads (ptid))
- {
- /* Fill in the thread's user-level thread id. */
- thread_from_lwp (ptid);
- }
+ /* Fill in the thread's user-level thread id and status. */
+ thread_from_lwp (ptid);
return ptid;
}
{
struct target_ops *target_beneath = find_target_beneath (ops);
- delete_thread_db_info (GET_PID (inferior_ptid));
+ delete_thread_db_info (ptid_get_pid (inferior_ptid));
target_beneath->to_mourn_inferior (target_beneath);
- /* Delete the old thread event breakpoints. Do this after mourning
- the inferior, so that we don't try to uninsert them. */
- remove_thread_event_breakpoints ();
-
/* Detach thread_db target ops. */
if (!thread_db_list)
unpush_target (ops);
td_err_e err;
ptid_t ptid;
struct thread_info *tp;
- struct callback_data *cb_data = data;
+ struct callback_data *cb_data = (struct callback_data *) data;
struct thread_db_info *info = cb_data->info;
err = info->td_thr_get_info_p (th_p, &ti);
error (_("find_new_threads_callback: cannot get thread info: %s"),
thread_db_err_str (err));
+ if (ti.ti_lid == -1)
+ {
+ /* A thread with kernel thread ID -1 is either a thread that
+ exited and was joined, or a thread that is being created but
+ hasn't started yet, and that is reusing the tcb/stack of a
+ thread that previously exited and was joined. (glibc marks
+ terminated and joined threads with kernel thread ID -1. See
+ glibc PR17707. */
+ if (libthread_db_debug)
+ fprintf_unfiltered (gdb_stdlog,
+ "thread_db: skipping exited and "
+ "joined thread (0x%lx)\n",
+ (unsigned long) ti.ti_tid);
+ return 0;
+ }
+
if (ti.ti_tid == 0)
{
/* A thread ID of zero means that this is the main thread, but
glibc has not yet initialized thread-local storage and the
pthread library. We do not know what the thread's TID will
- be yet. Just enable event reporting and otherwise ignore
- it. */
+ be yet. */
/* In that case, we're not stopped in a fork syscall and don't
need this glibc bug workaround. */
info->need_stale_parent_threads_check = 0;
- if (target_has_execution)
- {
- err = info->td_thr_event_enable_p (th_p, 1);
- if (err != TD_OK)
- error (_("Cannot enable thread event reporting for LWP %d: %s"),
- (int) ti.ti_lid, thread_db_err_str (err));
- }
-
return 0;
}
ptid = ptid_build (info->pid, ti.ti_lid, 0);
tp = find_thread_ptid (ptid);
- if (tp == NULL || tp->private == NULL)
- {
- if (attach_thread (ptid, th_p, &ti))
- cb_data->new_threads += 1;
- else
- /* Problem attaching this thread; perhaps it exited before we
- could attach it?
- This could mean that the thread list inside glibc itself is in
- inconsistent state, and libthread_db could go on looping forever
- (observed with glibc-2.3.6). To prevent that, terminate
- iteration: thread_db_find_new_threads_2 will retry. */
- return 1;
- }
+ if (tp == NULL || tp->priv == NULL)
+ record_thread (info, tp, ptid, th_p, &ti);
return 0;
}
find_new_threads_once (struct thread_db_info *info, int iteration,
td_err_e *errp)
{
- volatile struct gdb_exception except;
struct callback_data data;
td_err_e err = TD_ERR;
data.info = info;
data.new_threads = 0;
- TRY_CATCH (except, RETURN_MASK_ERROR)
+ /* See comment in thread_db_update_thread_list. */
+ gdb_assert (info->td_ta_thr_iter_p != NULL);
+
+ TRY
{
/* Iterate over all user-space threads to discover new threads. */
err = info->td_ta_thr_iter_p (info->thread_agent,
TD_SIGNO_MASK,
TD_THR_ANY_USER_FLAGS);
}
+ CATCH (except, RETURN_MASK_ERROR)
+ {
+ if (libthread_db_debug)
+ {
+ exception_fprintf (gdb_stdlog, except,
+ "Warning: find_new_threads_once: ");
+ }
+ }
+ END_CATCH
if (libthread_db_debug)
{
- if (except.reason < 0)
- exception_fprintf (gdb_stderr, except,
- "Warning: find_new_threads_once: ");
-
- printf_filtered (_("Found %d new threads in iteration %d.\n"),
- data.new_threads, iteration);
+ fprintf_unfiltered (gdb_stdlog,
+ _("Found %d new threads in iteration %d.\n"),
+ data.new_threads, iteration);
}
if (errp != NULL)
{
td_err_e err = TD_OK;
struct thread_db_info *info;
- int pid = ptid_get_pid (ptid);
int i, loop;
- info = get_thread_db_info (GET_PID (ptid));
+ info = get_thread_db_info (ptid_get_pid (ptid));
/* Access an lwp we know is stopped. */
info->proc_handle.ptid = ptid;
thread_db_find_new_threads_2 (ptid, 0);
}
-static int
-update_thread_core (struct lwp_info *info, void *closure)
-{
- info->core = linux_common_core_of_thread (info->ptid);
- return 0;
-}
+/* Implement the to_update_thread_list target method for this
+ target. */
static void
-thread_db_find_new_threads (struct target_ops *ops)
+thread_db_update_thread_list (struct target_ops *ops)
{
struct thread_db_info *info;
struct inferior *inf;
+ prune_threads ();
+
ALL_INFERIORS (inf)
{
struct thread_info *thread;
if (thread == NULL || thread->executing)
continue;
+ /* It's best to avoid td_ta_thr_iter if possible. That walks
+ data structures in the inferior's address space that may be
+ corrupted, or, if the target is running, the list may change
+ while we walk it. In the latter case, it's possible that a
+ thread exits just at the exact time that causes GDB to get
+ stuck in an infinite loop. To avoid pausing all threads
+ whenever the core wants to refresh the thread list, we
+ instead use thread_from_lwp immediately when we see an LWP
+ stop. That uses thread_db entry points that do not walk
+ libpthread's thread list, so should be safe, as well as more
+ efficient. */
+ if (target_has_execution_1 (thread->ptid))
+ continue;
+
thread_db_find_new_threads_1 (thread->ptid);
}
- if (target_has_execution)
- iterate_over_lwps (minus_one_ptid /* iterate over all */,
- update_thread_core, NULL);
+ /* Give the beneath target a chance to do extra processing. */
+ ops->beneath->to_update_thread_list (ops->beneath);
}
-static char *
+static const char *
thread_db_pid_to_str (struct target_ops *ops, ptid_t ptid)
{
struct thread_info *thread_info = find_thread_ptid (ptid);
struct target_ops *beneath;
- if (thread_info != NULL && thread_info->private != NULL)
+ if (thread_info != NULL && thread_info->priv != NULL)
{
static char buf[64];
- thread_t tid;
+ thread_db_thread_info *priv = get_thread_db_thread_info (thread_info);
- tid = thread_info->private->tid;
snprintf (buf, sizeof (buf), "Thread 0x%lx (LWP %ld)",
- tid, GET_LWP (ptid));
+ (unsigned long) priv->tid, ptid_get_lwp (ptid));
return buf;
}
beneath = find_target_beneath (ops);
- if (beneath->to_pid_to_str (beneath, ptid))
- return beneath->to_pid_to_str (beneath, ptid);
-
- return normal_pid_to_str (ptid);
+ return beneath->to_pid_to_str (beneath, ptid);
}
/* Return a string describing the state of the thread specified by
INFO. */
-static char *
-thread_db_extra_thread_info (struct thread_info *info)
+static const char *
+thread_db_extra_thread_info (struct target_ops *self,
+ struct thread_info *info)
{
- if (info->private == NULL)
+ if (info->priv == NULL)
return NULL;
- if (info->private->dying)
+ thread_db_thread_info *priv = get_thread_db_thread_info (info);
+
+ if (priv->dying)
return "Exiting";
return NULL;
}
+/* Return pointer to the thread_info struct which corresponds to
+ THREAD_HANDLE (having length HANDLE_LEN). */
+
+static struct thread_info *
+thread_db_thread_handle_to_thread_info (struct target_ops *ops,
+ const gdb_byte *thread_handle,
+ int handle_len,
+ struct inferior *inf)
+{
+ struct thread_info *tp;
+ thread_t handle_tid;
+
+ /* Thread handle sizes must match in order to proceed. We don't use an
+ assert here because the resulting internal error will cause GDB to
+ exit. This isn't necessarily an internal error due to the possibility
+ of garbage being passed as the thread handle via the python interface. */
+ if (handle_len != sizeof (handle_tid))
+ error (_("Thread handle size mismatch: %d vs %zu (from libthread_db)"),
+ handle_len, sizeof (handle_tid));
+
+ handle_tid = * (const thread_t *) thread_handle;
+
+ ALL_NON_EXITED_THREADS (tp)
+ {
+ thread_db_thread_info *priv = get_thread_db_thread_info (tp);
+
+ if (tp->inf == inf && priv != NULL && handle_tid == priv->tid)
+ return tp;
+ }
+
+ return NULL;
+}
+
/* Get the address of the thread local variable in load module LM which
is stored at OFFSET within the thread local storage for thread PTID. */
struct thread_info *thread_info;
struct target_ops *beneath;
- /* If we have not discovered any threads yet, check now. */
- if (!have_threads (ptid))
- thread_db_find_new_threads_1 (ptid);
-
/* Find the matching thread. */
thread_info = find_thread_ptid (ptid);
- if (thread_info != NULL && thread_info->private != NULL)
+ /* We may not have discovered the thread yet. */
+ if (thread_info != NULL && thread_info->priv == NULL)
+ thread_info = thread_from_lwp (ptid);
+
+ if (thread_info != NULL && thread_info->priv != NULL)
{
td_err_e err;
psaddr_t address;
- struct thread_db_info *info;
-
- info = get_thread_db_info (GET_PID (ptid));
-
- /* glibc doesn't provide the needed interface. */
- if (!info->td_thr_tls_get_addr_p)
- throw_error (TLS_NO_LIBRARY_SUPPORT_ERROR,
- _("No TLS library support"));
-
- /* Caller should have verified that lm != 0. */
- gdb_assert (lm != 0);
+ thread_db_info *info = get_thread_db_info (ptid_get_pid (ptid));
+ thread_db_thread_info *priv = get_thread_db_thread_info (thread_info);
/* Finally, get the address of the variable. */
- /* Note the cast through uintptr_t: this interface only works if
- a target address fits in a psaddr_t, which is a host pointer.
- So a 32-bit debugger can not access 64-bit TLS through this. */
- err = info->td_thr_tls_get_addr_p (&thread_info->private->th,
- (psaddr_t)(uintptr_t) lm,
- offset, &address);
+ if (lm != 0)
+ {
+ /* glibc doesn't provide the needed interface. */
+ if (!info->td_thr_tls_get_addr_p)
+ throw_error (TLS_NO_LIBRARY_SUPPORT_ERROR,
+ _("No TLS library support"));
+
+ /* Note the cast through uintptr_t: this interface only works if
+ a target address fits in a psaddr_t, which is a host pointer.
+ So a 32-bit debugger can not access 64-bit TLS through this. */
+ err = info->td_thr_tls_get_addr_p (&priv->th,
+ (psaddr_t)(uintptr_t) lm,
+ offset, &address);
+ }
+ else
+ {
+ /* If glibc doesn't provide the needed interface throw an error
+ that LM is zero - normally cases it should not be. */
+ if (!info->td_thr_tlsbase_p)
+ throw_error (TLS_LOAD_MODULE_NOT_FOUND_ERROR,
+ _("TLS load module not found"));
+
+ /* This code path handles the case of -static -pthread executables:
+ https://sourceware.org/ml/libc-help/2014-03/msg00024.html
+ For older GNU libc r_debug.r_map is NULL. For GNU libc after
+ PR libc/16831 due to GDB PR threads/16954 LOAD_MODULE is also NULL.
+ The constant number 1 depends on GNU __libc_setup_tls
+ initialization of l_tls_modid to 1. */
+ err = info->td_thr_tlsbase_p (&priv->th, 1, &address);
+ address = (char *) address + offset;
+ }
#ifdef THREAD_DB_HAS_TD_NOTALLOC
/* The memory hasn't been allocated, yet. */
}
beneath = find_target_beneath (ops);
- if (beneath->to_get_thread_local_address)
- return beneath->to_get_thread_local_address (beneath, ptid, lm, offset);
- else
- throw_error (TLS_GENERIC_ERROR,
- _("TLS not supported on this target"));
-}
-
-/* Callback routine used to find a thread based on the TID part of
- its PTID. */
-
-static int
-thread_db_find_thread_from_tid (struct thread_info *thread, void *data)
-{
- long *tid = (long *) data;
-
- if (thread->private->tid == *tid)
- return 1;
-
- return 0;
+ return beneath->to_get_thread_local_address (beneath, ptid, lm, offset);
}
/* Implement the to_get_ada_task_ptid target method for this target. */
static ptid_t
-thread_db_get_ada_task_ptid (long lwp, long thread)
+thread_db_get_ada_task_ptid (struct target_ops *self, long lwp, long thread)
{
- struct thread_info *thread_info;
-
- thread_db_find_new_threads_1 (inferior_ptid);
- thread_info = iterate_over_threads (thread_db_find_thread_from_tid, &thread);
-
- gdb_assert (thread_info != NULL);
-
- return (thread_info->ptid);
+ /* NPTL uses a 1:1 model, so the LWP id suffices. */
+ return ptid_build (ptid_get_pid (inferior_ptid), lwp, 0);
}
static void
struct thread_db_info *info;
if (ptid_equal (ptid, minus_one_ptid))
- info = get_thread_db_info (GET_PID (inferior_ptid));
+ info = get_thread_db_info (ptid_get_pid (inferior_ptid));
else
- info = get_thread_db_info (GET_PID (ptid));
+ info = get_thread_db_info (ptid_get_pid (ptid));
/* This workaround is only needed for child fork lwps stopped in a
PTRACE_O_TRACEFORK event. When the inferior is resumed, the
/* Implement 'info auto-load libthread-db'. */
static void
-info_auto_load_libthread_db (char *args, int from_tty)
+info_auto_load_libthread_db (const char *args, int from_tty)
{
struct ui_out *uiout = current_uiout;
const char *cs = args ? args : "";
char *pids;
int i;
- while (isspace (*cs))
- cs++;
+ cs = skip_spaces (cs);
if (*cs)
error (_("'info auto-load libthread-db' does not accept any parameters"));
if (info->filename != NULL)
info_count++;
- array = xmalloc (sizeof (*array) * info_count);
+ array = XNEWVEC (struct thread_db_info *, info_count);
back_to = make_cleanup (xfree, array);
info_count = 0;
if (i == 0 || strcmp (array[i - 1]->filename, array[i]->filename) != 0)
{
unique_filenames++;
- max_filename_len = max (max_filename_len,
- strlen (array[i]->filename));
+ max_filename_len = std::max (max_filename_len,
+ strlen (array[i]->filename));
if (i > 0)
{
pids_len -= strlen (", ");
- max_pids_len = max (max_pids_len, pids_len);
+ max_pids_len = std::max (max_pids_len, pids_len);
}
pids_len = 0;
}
if (i)
{
pids_len -= strlen (", ");
- max_pids_len = max (max_pids_len, pids_len);
+ max_pids_len = std::max (max_pids_len, pids_len);
}
/* Table header shifted right by preceding "libthread-db: " would not match
its columns. */
if (info_count > 0 && args == auto_load_info_scripts_pattern_nl)
- ui_out_text (uiout, "\n");
+ uiout->text ("\n");
- make_cleanup_ui_out_table_begin_end (uiout, 2, unique_filenames,
- "LinuxThreadDbTable");
+ {
+ ui_out_emit_table table_emitter (uiout, 2, unique_filenames,
+ "LinuxThreadDbTable");
- ui_out_table_header (uiout, max_filename_len, ui_left, "filename",
- "Filename");
- ui_out_table_header (uiout, pids_len, ui_left, "PIDs", "Pids");
- ui_out_table_body (uiout);
+ uiout->table_header (max_filename_len, ui_left, "filename", "Filename");
+ uiout->table_header (pids_len, ui_left, "PIDs", "Pids");
+ uiout->table_body ();
- pids = xmalloc (max_pids_len + 1);
- make_cleanup (xfree, pids);
+ pids = (char *) xmalloc (max_pids_len + 1);
+ make_cleanup (xfree, pids);
- /* Note I is incremented inside the cycle, not at its end. */
- for (i = 0; i < info_count;)
- {
- struct cleanup *chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
- char *pids_end;
+ /* Note I is incremented inside the cycle, not at its end. */
+ for (i = 0; i < info_count;)
+ {
+ ui_out_emit_tuple tuple_emitter (uiout, NULL);
+ char *pids_end;
- info = array[i];
- ui_out_field_string (uiout, "filename", info->filename);
- pids_end = pids;
+ info = array[i];
+ uiout->field_string ("filename", info->filename);
+ pids_end = pids;
- while (i < info_count && strcmp (info->filename, array[i]->filename) == 0)
- {
- if (pids_end != pids)
- {
- *pids_end++ = ',';
- *pids_end++ = ' ';
- }
- pids_end += xsnprintf (pids_end, &pids[max_pids_len + 1] - pids_end,
- "%u", array[i]->pid);
- gdb_assert (pids_end < &pids[max_pids_len + 1]);
-
- i++;
- }
- *pids_end = '\0';
+ while (i < info_count && strcmp (info->filename,
+ array[i]->filename) == 0)
+ {
+ if (pids_end != pids)
+ {
+ *pids_end++ = ',';
+ *pids_end++ = ' ';
+ }
+ pids_end += xsnprintf (pids_end,
+ &pids[max_pids_len + 1] - pids_end,
+ "%u", array[i]->pid);
+ gdb_assert (pids_end < &pids[max_pids_len + 1]);
+
+ i++;
+ }
+ *pids_end = '\0';
- ui_out_field_string (uiout, "pids", pids);
+ uiout->field_string ("pids", pids);
- ui_out_text (uiout, "\n");
- do_cleanups (chain);
- }
+ uiout->text ("\n");
+ }
+ }
do_cleanups (back_to);
if (info_count == 0)
- ui_out_message (uiout, 0, _("No auto-loaded libthread-db.\n"));
+ uiout->message (_("No auto-loaded libthread-db.\n"));
}
static void
thread_db_ops.to_wait = thread_db_wait;
thread_db_ops.to_resume = thread_db_resume;
thread_db_ops.to_mourn_inferior = thread_db_mourn_inferior;
- thread_db_ops.to_find_new_threads = thread_db_find_new_threads;
+ thread_db_ops.to_update_thread_list = thread_db_update_thread_list;
thread_db_ops.to_pid_to_str = thread_db_pid_to_str;
thread_db_ops.to_stratum = thread_stratum;
thread_db_ops.to_has_thread_control = tc_schedlock;
= thread_db_get_thread_local_address;
thread_db_ops.to_extra_thread_info = thread_db_extra_thread_info;
thread_db_ops.to_get_ada_task_ptid = thread_db_get_ada_task_ptid;
+ thread_db_ops.to_thread_handle_to_thread_info = thread_db_thread_handle_to_thread_info;
thread_db_ops.to_magic = OPS_MAGIC;
-}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_thread_db;
+ complete_target_initialization (&thread_db_ops);
+}
void
_initialize_thread_db (void)
{
init_thread_db_ops ();
- add_target (&thread_db_ops);
/* Defer loading of libthread_db.so until inferior is running.
This allows gdb to load correct libthread_db for a given
- executable -- there could be mutiple versions of glibc,
- compiled with LinuxThreads or NPTL, and until there is
- a running inferior, we can't tell which libthread_db is
- the correct one to load. */
+ executable -- there could be multiple versions of glibc,
+ and until there is a running inferior, we can't tell which
+ libthread_db is the correct one to load. */
libthread_db_search_path = xstrdup (LIBTHREAD_DB_SEARCH_PATH);
projects / deliverable / binutils-gdb.git / blobdiff