+2015-09-08 Mark Wielaard <mjw@redhat.com>
+
+ * libdwflP.h (struct __libdwfl_pid_arg): Add elf and elf_fd.
+ * linux-pid-attach.c (pid_detach): Call elf_end and close.
+ (dwfl_linux_proc_attach): Open and save /proc/PID/exe.
+
2015-09-04 Chih-Hung Hsieh <chh@google.com
* frame_unwind.c (expr_eval): Use llabs instead of abs.
then get the instance through __libdwfl_get_pid_arg. */
struct __libdwfl_pid_arg
{
+ /* /proc/PID/task/. */
DIR *dir;
+ /* Elf for /proc/PID/exe. Set to NULL if it couldn't be opened. */
+ Elf *elf;
+ /* fd for /proc/PID/exe. Set to -1 if it couldn't be opened. */
+ int elf_fd;
/* It is 0 if not used. */
pid_t tid_attached;
/* Valid only if TID_ATTACHED is not zero. */
/* Get Dwarf Frame state for target live PID process.
- Copyright (C) 2013, 2014 Red Hat, Inc.
+ Copyright (C) 2013, 2014, 2015 Red Hat, Inc.
This file is part of elfutils.
This file is free software; you can redistribute it and/or modify
the GNU Lesser General Public License along with this program. If
not, see <http://www.gnu.org/licenses/>. */
+#include "libelfP.h"
#include "libdwflP.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <dirent.h>
pid_detach (Dwfl *dwfl __attribute__ ((unused)), void *dwfl_arg)
{
struct __libdwfl_pid_arg *pid_arg = dwfl_arg;
+ elf_end (pid_arg->elf);
+ close (pid_arg->elf_fd);
closedir (pid_arg->dir);
free (pid_arg);
}
goto fail;
}
- char dirname[64];
- int i = snprintf (dirname, sizeof (dirname), "/proc/%ld/task", (long) pid);
- assert (i > 0 && i < (ssize_t) sizeof (dirname) - 1);
- DIR *dir = opendir (dirname);
+ char name[64];
+ int i = snprintf (name, sizeof (name), "/proc/%ld/task", (long) pid);
+ assert (i > 0 && i < (ssize_t) sizeof (name) - 1);
+ DIR *dir = opendir (name);
if (dir == NULL)
{
err = errno;
goto fail;
}
+
+ Elf *elf;
+ i = snprintf (name, sizeof (name), "/proc/%ld/exe", (long) pid);
+ assert (i > 0 && i < (ssize_t) sizeof (name) - 1);
+ int elf_fd = open (name, O_RDONLY);
+ if (elf_fd >= 0)
+ {
+ elf = elf_begin (elf_fd, ELF_C_READ_MMAP, NULL);
+ if (elf == NULL)
+ {
+ /* Just ignore, dwfl_attach_state will fall back to trying
+ to associate the Dwfl with one of the existing DWfl_Module
+ ELF images (to know the machine/class backend to use). */
+ close (elf_fd);
+ elf_fd = -1;
+ }
+ }
+ else
+ elf = NULL;
struct __libdwfl_pid_arg *pid_arg = malloc (sizeof *pid_arg);
if (pid_arg == NULL)
{
+ elf_end (elf);
+ close (elf_fd);
closedir (dir);
err = ENOMEM;
goto fail;
}
pid_arg->dir = dir;
+ pid_arg->elf = elf;
+ pid_arg->elf_fd = elf_fd;
pid_arg->tid_attached = 0;
pid_arg->assume_ptrace_stopped = assume_ptrace_stopped;
- if (! INTUSE(dwfl_attach_state) (dwfl, NULL, pid, &pid_thread_callbacks,
+ if (! INTUSE(dwfl_attach_state) (dwfl, elf, pid, &pid_thread_callbacks,
pid_arg))
{
+ elf_end (elf);
+ close (elf_fd);
closedir (dir);
free (pid_arg);
return -1;
+2015-09-08 Mark Wielaard <mjw@redhat.com>
+
+ * dwfl-proc-attach.c: New test.
+ * Makefile.am (check_PROGRAMS): Add dwfl-proc-attach.
+ (TESTS): Likewise.
+ (dwfl_proc_attach_LDADD): New variable.
+ (dwfl_proc_attach_LDFLAGS): Likewise.
+
2015-09-04 Chih-Hung Hsieh <chh@google.com>
* varlocs.c (print_base_type): Initialize enctype.
dwfl-report-elf-align varlocs backtrace backtrace-child \
backtrace-data backtrace-dwarf debuglink debugaltlink \
buildid deleted deleted-lib.so aggregate_size vdsosyms \
- getsrc_die strptr newdata elfstrtab
+ getsrc_die strptr newdata elfstrtab dwfl-proc-attach
asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
asm-tst6 asm-tst7 asm-tst8 asm-tst9
run-stack-demangled-test.sh \
run-readelf-dwz-multi.sh run-allfcts-multi.sh run-deleted.sh \
run-linkmap-cut.sh run-aggregate-size.sh vdsosyms run-readelf-A.sh \
- run-getsrc-die.sh run-strptr.sh newdata elfstrtab
+ run-getsrc-die.sh run-strptr.sh newdata elfstrtab dwfl-proc-attach
if !BIARCH
export ELFUTILS_DISABLE_BIARCH = 1
strptr_LDADD = $(libelf)
newdata_LDADD = $(libelf)
elfstrtab_LDADD = $(libelf)
+dwfl_proc_attach_LDADD = $(libdw)
+dwfl_proc_attach_LDFLAGS = -pthread
if GCOV
check: check-am coverage
--- /dev/null
+/* Test dwfl_linux_proc_attach works without any modules.
+ Copyright (C) 2015 Red Hat, Inc.
+ This file is part of elfutils.
+
+ This file is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ elfutils is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <error.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/user.h>
+#include <fcntl.h>
+#include <string.h>
+#include ELFUTILS_HEADER(dwfl)
+#include <pthread.h>
+
+#ifndef __linux__
+int
+main (int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)))
+{
+ printf ("dwfl_linux_proc_attach unsupported.\n");
+ return 77;
+}
+#else /* __linux__ */
+
+static pthread_t thread1;
+static pthread_t thread2;
+
+static void *
+sleeper (void* d __attribute__ ((unused)))
+{
+ sleep (60);
+ return NULL;
+}
+
+static char *debuginfo_path = NULL;
+
+static const Dwfl_Callbacks proc_callbacks =
+ {
+ .find_elf = dwfl_linux_proc_find_elf,
+ .find_debuginfo = dwfl_standard_find_debuginfo,
+ .debuginfo_path = &debuginfo_path,
+ };
+
+static int
+thread_callback (Dwfl_Thread *thread, void *thread_arg)
+{
+ int *threads = (int *) thread_arg;
+ pid_t tid = dwfl_thread_tid (thread);
+ printf ("thread tid: %d\n", tid);
+ (*threads)++;
+
+ return DWARF_CB_OK;
+}
+
+int
+main (int argc __attribute__ ((unused)),
+ char **argv __attribute__ ((unused)))
+{
+ /* Create two extra threads to iterate through. */
+ int err;
+ if ((err = pthread_create (&thread1, NULL, sleeper, NULL)) != 0)
+ error (-1, err, "Couldn't create thread1");
+ if ((err = pthread_create (&thread2, NULL, sleeper, NULL)) != 0)
+ error (-1, err, "Couldn't create thread2");
+
+ Dwfl *dwfl = dwfl_begin (&proc_callbacks);
+ if (dwfl == NULL)
+ error (-1, 0, "dwfl_begin: %s", dwfl_errmsg (-1));
+
+ pid_t pid = getpid ();
+ /* This used to fail, since we don't have any modules yet. */
+ if (dwfl_linux_proc_attach (dwfl, pid, false) < 0)
+ error (-1, 0, "dwfl_linux_proc_attach pid %d: %s", pid,
+ dwfl_errmsg (-1));
+
+ /* Did we see all 3 threads? */
+ int threads = 0;
+ if (dwfl_getthreads (dwfl, thread_callback, &threads) != DWARF_CB_OK)
+ error (-1, 0, "dwfl_getthreads failed: %s", dwfl_errmsg (-1));
+
+ return (threads == 3) ? 0 : -1;
+}
+
+#endif /* __linux__ */
projects / thirdparty / elfutils.git / commitdiff
