From 638738fff1d14f789129011e6c8d6ddb2e29a777 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 30 Sep 2015 11:32:36 -0400
Subject: [PATCH] Revert "common, global: use lttng ust functions for handling
 fork-like calls"

This reverts commit 811898912f3e43d7312efe5d06c496e1e7e22fa4.
---
 src/common/Preforker.h    | 28 ++--------------------------
 src/global/Makefile.am    |  3 ---
 src/global/global_init.cc | 12 ------------
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/common/Preforker.h b/src/common/Preforker.h
index ea64f6e764b6d..446f1c97f2bab 100644
--- a/src/common/Preforker.h
+++ b/src/common/Preforker.h
@@ -10,9 +10,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifdef WITH_LTTNG
-#include <lttng/ust.h>
-#endif
 #include <sstream>
 #include <string>
 
@@ -33,9 +30,6 @@ class Preforker {
   pid_t childpid;
   bool forked;
   int fd[2];  // parent's, child's
-#ifdef WITH_LTTNG
-    sigset_t sigset;
-#endif
 
 public:
   Preforker()
@@ -53,10 +47,6 @@ public:
       return r;
     }
 
-#ifdef WITH_LTTNG
-    ust_before_fork(&sigset);
-#endif
-
     forked = true;
 
     childpid = fork();
@@ -67,9 +57,9 @@ public:
       return r;
     }
     if (childpid == 0) {
-      child_after_fork();
+      ::close(fd[0]);
     } else {
-      parent_after_fork();
+      ::close(fd[1]);
     }
     return 0;
   }
@@ -138,20 +128,6 @@ public:
     r += r2;  // make the compiler shut up about the unused return code from ::write(2).
   }
   
-private:
-  void child_after_fork() {
-#ifdef WITH_LTTNG
-    ust_after_fork_child(&sigset);
-#endif
-    ::close(fd[0]);
-  }
-
-  void parent_after_fork() {
-#ifdef WITH_LTTNG
-    ust_after_fork_parent(&sigset);
-#endif
-    ::close(fd[1]);
-  }
 };
 
 #endif
diff --git a/src/global/Makefile.am b/src/global/Makefile.am
index 26960229d2ff9..79a7ffff689cd 100644
--- a/src/global/Makefile.am
+++ b/src/global/Makefile.am
@@ -4,9 +4,6 @@ libglobal_la_SOURCES = \
 	global/pidfile.cc \
 	global/signal_handler.cc
 libglobal_la_LIBADD = $(LIBCOMMON)
-if WITH_LTTNG
-libglobal_la_LIBADD += -llttng-ust -ldl
-endif
 noinst_LTLIBRARIES += libglobal.la
 
 noinst_HEADERS += \
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 4e6a6a6e9aa70..ed5d18633bedd 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -34,10 +34,6 @@
 
 #include <errno.h>
 #include <deque>
-#ifdef WITH_LTTNG
-#include <lttng/ust.h>
-#endif
-
 
 #define dout_subsys ceph_subsys_
 
@@ -288,11 +284,6 @@ void global_init_daemonize(CephContext *cct, int flags)
   if (global_init_prefork(cct, flags) < 0)
     return;
 
-#ifdef WITH_LTTNG
-  sigset_t sigset;
-  ust_before_fork(&sigset);
-#endif
-
   int ret = daemon(1, 1);
   if (ret) {
     ret = errno;
@@ -301,9 +292,6 @@ void global_init_daemonize(CephContext *cct, int flags)
     exit(1);
   }
 
-#ifdef WITH_LTTNG
-  ust_after_fork_child(&sigset);
-#endif
   global_init_postfork_start(cct);
   global_init_postfork_finish(cct, flags);
 }
-- 
2.39.5