Back to the nonthreaded mode.

diff --git a/Makefile b/Makefile
index 8929e34..a2527ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ CC=gcc -ggdb3 -Wall -Werror
 all: debugger check
 
 debugger: debugger.c debugger.h
-       $(CC) -o $@ $< -lthread_db -pthread -ldw
+       $(CC) -o $@ $<
 
 testsuite: testsuite.c debugger.c debugger.h
-       $(CC) -o $@ $< -lthread_db -pthread -ldw
+       $(CC) -o $@ $< -pthread
 
 .PHONY: check
 check: testsuite

diff --git a/debugger.c b/debugger.c
index f880038..7aa80cf 100644 (file)
--- a/debugger.c
+++ b/debugger.c
@@ -11,9 +11,6 @@
 #include <sys/wait.h>
 #include <limits.h>
 #include <string.h>
-#include <execinfo.h>
-#include <thread_db.h>
-#include <elfutils/libdwfl.h>
 
 #include "debugger.h"
 
@@ -156,7 +153,7 @@ static enum state state (pid_t pid, unsigned expect_mask, const char *expect_mas
 /* Debugging only: Number of signal needing redelivery on PTRACE_ATTACH.  */
 int attach_redelivered;
 
-static int attach_single (pid_t pid)
+int attach (pid_t pid)
 {
   int i;
   int status;
@@ -222,208 +219,6 @@ static int attach_single (pid_t pid)
   return stopped;
 }
 
-struct ps_prochandle_module
-  {
-    struct ps_prochandle_module *next;
-    Dwfl_Module *module;
-  };
-
-struct ps_prochandle
-  {
-    pid_t pid;
-    Dwfl *dwfl;
-    struct ps_prochandle_module *module_list;
-  };
-
-static int get_dwfl_find_debuginfo (Dwfl_Module *mod, void **userdata,
-                                   const char *modname, GElf_Addr base,
-                                   const char *file_name,
-                                   const char *debuglink_file,
-                                   GElf_Word debuglink_crc,
-                                   char **debuginfo_file_name)
-{
-  printf("modname=<%s>,file_name=<%s>\n",modname,file_name);
-  return dwfl_standard_find_debuginfo (mod, userdata, modname, base, file_name,
-                                      debuglink_file, debuglink_crc,
-                                      debuginfo_file_name);
-}
-
-static Dwfl *get_dwfl (struct ps_prochandle *proc_handle)
-{
-  static char *debuginfo_path;
-
-  static const Dwfl_Callbacks proc_callbacks =
-   {
-     .find_debuginfo = get_dwfl_find_debuginfo,
-     .debuginfo_path = &debuginfo_path,
-
-     .find_elf = dwfl_linux_proc_find_elf,
-   };
-
-  if (proc_handle->dwfl == NULL)
-    {
-      proc_handle->dwfl = dwfl_begin (&proc_callbacks);
-      assert (proc_handle->dwfl != NULL);
-
-      if (dwfl_linux_proc_report (proc_handle->dwfl, proc_handle->pid) != 0
-        || dwfl_report_end (proc_handle->dwfl, NULL, NULL) != 0)
-       {
-         dwfl_end (proc_handle->dwfl);
-         proc_handle->dwfl = NULL;
-         crash ();
-       }
-    }
-  return proc_handle->dwfl;
-}
-
-/* Functions in this interface return one of these status codes.  */
-typedef enum
-{
-  PS_OK,               /* Generic "call succeeded".  */
-  PS_ERR,              /* Generic error. */
-  PS_BADPID,           /* Bad process handle.  */
-  PS_BADLID,           /* Bad LWP identifier.  */ 
-  PS_BADADDR,          /* Bad address.  */
-  PS_NOSYM,            /* Could not find given symbol.  */
-  PS_NOFREGS           /* FPU register set not available for given LWP.  */
-} ps_err_e;
-
-ps_err_e ps_pdread (struct ps_prochandle *proc_handle, psaddr_t addr,
-                   void *buffer, size_t length)
-{
-  crash ();
-}
-
-ps_err_e ps_pdwrite (struct ps_prochandle *proc_handle, psaddr_t addr,
-                    const void *buffer, size_t length)
-{
-  crash ();
-}
-
-ps_err_e ps_lgetregs (struct ps_prochandle *proc_handle, lwpid_t lwp,
-                     prgregset_t regs)
-{
-  crash ();
-}
-
-ps_err_e ps_lsetregs (struct ps_prochandle *proc_handle, lwpid_t lwp,
-                     const prgregset_t regs)
-{
-  crash ();
-}
-
-ps_err_e ps_lgetfpregs (struct ps_prochandle *proc_handle, lwpid_t lwp,
-                       prfpregset_t *fpregs)
-{
-  crash ();
-}
-
-ps_err_e ps_lsetfpregs (struct ps_prochandle *proc_handle, lwpid_t lwp,
-                       const prfpregset_t *fpregs)
-{
-  crash ();
-}
-
-/* Return the PID of the process.  */
-pid_t ps_getpid (struct ps_prochandle *proc_handle)
-{
-  crash ();
-}
-
-/* Look up the named symbol in the named DSO in the symbol tables
-   associated with the process being debugged, filling in *SYM_ADDR
-   with the corresponding run-time address.  */
-ps_err_e ps_pglobal_lookup (struct ps_prochandle *proc_handle,
-                           const char *object_name, const char *sym_name,
-                           psaddr_t *sym_addr)
-{
-  Dwfl *dwfl = get_dwfl (proc_handle);
-  dwfl = dwfl;
-  dwfl_addrmodule (dwfl, 0x3571d00000);
-
-#if 0
-  Elf *elf = FIXME;
-  Elf_Scn *scn = NULL;
-  int sym_count, ndx;
-
-  sym_count = dwfl_module_getsymtab (Dwfl_Module *mod);
-  assert (sym_count >= 0);
-  for (ndx = 0; ndx < sym_count; ndx++)
-    {
-      GElf_Sym sym;
-      const char *name_got;
-
-      name_got = dwfl_module_getsym (Dwfl_Module *mod, ndx, &sym, NULL);
-      assert (name_got != NULL);
-      if (strcmp (name_got, sym_name) == 0)
-        break;
-    }
-  assert (ndx < sym_count);
-
-extern Elf *dwarf_getelf (Dwarf *dwarf);
-
-
-  while ((scn = elf_nextscn (elf, scn)) != NULL)
-    {
-      /* Handle the section if it is a symbol table.  */
-      GElf_Shdr shdr_mem;
-      GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
-
-      if (shdr != NULL && shdr->sh_type == SHT_SYMTAB)
-        handle_symtab (ebl, scn, shdr);
-    }
-
-
-  for (modulei = 0; modulei < dwfl->nmodules; modulei++)
-    {
-      Dwfl_Module *m = dwfl->modules[modulei];
-
-      puts (m->name);
-    }
-#if 0
-  if (strcmp (sym_name, "nptl_version") == 0)
-    {
-      extern const char nptl_version[];
-      *sym_addr = (psaddr_t) nptl_version;
-      return PS_OK;
-    }
-#endif
-#endif
-  crash ();
-}
-
-int attach (pid_t pid)
-{
-  int stopped;
-  td_err_e err;
-  td_thragent_t *thread_agent;
-  struct ps_prochandle proc_handle_local;
-  static int thread_db_init = 0;
-
-  stopped = attach_single (pid);
-
-  if (thread_db_init == 0)
-    {
-      err = td_init ();
-      assert (err == TD_OK);
-      thread_db_init = 1;
-    }
-
-  proc_handle_local.pid = pid;
-  proc_handle_local.dwfl = NULL;
-  err = td_ta_new (&proc_handle_local, &thread_agent);
-  if (proc_handle_local.dwfl != NULL)
-    dwfl_end (proc_handle_local.dwfl);
-  if (err == TD_NOLIBTHREAD)
-    {
-      delay ();
-      return stopped;
-    }
-  assert (err == TD_OK);
-
-  assert (0);
-}
-
 void detach (pid_t pid, int stopped)
 {
   int i;