diff options
| author | Christian Pointner <equinox@anytun.org> | 2014-06-29 00:06:23 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2014-06-29 00:06:23 +0000 |
| commit | 92a551b96e625257def26771155ebd64c6d8757e (patch) | |
| tree | 7d5b2d0a043f746bfb10ccc9679ac59646a95b72 /src/signalController.cpp | |
| parent | while(1) vs. for(;;) (diff) | |
fixed not working singletons - still not threadsafe but at least they don't pretend to be
Diffstat (limited to 'src/signalController.cpp')
| -rw-r--r-- | src/signalController.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/signalController.cpp b/src/signalController.cpp index f4ae059..b9e2f25 100644 --- a/src/signalController.cpp +++ b/src/signalController.cpp @@ -39,19 +39,13 @@ #include "anytunError.h" #include "threadUtils.hpp" -SignalController* SignalController::inst = NULL; -Mutex SignalController::instMutex; + SignalController& gSignalController = SignalController::instance(); SignalController& SignalController::instance() { - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) { - inst = new SignalController(); - } - - return *inst; + static SignalController instance; + return instance; } int SigErrorHandler(int /*sig*/, const std::string& msg) |