tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure all threads are dead before calling fork() 

fixes #7653
This commit is contained in:
Gunnar Beutner 2014-11-12 21:27:36 +01:00
parent e5bd573756
commit f592a13481
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/application.cpp
View File

@ -109,7 +109,7 @@ void Application::Exit(int rc)
logger->Flush(); logger->Flush();
} }
UninitializeBase(); Timer::Uninitialize();
#ifdef _DEBUG #ifdef _DEBUG
exit(rc); exit(rc);
@ -120,8 +120,6 @@ void Application::Exit(int rc)
void Application::InitializeBase(void) void Application::InitializeBase(void)
{ {
Timer::Initialize();
#ifndef _WIN32 #ifndef _WIN32
rlimit rl; rlimit rl;
if (getrlimit(RLIMIT_NOFILE, &rl) >= 0) { if (getrlimit(RLIMIT_NOFILE, &rl) >= 0) {
@ -154,11 +152,6 @@ void Application::InitializeBase(void)
Utility::ExecuteDeferredInitializers(); Utility::ExecuteDeferredInitializers();
} }
void Application::UninitializeBase(void)
{
Timer::Uninitialize();
}
/** /**
* Retrieves a pointer to the application singleton object. * Retrieves a pointer to the application singleton object.
* *

1
lib/base/application.hpp
View File

@ -43,7 +43,6 @@ public:
~Application(void); ~Application(void);
static void InitializeBase(void); static void InitializeBase(void);
static void UninitializeBase(void);
static Application::Ptr GetInstance(void); static Application::Ptr GetInstance(void);

3
lib/base/timer.cpp
View File

@ -81,7 +81,8 @@ void Timer::Uninitialize(void)
l_CV.notify_all(); l_CV.notify_all();
} }
l_Thread.join(); if (l_Thread.joinable())
l_Thread.join();
} }
/** /**

4
test/test.cpp
View File

@ -21,6 +21,7 @@
#define BOOST_TEST_MODULE icinga2_test #define BOOST_TEST_MODULE icinga2_test
#include "base/application.hpp" #include "base/application.hpp"
#include "base/timer.hpp"
#include <BoostTestTargetConfig.h> #include <BoostTestTargetConfig.h>
using namespace icinga; using namespace icinga;
@ -30,11 +31,12 @@ struct InitLibBase
InitLibBase(void) InitLibBase(void)
{ {
Application::InitializeBase(); Application::InitializeBase();
Timer::Initialize();
} }
~InitLibBase(void) ~InitLibBase(void)
{ {
Application::UninitializeBase(); Timer::Uninitialize();
} }
}; };