From b4512257eb71d0432554047acf6278dc42a15a75 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 30 Mar 2009 18:27:41 -0400 Subject: [PATCH] merge libmarkers, libtracing and libtracectl in a single libust library --- Makefile.am | 2 +- bootstrap | 2 +- configure.ac | 4 ++-- hello/Makefile.am | 9 +++------ libmallocwrap/Makefile.am | 8 ++++++++ libmarkers/Makefile.am | 8 -------- libtracectl/Makefile.am | 9 --------- libtracing/Makefile.am | 7 ------- libust/Makefile.am | 9 +++++++++ {libtracing => libust}/channels.c | 0 {libtracing => libust}/channels.h | 0 {libmarkers => libust}/immediate.h | 0 {libtracectl => libust}/localerr.h | 0 {libtracectl => libust}/marker-control.c | 0 {libtracectl => libust}/marker-control.h | 0 {libmarkers => libust}/marker.c | 6 +++--- {libmarkers => libust}/marker.h | 0 {libtracing => libust}/relay.c | 0 {libtracing => libust}/relay.h | 0 {libtracing => libust}/serialize.c | 0 {libtracectl => libust}/tracectl.c | 0 {libmarkers => libust}/tracepoint.c | 0 {libmarkers => libust}/tracepoint.h | 0 {libtracing => libust}/tracer.c | 0 {libtracing => libust}/tracer.h | 0 {libtracing => libust}/tracercore.c | 0 {libtracing => libust}/tracercore.h | 0 27 files changed, 27 insertions(+), 37 deletions(-) create mode 100644 libmallocwrap/Makefile.am delete mode 100644 libmarkers/Makefile.am delete mode 100644 libtracectl/Makefile.am delete mode 100644 libtracing/Makefile.am create mode 100644 libust/Makefile.am rename {libtracing => libust}/channels.c (100%) rename {libtracing => libust}/channels.h (100%) rename {libmarkers => libust}/immediate.h (100%) rename {libtracectl => libust}/localerr.h (100%) rename {libtracectl => libust}/marker-control.c (100%) rename {libtracectl => libust}/marker-control.h (100%) rename {libmarkers => libust}/marker.c (99%) rename {libmarkers => libust}/marker.h (100%) rename {libtracing => libust}/relay.c (100%) rename {libtracing => libust}/relay.h (100%) rename {libtracing => libust}/serialize.c (100%) rename {libtracectl => libust}/tracectl.c (100%) rename {libmarkers => libust}/tracepoint.c (100%) rename {libmarkers => libust}/tracepoint.h (100%) rename {libtracing => libust}/tracer.c (100%) rename {libtracing => libust}/tracer.h (100%) rename {libtracing => libust}/tracercore.c (100%) rename {libtracing => libust}/tracercore.h (100%) diff --git a/Makefile.am b/Makefile.am index f8620dfb..996aedd3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = libmarkers libtracectl libtracing hello libmallocwrap +SUBDIRS = libust hello libmallocwrap diff --git a/bootstrap b/bootstrap index 1199ae21..0374e381 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh set -x -aclocal -I config +aclocal libtoolize --force --copy autoheader automake --add-missing --copy diff --git a/configure.ac b/configure.ac index 454faac1..38d6b8b0 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca]) AC_CONFIG_AUX_DIR(make_scripts) AM_INIT_AUTOMAKE([0.0 foreign]) AC_CONFIG_SRCDIR([ust/localerr.h]) -#AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_PROG_CC @@ -63,5 +63,5 @@ AC_SUBST(KCOMPAT_PATH) # ust/Makefile # ustd/Makefile]) -AC_CONFIG_FILES([Makefile libmarkers/Makefile libtracectl/Makefile libtracing/Makefile hello/Makefile libmallocwrap/Makefile]) +AC_CONFIG_FILES([Makefile libust/Makefile hello/Makefile libmallocwrap/Makefile]) AC_OUTPUT diff --git a/hello/Makefile.am b/hello/Makefile.am index 81b4604e..2a4e6b7d 100644 --- a/hello/Makefile.am +++ b/hello/Makefile.am @@ -1,11 +1,8 @@ bin_PROGRAMS = hello -hello_SOURCES = hello.c tp.c tp.h $(top_builddir)/share/kref.c -hello_LDADD = $(top_builddir)/libmarkers/libmarkers.la $(top_builddir)/libtracectl/libtracectl.la $(top_builddir)/libtracing/libtracing.la @URCU_PATH@/liburcu.so -##hello_LDFLAGS = -L$(top_builddir)/libmarkers +hello_SOURCES = hello.c tp.c tp.h +hello_LDADD = $(top_builddir)/libust/libust.la @URCU_PATH@/liburcu.so INCLUDES = -I$(top_builddir)/share INCLUDES += -I@URCU_PATH@ INCLUDES += -I@KCOMPAT_PATH@ -INCLUDES += -I$(top_builddir)/libtracing -INCLUDES += -I$(top_builddir)/libmarkers -INCLUDES += -I$(top_builddir)/libtracectl +INCLUDES += -I$(top_builddir)/libust diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am new file mode 100644 index 00000000..c9192b0f --- /dev/null +++ b/libmallocwrap/Makefile.am @@ -0,0 +1,8 @@ +lib_LTLIBRARIES = libmallocwrap.la +libmallocwrap_la_SOURCES = mallocwrap.c +noinst_SCRIPTS = run + +INCLUDES = -I$(top_builddir)/share +INCLUDES += -I@URCU_PATH@ +INCLUDES += -I@KCOMPAT_PATH@ +INCLUDES += -I$(top_builddir)/libust diff --git a/libmarkers/Makefile.am b/libmarkers/Makefile.am deleted file mode 100644 index 88643f38..00000000 --- a/libmarkers/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -lib_LTLIBRARIES = libmarkers.la -libmarkers_la_SOURCES = marker.c tracepoint.c immediate.h jhash.h rcupdate.h marker.h tracepoint.h -libmarkers_la_LIBADD = @URCU_PATH@/liburcu.so - -INCLUDES = -I$(top_builddir)/share -INCLUDES += -I@URCU_PATH@ -INCLUDES += -I@KCOMPAT_PATH@ -INCLUDES += -I$(top_builddir)/libtracing diff --git a/libtracectl/Makefile.am b/libtracectl/Makefile.am deleted file mode 100644 index e13ebe50..00000000 --- a/libtracectl/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -lib_LTLIBRARIES = libtracectl.la -libtracectl_la_SOURCES = marker-control.c localerr.h tracectl.c ../libustcomm/ustcomm.c ../libustcomm/ustcomm.h - -INCLUDES = -I$(top_builddir)/share -INCLUDES += -I@URCU_PATH@ -INCLUDES += -I@KCOMPAT_PATH@ -INCLUDES += -I$(top_builddir)/libtracing -INCLUDES += -I$(top_builddir)/libmarkers -INCLUDES += -I$(top_builddir)/libustcomm diff --git a/libtracing/Makefile.am b/libtracing/Makefile.am deleted file mode 100644 index 8b1c36c6..00000000 --- a/libtracing/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -lib_LTLIBRARIES = libtracing.la -libtracing_la_SOURCES = channels.c channels.h relay.c relay.h serialize.c tracer.c tracer.h tracercore.c tracercore.h - -INCLUDES = -I$(top_builddir)/share -INCLUDES += -I@URCU_PATH@ -INCLUDES += -I@KCOMPAT_PATH@ -INCLUDES += -I$(top_builddir)/libmarkers diff --git a/libust/Makefile.am b/libust/Makefile.am new file mode 100644 index 00000000..d2a8187d --- /dev/null +++ b/libust/Makefile.am @@ -0,0 +1,9 @@ +lib_LTLIBRARIES = libust.la +libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/kref.c $(top_builddir)/share/usterr.c +libust_la_LIBADD = @URCU_PATH@/liburcu.so +libust_la_LDFLAGS = -lpthread + +INCLUDES = -I$(top_builddir)/share +INCLUDES += -I$(top_builddir)/libustcomm +INCLUDES += -I@URCU_PATH@ +INCLUDES += -I@KCOMPAT_PATH@ diff --git a/libtracing/channels.c b/libust/channels.c similarity index 100% rename from libtracing/channels.c rename to libust/channels.c diff --git a/libtracing/channels.h b/libust/channels.h similarity index 100% rename from libtracing/channels.h rename to libust/channels.h diff --git a/libmarkers/immediate.h b/libust/immediate.h similarity index 100% rename from libmarkers/immediate.h rename to libust/immediate.h diff --git a/libtracectl/localerr.h b/libust/localerr.h similarity index 100% rename from libtracectl/localerr.h rename to libust/localerr.h diff --git a/libtracectl/marker-control.c b/libust/marker-control.c similarity index 100% rename from libtracectl/marker-control.c rename to libust/marker-control.c diff --git a/libtracectl/marker-control.h b/libust/marker-control.h similarity index 100% rename from libtracectl/marker-control.h rename to libust/marker-control.h diff --git a/libmarkers/marker.c b/libust/marker.c similarity index 99% rename from libmarkers/marker.c rename to libust/marker.c index ab0fc775..e417b62f 100644 --- a/libmarkers/marker.c +++ b/libust/marker.c @@ -18,9 +18,9 @@ //ust// #include //ust// #include //ust// #include -#include "jhash.h" -#include "list.h" -#include "rcupdate.h" +//#include "jhash.h" +//#include "list.h" +//#include "rcupdate.h" //ust// #include #include //ust// #include diff --git a/libmarkers/marker.h b/libust/marker.h similarity index 100% rename from libmarkers/marker.h rename to libust/marker.h diff --git a/libtracing/relay.c b/libust/relay.c similarity index 100% rename from libtracing/relay.c rename to libust/relay.c diff --git a/libtracing/relay.h b/libust/relay.h similarity index 100% rename from libtracing/relay.h rename to libust/relay.h diff --git a/libtracing/serialize.c b/libust/serialize.c similarity index 100% rename from libtracing/serialize.c rename to libust/serialize.c diff --git a/libtracectl/tracectl.c b/libust/tracectl.c similarity index 100% rename from libtracectl/tracectl.c rename to libust/tracectl.c diff --git a/libmarkers/tracepoint.c b/libust/tracepoint.c similarity index 100% rename from libmarkers/tracepoint.c rename to libust/tracepoint.c diff --git a/libmarkers/tracepoint.h b/libust/tracepoint.h similarity index 100% rename from libmarkers/tracepoint.h rename to libust/tracepoint.h diff --git a/libtracing/tracer.c b/libust/tracer.c similarity index 100% rename from libtracing/tracer.c rename to libust/tracer.c diff --git a/libtracing/tracer.h b/libust/tracer.h similarity index 100% rename from libtracing/tracer.h rename to libust/tracer.h diff --git a/libtracing/tracercore.c b/libust/tracercore.c similarity index 100% rename from libtracing/tracercore.c rename to libust/tracercore.c diff --git a/libtracing/tracercore.h b/libust/tracercore.h similarity index 100% rename from libtracing/tracercore.h rename to libust/tracercore.h -- 2.34.1