From 0009f343a5daf28358a669836d95660c0d9068d8 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 30 Sep 2015 22:53:28 -0400 Subject: [PATCH] osd: conditionally initialize the tracepoint provider Signed-off-by: Jason Dillaman --- src/ceph_osd.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index f3353753a4717..68d2c912b0ccb 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -33,6 +33,7 @@ using namespace std; #include "msg/Messenger.h" #include "common/Timer.h" +#include "common/TracepointProvider.h" #include "common/ceph_argparse.h" #include "global/global_init.h" @@ -50,6 +51,15 @@ using namespace std; #define dout_subsys ceph_subsys_osd +namespace { + +TracepointProvider::Traits osd_tracepoint_traits("libosd_tp.so", + "osd_tracing"); +TracepointProvider::Traits os_tracepoint_traits("libos_tp.so", + "osd_objectstore_tracing"); + +} // anonymous namespace + OSD *osd = NULL; void handle_osd_signal(int signum) @@ -528,6 +538,9 @@ int main(int argc, const char **argv) global_init_daemonize(g_ceph_context, 0); common_init_finish(g_ceph_context); + TracepointProvider::initialize(g_ceph_context); + TracepointProvider::initialize(g_ceph_context); + MonClient mc(g_ceph_context); if (mc.build_initial_monmap() < 0) return -1; -- 2.39.5