RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

lttng: Split up libtracepoints

Browse Source 
Signed-off-by: Adam Crume <adamcrume@gmail.com>
This commit is contained in:
Adam Crume 2014-06-27 16:27:20 -07:00 committed by Sage Weil
parent 00b2ec6f21
commit e1e157fba2
5 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile-env.am
View File

@ -156,7 +156,9 @@ LIBRBD = librbd.la
LIBKRBD = libkrbd.la LIBKRBD = libkrbd.la
LIBCEPHFS = libcephfs.la LIBCEPHFS = libcephfs.la
LIBERASURE_CODE = liberasure_code.la LIBERASURE_CODE = liberasure_code.la
LIBTRACEPOINTS = tracing/libtracepoints.la LIBCOMMON_TP = tracing/libcommon_tp.la
LIBOSD_TP = tracing/libosd_tp.la
LIBRADOS_TP = tracing/librados_tp.la
if WITH_LIBAIO if WITH_LIBAIO
LIBOS += -laio LIBOS += -laio

2
src/common/Makefile.am
View File

@ -113,7 +113,7 @@ LIBCOMMON_DEPS += \
$(LIBERASURE_CODE) \ $(LIBERASURE_CODE) \
$(LIBMSG) $(LIBAUTH) \ $(LIBMSG) $(LIBAUTH) \
$(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \ $(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
$(LIBTRACEPOINTS) $(LIBCOMMON_TP)
if LINUX if LINUX
LIBCOMMON_DEPS += -lrt LIBCOMMON_DEPS += -lrt

2
src/librados/Makefile.am
View File

@ -8,7 +8,7 @@ librados_la_SOURCES = \
# We need this to avoid basename conflicts with the librados build tests in test/Makefile.am # We need this to avoid basename conflicts with the librados build tests in test/Makefile.am
librados_la_CXXFLAGS = ${AM_CXXFLAGS} librados_la_CXXFLAGS = ${AM_CXXFLAGS}
LIBRADOS_DEPS += libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON) LIBRADOS_DEPS += libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON) $(LIBRADOS_TP)
librados_la_LIBADD = $(LIBRADOS_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) librados_la_LIBADD = $(LIBRADOS_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
if LINUX if LINUX

2
src/osd/Makefile.am
View File

@ -25,7 +25,7 @@ libosd_la_SOURCES = \
objclass/class_api.cc objclass/class_api.cc
libosd_la_CXXFLAGS = ${AM_CXXFLAGS} libosd_la_CXXFLAGS = ${AM_CXXFLAGS}
libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES) libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES) $(LIBOSD_TP)
noinst_LTLIBRARIES += libosd.la noinst_LTLIBRARIES += libosd.la
noinst_HEADERS += \ noinst_HEADERS += \

34
src/tracing/Makefile.am
View File

@ -8,22 +8,35 @@ dist_noinst_DATA = \
osd.tp \ osd.tp \
pg.tp pg.tp
libtracepoints_la_SOURCES = \ libcommon_tp_la_SOURCES = \
librados.c \
librados.h \
mutex.c \ mutex.c \
mutex.h \ mutex.h
libcommon_tp_la_LIBADD = -llttng-ust -ldl
libcommon_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
libcommon_tp_la_LDFLAGS =
libosd_tp_la_SOURCES = \
oprequest.c \ oprequest.c \
oprequest.h \ oprequest.h \
osd.c \ osd.c \
osd.h \ osd.h \
pg.h \ pg.h \
pg.c pg.c
libosd_tp_la_LIBADD = -llttng-ust -ldl
libosd_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
libosd_tp_la_LDFLAGS =
libtracepoints_la_LIBADD = -llttng-ust -ldl librados_tp_la_SOURCES = \
libtracepoints_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE librados.c \
libtracepoints_la_LDFLAGS = librados.h
noinst_LTLIBRARIES = libtracepoints.la librados_tp_la_LIBADD = -llttng-ust -ldl
librados_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
librados_tp_la_LDFLAGS =
noinst_LTLIBRARIES = \
libcommon_tp.la \
libosd_tp.la \
librados_tp.la
BUILT_SOURCES = \ BUILT_SOURCES = \
librados.h \ librados.h \
@ -32,4 +45,7 @@ BUILT_SOURCES = \
osd.h \ osd.h \
pg.h pg.h
CLEANFILES = $(libtracepoints_la_SOURCES) CLEANFILES = \
$(libcommon_tp_la_SOURCES) \
$(libosd_tp_la_SOURCES) \
$(librados_tp_la_SOURCES)