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

Revert "common, global: use lttng ust functions for handling fork-like calls"

Browse Source 
This reverts commit 811898912f.
This commit is contained in:
Jason Dillaman 2015-09-30 11:32:36 -04:00
parent 6315a397b4
commit 638738fff1
3 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/Preforker.h
View File

@ -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

3
src/global/Makefile.am
View File

@ -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 += \

12
src/global/global_init.cc
View File

@ -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);
}