tracing: automake-ify tracepoint generation

Signed-off-by: Noah Watkins <[email protected]>

configure.ac

@@ -802,6 +802,13 @@ AC_CHECK_TYPES([__u8, __s8, __u16, __s16, __u32, __s32, __u64, __s64, __le16,
 AC_CHECK_HEADER([lttng/tracepoint.h], [],
   AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev)]))
 
+AC_CHECK_PROG([LTTNG_GEN_TP_CHECK], [lttng-gen-tp], [yes])
+if test x"$LTTNG_GEN_TP_CHECK" != "xyes"; then
+    AC_MSG_FAILURE([lttng-gen-tp not found])
+fi
+AC_SUBST([LTTNG_GEN_TP_PROG], [lttng-gen-tp])
+
+
 # Checks for typedefs, structures, and compiler characteristics.
 #AC_HEADER_STDBOOL
 #AC_C_CONST

src/common/Mutex.cc

@@ -19,7 +19,7 @@
 #include "common/config.h"
 #include "include/utime.h"
 #include "common/Clock.h"
-#include "tracing/mutex.tp.h"
+#include "tracing/mutex.h"
 
 Mutex::Mutex(const char *n, bool r, bool ld,
 	     bool bt,

src/osd/OSD.cc

@@ -132,7 +132,7 @@
 
 #include "include/assert.h"
 #include "common/config.h"
-#include "tracing/osd.tp.h"
+#include "tracing/osd.h"
 
 #define dout_subsys ceph_subsys_osd
 #undef dout_prefix

src/osd/PG.cc

@@ -41,7 +41,7 @@
 #include "messages/MOSDSubOp.h"
 #include "messages/MOSDSubOpReply.h"
 #include "common/BackTrace.h"
-#include "tracing/pg.tp.h"
+#include "tracing/pg.h"
 
 #include <sstream>
 

src/osd/ReplicatedPG.cc

@@ -57,7 +57,7 @@
 #include "json_spirit/json_spirit_value.h"
 #include "json_spirit/json_spirit_reader.h"
 #include "include/assert.h"  // json_spirit clobbers it
-#include "tracing/osd.tp.h"
+#include "tracing/osd.h"
 
 #define dout_subsys ceph_subsys_osd
 #define DOUT_PREFIX_ARGS this, osd->whoami, get_osdmap()

src/tracing/.gitignore

@@ -0,0 +1,2 @@
+*.h
+*.c

src/tracing/Makefile.am

@@ -1,12 +1,22 @@
+%.c %.h: %.tp
+	$(LTTNG_GEN_TP_PROG) $<
+	rm -f $<.o
+
+dist_noinst_DATA = mutex.tp osd.tp pg.tp
+
 libtracepoints_la_SOURCES = \
-	mutex.tp.c \
-	mutex.tp.h \
-	osd.tp.c \
-	osd.tp.h \
-	pg.tp.h \
-	pg.tp.c
+	mutex.c \
+	mutex.h \
+	osd.c \
+	osd.h \
+	pg.h \
+	pg.c
 
 libtracepoints_la_LIBADD = -llttng-ust -ldl
 libtracepoints_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
 libtracepoints_la_LDFLAGS =
 noinst_LTLIBRARIES = libtracepoints.la
+
+BUILT_SOURCES = mutex.h osd.h pg.h
+
+CLEANFILES = $(libtracepoints_la_SOURCES)

src/tracing/README.md

@@ -1,32 +1,24 @@
-Add New Provider
-================
-
-## Create tracepoint definition file
-
-Add tracepoint definitions for the provider into a `.tp` file. Documentation
-on defining a tracepoint can be found in `man lttng-ust`. By convention files
-are named according to the logical sub-system they correspond to (e.g.
-`mutex.tp`, `pg.tp`).
+Installation
+============
 
-## Generate tracepoint source files
+The LTTng libraries that ship with Ubuntu 12.04 have been very buggy, and the
+generated header files using `lttng-gen-tp` have needed to be fixed just to
+compile in the Ceph tree. The packages available in Ubuntu 14.04 seem to work
+alright, and for older versions please install LTTng from the LTTng PPA.
 
-The `.tp` file is converted into source files using the `lttng-gen-tp` tool.
+    https://launchpad.net/~lttng/+archive/ppa
 
-    lttng-gen-tp mutex.tp -o mutex.tp.h -o mutex.tp.c
+Then install as normal
 
-## Add source files to libtracepoints.la
+    apt-get install lttng-tools liblttng-ust-dev
 
-Modify Makefile.am to include the generated source files from the previous
-step.
-
-## Commit changes to Git
-
-Commit both the source `.tp` file as well as the generated sources, and the
-changes to Makefile.am.
+Add/Update Provider
+================
 
-Add Tracepoint to Existing Provider
-===================================
+## Create tracepoint definition file
 
-New tracepoints can be added to an existing provider by updating the
-corresponding `.tp` file and re-generating the source files. Make sure to
-commit the updated files back into Git.
+Add tracepoint definitions for the provider into a `.tp` file. Documentation
+on defining a tracepoint can be found in `man lttng-ust`. By convention files
+are named according to the logical sub-system they correspond to (e.g.
+`mutex.tp`, `pg.tp`). Place the `.tp` file into the `src/tracing` directory
+and modify the automake file `src/tracing/Makefile.am` accordingly.