From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 1 Oct 2015 02:53:28 +0000 (-0400)
Subject: osd: conditionally initialize the tracepoint provider
X-Git-Tag: v0.94.6~44^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d50d7b2fa3751e8520694ee75eefe5ae56e57267;p=ceph.git

osd: conditionally initialize the tracepoint provider

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0009f343a5daf28358a669836d95660c0d9068d8)
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 884b7edcf444..df99640bacb3 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -34,6 +34,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"
@@ -51,6 +52,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)
@@ -484,6 +494,9 @@ int main(int argc, const char **argv)
   global_init_daemonize(g_ceph_context, 0);
   common_init_finish(g_ceph_context);
 
+  TracepointProvider::initialize<osd_tracepoint_traits>(g_ceph_context);
+  TracepointProvider::initialize<os_tracepoint_traits>(g_ceph_context);
+
   MonClient mc(g_ceph_context);
   if (mc.build_initial_monmap() < 0)
     return -1;