From e26c8207a69086160542d1cdfedf9578d6385748 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 16 Jun 2011 15:09:17 -0400 Subject: [PATCH] Move away headers that will be deprecated Signed-off-by: Mathieu Desnoyers --- Makefile.am | 5 +- configure.ac | 21 +-- {include/ust => deprecated}/ustconsumer.h | 0 {include/ust => deprecated}/ustctl.h | 0 include/Makefile.am | 2 - usttrace | 217 ---------------------- 6 files changed, 5 insertions(+), 240 deletions(-) rename {include/ust => deprecated}/ustconsumer.h (100%) rename {include/ust => deprecated}/ustctl.h (100%) delete mode 100755 usttrace diff --git a/Makefile.am b/Makefile.am index bff61983..0a9cde64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,10 +5,9 @@ ACLOCAL_AMFLAGS = -I config # libust and '.' (that contains the linker script). However, '.' # must be installed after libust so it can overwrite libust.so with # the linker script. -SUBDIRS = snprintf libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc +SUBDIRS = snprintf libust . tests libustinstr-malloc libustfork include doc EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h -dist_bin_SCRIPTS = usttrace ldscriptsdir = $(libdir) ldscripts_DATA = libust.so libust-initializer.o @@ -24,4 +23,4 @@ libust-initializer.o: libust-initializer.c $(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $< pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = ust.pc \ No newline at end of file +pkgconfig_DATA = ust.pc diff --git a/configure.ac b/configure.ac index a24525fd..8594a470 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([ust], [0.14], [mathieu dot desnoyers at efficios dot com]) +AC_INIT([ust], [1.9.0], [mathieu dot desnoyers at efficios dot com]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -26,18 +26,8 @@ AC_PROG_MAKE_SET AC_PROG_LIBTOOL ## Checks for libraries. -## FIXME: Replace `main' with a function in `-ldl': -#AC_CHECK_LIB([dl], [main]) -## FIXME: Replace `main' with a function in `-lmarkers': -#AC_CHECK_LIB([markers], [main]) -## FIXME: Replace `main' with a function in `-lpthread': -#AC_CHECK_LIB([pthread], [main]) -## FIXME: Replace `main' with a function in `-ltracectl': -#AC_CHECK_LIB([tracectl], [main]) -## FIXME: Replace `main' with a function in `-ltracing': -#AC_CHECK_LIB([tracing], [main]) -## FIXME: Replace `main' with a function in `-lurcu': -#AC_CHECK_LIB([urcu], [main]) +AC_CHECK_LIB([dl], [dlopen]) +AC_CHECK_LIB([pthread], [pthread_create]) # Checks for header files. #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) @@ -172,11 +162,6 @@ AC_CONFIG_FILES([ tests/exit-fast/Makefile libustinstr-malloc/Makefile libustfork/Makefile - libustconsumer/Makefile - ust-consumerd/Makefile - ustctl/Makefile - libustcomm/Makefile - libustctl/Makefile snprintf/Makefile ust.pc include/ust/version.h diff --git a/include/ust/ustconsumer.h b/deprecated/ustconsumer.h similarity index 100% rename from include/ust/ustconsumer.h rename to deprecated/ustconsumer.h diff --git a/include/ust/ustctl.h b/deprecated/ustctl.h similarity index 100% rename from include/ust/ustctl.h rename to deprecated/ustctl.h diff --git a/include/Makefile.am b/include/Makefile.am index 6b128fad..3b1503ff 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -23,6 +23,4 @@ noinst_HEADERS = \ ust/kcompat/compiler.h \ ust/kcompat/types.h \ ust/tracectl.h \ - ust/ustctl.h \ - ust/ustconsumer.h \ ust/stringify.h diff --git a/usttrace b/usttrace deleted file mode 100755 index e76dae71..00000000 --- a/usttrace +++ /dev/null @@ -1,217 +0,0 @@ -#!/bin/sh - -# usttrace by Pierre-Marc Fournier 2009 -# Distributed under the GPLv2. - -error() { - echo "$0: error: $1" 1>&2 -} - -sighandler() { - echo "Caught Ctrl-C" - if [ -z "${UST_CONSUMERD_PID}" ]; then - UST_CONSUMERD_PID=`cat $pidfilepath` - fi - # Tell the daemon to die - kill -TERM "${UST_CONSUMERD_PID}" - - echo "Waiting for ust-consumerd to shutdown..." - wait "${UST_CONSUMERD_PID}" - - rm "$pidfilepath" - - exit 0; -} - -USTTRACE_DIR="$(dirname $0)" -if [ -x "${USTTRACE_DIR}/ust-consumerd/ust-consumerd" ] ; then - # Use the not installed libraries instead - UST_CONSUMERD="${USTTRACE_DIR}/ust-consumerd/ust-consumerd" - LIBINTERFORK_PATH="${USTTRACE_DIR}/libustfork/.libs/libustfork.so" - LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libustinstr-malloc/.libs/libustinstr-malloc.so" - LIBUST_PATH="${USTTRACE_DIR}/libust/.libs/libust.so" -else - # Use the libraries that the dynamic link finds - UST_CONSUMERD="ust-consumerd" - if [ ! -x "$(which ust-consumerd 2>/dev/null)" ]; then - error "cannot find an executable ust-consumerd; make sure its location is in the PATH" - exit 1 - fi - LIBINTERFORK_PATH="libustfork.so" - LIBMALLOCWRAP_PATH="libustinstr-malloc.so" - LIBUST_PATH="libust.so.0" -fi - -BASE_TRACE_DIR="${HOME}/.usttraces" - -usage() { - echo "usage: $0 OPTIONS COMMAND" 1>&2 - echo "" 1>&2 - echo "Options:" 1>&2 - echo " -l Runtime link with UST library." 1>&2 - echo " (Needed only if program was not linked at compile time with libust.)" 1>&2 - echo " -L Add path to ust libraries to LD_LIBRARY_PATH." 1>&2 - echo " -m Instrument malloc calls." 1>&2 - echo " -f Also trace forked processes." 1>&2 - echo " -s Use system-wide daemon instead of creating one for this session." 1>&2 - echo " -S Specify the subbuffer size." 1>&2 - echo " -N Specify the number of subbuffers." 1>&2 - echo " -o Output directory of the trace." 1>&2 -} - -while getopts ":hlLmfsWS:N:o:" options; do - case $options in - l) arg_preload_libust=1;; - L) arg_ld_std_ust=1;; - m) arg_preload_malloc=1;; - f) arg_preload_fork=1;; - s) arg_syswide_daemon=1;; - W) where=1;; - S) export UST_SUBBUF_SIZE=$OPTARG;; - N) export UST_SUBBUF_NUM=$OPTARG;; - o) OUTPUT_DIR=$OPTARG;; - h) usage; - exit 0;; - \?) usage - exit 1;; - *) usage - exit 1;; - esac -done -shift $(($OPTIND - 1)) - -if [ -n "$where" ]; then - echo $BASE_TRACE_DIR/$(ls "$BASE_TRACE_DIR" | tail -n 1) - exit 0 -fi - -# Prepare vars -CMD=$* - -# Validate input -if [ -z "$HOME" ]; -then - error "no home specified" -fi - -if [ -z "$CMD" ]; -then - error "no command specified" - usage; - exit 1 -fi - -# Create directory for trace output -if [ -n "$OUTPUT_DIR" ]; then - OUTDIR=$OUTPUT_DIR -else - DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S%N)" - OUTDIR="$BASE_TRACE_DIR/$DATESTRING" -fi - -# Check if directory exist -if [ ! -d "$OUTDIR" ]; then - mkdir -p $OUTDIR - if [ $? -eq 1 ]; then - exit 1 - fi -fi - -# Choose ust-consumerd socket path -UST_CONSUMERD_SOCKPATH="/tmp/ust-consumerd-sock-$$" - -if [ "$arg_syswide_daemon" != "1" ]; -then - pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid" - trap "sighandler $pidfilepath" INT - mkfifo -m 0600 "$pidfilepath" - # Start daemon - ${UST_CONSUMERD} --pidfile "$pidfilepath" -s "${UST_CONSUMERD_SOCKPATH}" -o "$OUTDIR" >"$OUTDIR/ust-consumerd.log" 2>&1 & - # ust-consumerd sets up its server socket - # ust-consumerd opens the pidfile, blocks because no one has opened it - # we open pidfile - # we block reading pidfile - # ust-consumerd writes to pidfile - # ust-consumerd closes pidfile - # we unblock reading pidfile - UST_CONSUMERD_PID=`cat $pidfilepath` - export UST_DAEMON_SOCKET="${UST_CONSUMERD_SOCKPATH}" -fi - -# Establish the environment for the command -( - export UST_TRACE=1 - export UST_AUTOPROBE=1 - - if [ "$arg_preload_libust" = "1" ]; - then - if [ -n "${LIBUST_PATH%libust.so}" ]; - then - if [ -n "$LD_LIBRARY_PATH" ]; - then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBUST_PATH%libust.so}" - else - export LD_LIBRARY_PATH="${LIBUST_PATH%libust.so}" - fi - fi - if [ -n "$LIBUST_PATH" ]; - then - if [ -n "$LD_PRELOAD" ]; - then - export LD_PRELOAD="$LD_PRELOAD:$LIBUST_PATH" - else - export LD_PRELOAD="$LIBUST_PATH" - fi - fi - fi - - if [ "$arg_ld_std_ust" = "1" ] && [ -n "${LIBUST_PATH%libust.so}" ]; - then - if [ -n "$LD_LIBRARY_PATH" ]; - then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBUST_PATH%libust.so}" - else - export LD_LIBRARY_PATH="${LIBUST_PATH%libust.so}" - fi - fi - - if [ "$arg_preload_malloc" = "1" ] && [ -n "$LIBMALLOCWRAP_PATH" ]; - then - if [ -n "$LD_PRELOAD" ]; - then - export LD_PRELOAD="$LD_PRELOAD:$LIBMALLOCWRAP_PATH" - else - export LD_PRELOAD="$LIBMALLOCWRAP_PATH" - fi - fi - - if [ "$arg_preload_fork" = "1" ] && [ -n "$LIBINTERFORK_PATH" ]; - then - if [ -n "$LD_PRELOAD" ]; - then - export LD_PRELOAD="$LD_PRELOAD:$LIBINTERFORK_PATH" - else - export LD_PRELOAD="$LIBINTERFORK_PATH" - fi - fi - -# Execute the command - $CMD 2>&1 -) | tee "$OUTDIR/app.log" - -## Because of the keepalive mechanism, we're sure that by the time -## we get here, the daemon is connected to all the buffers that still exist. -## Therefore we can politely ask it to die when it's done. - -if [ "$arg_syswide_daemon" != "1" ]; -then - # Tell the daemon to die - kill -TERM "${UST_CONSUMERD_PID}" - - echo "Waiting for ust-consumerd to shutdown..." - wait "${UST_CONSUMERD_PID}" - - rm "$pidfilepath" -fi - -echo "Trace was output in: " $OUTDIR -- 2.34.1