diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | Makefile.in | 38 | ||||
| -rw-r--r-- | runtime/staprun/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/staprun/mainloop.c | 12 | ||||
| -rw-r--r-- | runtime/transport/ChangeLog | 7 | ||||
| -rw-r--r-- | runtime/transport/control.c | 3 | ||||
| -rw-r--r-- | runtime/transport/symbols.c | 2 | ||||
| -rw-r--r-- | runtime/transport/transport_msgs.h | 2 |
9 files changed, 30 insertions, 52 deletions
@@ -1,3 +1,9 @@ +2008-06-03 Frank Ch. Eigler <fche@elastic.org> + + PR 6429. + * Makefile.am: Don't link stapio with -ldw. + * Makefile.in: Regenerated. + 2008-06-02 Frank Ch. Eigler <fche@elastic.org> PR6534 diff --git a/Makefile.am b/Makefile.am index 3e8de940..e3327244 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,9 +79,6 @@ DISTCHECK_CONFIGURE_FLAGS = --with-elfutils=$(elfutils_abs_srcdir) stap_CPPFLAGS += -Iinclude-elfutils stap_LDFLAGS += -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) -stapio_CPPFLAGS += -Iinclude-elfutils -stapio_LDFLAGS += -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) BUILT_SOURCES += stamp-elfutils @@ -114,10 +111,10 @@ staprun_LDADD = @PROCFLAGS@ @cap_LIBS@ stapio_SOURCES = runtime/staprun/stapio.c \ runtime/staprun/mainloop.c runtime/staprun/common.c \ - runtime/staprun/ctl.c runtime/staprun/unwind_data.c \ + runtime/staprun/ctl.c \ runtime/staprun/relay.c runtime/staprun/relay_old.c stapio_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) -stapio_LDADD = @PROCFLAGS@ -ldw -lpthread +stapio_LDADD = @PROCFLAGS@ -lpthread install-exec-hook: if [ `id -u` -eq 0 ]; then chmod 04111 "$(DESTDIR)$(bindir)/staprun"; fi diff --git a/Makefile.in b/Makefile.in index b6695b29..38b0b79e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,12 +37,8 @@ bin_PROGRAMS = stap$(EXEEXT) staprun$(EXEEXT) @BUILD_ELFUTILS_TRUE@am__append_2 = -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ @BUILD_ELFUTILS_TRUE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) -@BUILD_ELFUTILS_TRUE@am__append_3 = -Iinclude-elfutils -@BUILD_ELFUTILS_TRUE@am__append_4 = -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ -@BUILD_ELFUTILS_TRUE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) - -@BUILD_ELFUTILS_TRUE@am__append_5 = stamp-elfutils -@BUILD_ELFUTILS_TRUE@am__append_6 = stamp-elfutils +@BUILD_ELFUTILS_TRUE@am__append_3 = stamp-elfutils +@BUILD_ELFUTILS_TRUE@am__append_4 = stamp-elfutils @BUILD_ELFUTILS_FALSE@stap_DEPENDENCIES = pkglibexec_PROGRAMS = stapio$(EXEEXT) noinst_PROGRAMS = loc2c-test$(EXEEXT) @@ -107,8 +103,7 @@ stap_LINK = $(CXXLD) $(stap_CXXFLAGS) $(CXXFLAGS) $(stap_LDFLAGS) \ $(LDFLAGS) -o $@ am_stapio_OBJECTS = stapio-stapio.$(OBJEXT) stapio-mainloop.$(OBJEXT) \ stapio-common.$(OBJEXT) stapio-ctl.$(OBJEXT) \ - stapio-unwind_data.$(OBJEXT) stapio-relay.$(OBJEXT) \ - stapio-relay_old.$(OBJEXT) + stapio-relay.$(OBJEXT) stapio-relay_old.$(OBJEXT) stapio_OBJECTS = $(am_stapio_OBJECTS) stapio_DEPENDENCIES = stapio_LINK = $(CCLD) $(stapio_CFLAGS) $(CFLAGS) $(stapio_LDFLAGS) \ @@ -291,15 +286,15 @@ stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ # of foo-bar.c if it is newer than the foo-bar.o file. Using noinst_foo_SOURCES # instead of foo_SOURCES prevents shipping git_version.h in dist tarballs, # which may cause false GIT_FOO readings. -BUILT_SOURCES = git_version.stamp $(am__append_5) -CLEANFILES = git_version.h $(am__append_6) $(pkglibexec_PROGRAMS) +BUILT_SOURCES = git_version.stamp $(am__append_3) +CLEANFILES = git_version.h $(am__append_4) $(pkglibexec_PROGRAMS) GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh stap_CXXFLAGS = $(AM_CXXFLAGS) stap_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) stap_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ $(am__append_2) staprun_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ -stapio_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_3) -stapio_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ $(am__append_4) +stapio_CPPFLAGS = $(AM_CPPFLAGS) +stapio_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ # This tells automake's "make distcheck" what we need to compile. @BUILD_ELFUTILS_TRUE@DISTCHECK_CONFIGURE_FLAGS = --with-elfutils=$(elfutils_abs_srcdir) @@ -313,11 +308,11 @@ staprun_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) -DSINGLE_THREADED staprun_LDADD = @PROCFLAGS@ @cap_LIBS@ stapio_SOURCES = runtime/staprun/stapio.c \ runtime/staprun/mainloop.c runtime/staprun/common.c \ - runtime/staprun/ctl.c runtime/staprun/unwind_data.c \ + runtime/staprun/ctl.c \ runtime/staprun/relay.c runtime/staprun/relay_old.c stapio_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) -stapio_LDADD = @PROCFLAGS@ -ldw -lpthread +stapio_LDADD = @PROCFLAGS@ -lpthread loc2c_test_SOURCES = loc2c-test.c loc2c.c loc2c_test_CPPFLAGS = $(stap_CPPFLAGS) loc2c_test_LDFLAGS = $(stap_LDFLAGS) @@ -528,7 +523,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-relay.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-relay_old.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-stapio.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-unwind_data.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/staprun-cap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/staprun-common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/staprun-ctl.Po@am__quote@ @@ -661,20 +655,6 @@ stapio-ctl.obj: runtime/staprun/ctl.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stapio_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -c -o stapio-ctl.obj `if test -f 'runtime/staprun/ctl.c'; then $(CYGPATH_W) 'runtime/staprun/ctl.c'; else $(CYGPATH_W) '$(srcdir)/runtime/staprun/ctl.c'; fi` -stapio-unwind_data.o: runtime/staprun/unwind_data.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stapio_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -MT stapio-unwind_data.o -MD -MP -MF $(DEPDIR)/stapio-unwind_data.Tpo -c -o stapio-unwind_data.o `test -f 'runtime/staprun/unwind_data.c' || echo '$(srcdir)/'`runtime/staprun/unwind_data.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stapio-unwind_data.Tpo $(DEPDIR)/stapio-unwind_data.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/staprun/unwind_data.c' object='stapio-unwind_data.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stapio_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -c -o stapio-unwind_data.o `test -f 'runtime/staprun/unwind_data.c' || echo '$(srcdir)/'`runtime/staprun/unwind_data.c - -stapio-unwind_data.obj: runtime/staprun/unwind_data.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stapio_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -MT stapio-unwind_data.obj -MD -MP -MF $(DEPDIR)/stapio-unwind_data.Tpo -c -o stapio-unwind_data.obj `if test -f 'runtime/staprun/unwind_data.c'; then $(CYGPATH_W) 'runtime/staprun/unwind_data.c'; else $(CYGPATH_W) '$(srcdir)/runtime/staprun/unwind_data.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stapio-unwind_data.Tpo $(DEPDIR)/stapio-unwind_data.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/staprun/unwind_data.c' object='stapio-unwind_data.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stapio_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -c -o stapio-unwind_data.obj `if test -f 'runtime/staprun/unwind_data.c'; then $(CYGPATH_W) 'runtime/staprun/unwind_data.c'; else $(CYGPATH_W) '$(srcdir)/runtime/staprun/unwind_data.c'; fi` - stapio-relay.o: runtime/staprun/relay.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stapio_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -MT stapio-relay.o -MD -MP -MF $(DEPDIR)/stapio-relay.Tpo -c -o stapio-relay.o `test -f 'runtime/staprun/relay.c' || echo '$(srcdir)/'`runtime/staprun/relay.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/stapio-relay.Tpo $(DEPDIR)/stapio-relay.Po diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog index 969c299d..27f4d8c8 100644 --- a/runtime/staprun/ChangeLog +++ b/runtime/staprun/ChangeLog @@ -1,3 +1,8 @@ +2008-06-03 Frank Ch. Eigler <fche@elastic.org> + + PR 6429. + * mainloop.c (stp_main_loop): Remove STP_UNWIND message support. + 2008-05-05 Martin Hunt <hunt@redhat.com> * mainloop.c (child_proc): Handle sig_chld diff --git a/runtime/staprun/mainloop.c b/runtime/staprun/mainloop.c index 61963743..2bbadbc9 100644 --- a/runtime/staprun/mainloop.c +++ b/runtime/staprun/mainloop.c @@ -387,18 +387,6 @@ int stp_main_loop(void) cleanup_and_exit(1); break; } - case STP_UNWIND: - { - int len; - char *ptr = (char *)data; - while (nb > 0) { - send_unwind_data(ptr); - len = strlen(ptr) + 1; - ptr += len; - nb -= len; - } - break; - } default: err("WARNING: ignored message of type %d\n", (type)); } diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog index 9d0ba162..92d3c589 100644 --- a/runtime/transport/ChangeLog +++ b/runtime/transport/ChangeLog @@ -1,3 +1,10 @@ +2008-06-03 Frank Ch. Eigler <fche@elastic.org> + + PR 6429 + * symbols.c (_stp_init_modules): Don't ask stapio for unwind data. + * control.c (_stp_ctl_write_cmd): Remove STP_UNWIND support. + * transport_msgs.h (STP_UNWIND): Remove declaration. + 2008-04-30 Masami Hiramatsu <mhiramat@redhat.com> PR 5645 diff --git a/runtime/transport/control.c b/runtime/transport/control.c index ca7edf79..4b476ee1 100644 --- a/runtime/transport/control.c +++ b/runtime/transport/control.c @@ -36,9 +36,6 @@ static ssize_t _stp_ctl_write_cmd(struct file *file, const char __user *buf, siz #endif switch (type) { - case STP_UNWIND: - _stp_do_unwind_data(buf, count); - break; case STP_START: if (started == 0) { struct _stp_msg_start st; diff --git a/runtime/transport/symbols.c b/runtime/transport/symbols.c index ec047922..4a3c4e17 100644 --- a/runtime/transport/symbols.c +++ b/runtime/transport/symbols.c @@ -629,7 +629,7 @@ static int _stp_init_modules(void) /* unlocks the list */ modules_op->stop(NULL, NULL); -#ifdef STP_USE_DWARF_UNWINDER +#if 0 /* def STP_USE_DWARF_UNWINDER */ /* now that we have all the modules, ask for their unwind info */ { unsigned long flags; diff --git a/runtime/transport/transport_msgs.h b/runtime/transport/transport_msgs.h index 5f385565..27476e76 100644 --- a/runtime/transport/transport_msgs.h +++ b/runtime/transport/transport_msgs.h @@ -23,7 +23,6 @@ enum STP_EXIT, STP_OOB_DATA, STP_SYSTEM, - STP_UNWIND, STP_TRANSPORT, STP_CONNECT, STP_DISCONNECT, @@ -44,7 +43,6 @@ static const char *_stp_command_name[] = { "STP_EXIT", "STP_OOB_DATA", "STP_SYSTEM", - "STP_UNWIND", "STP_TRANSPORT", "STP_CONNECT", "STP_DISCONNECT", |