aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwatchdog.h
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-11 16:10:10 -0600
committerJacek Antonelli2009-01-11 16:10:15 -0600
commit6156baad67c744ed03ea47798bfeb8a77698efc6 (patch)
tree872d35ff6df740462d8cb574d03f746dfd5dd1ae /linden/indra/newview/llwatchdog.h
parentSecond Life viewer sources 1.22.3-RC (diff)
downloadmeta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.zip
meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.tar.gz
meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.tar.bz2
meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.tar.xz
Second Life viewer sources 1.22.4-RC
Diffstat (limited to 'linden/indra/newview/llwatchdog.h')
-rw-r--r--linden/indra/newview/llwatchdog.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/newview/llwatchdog.h b/linden/indra/newview/llwatchdog.h
index d196486..25bb603 100644
--- a/linden/indra/newview/llwatchdog.h
+++ b/linden/indra/newview/llwatchdog.h
@@ -32,6 +32,8 @@
32#ifndef LL_LLTHREADWATCHDOG_H 32#ifndef LL_LLTHREADWATCHDOG_H
33#define LL_LLTHREADWATCHDOG_H 33#define LL_LLTHREADWATCHDOG_H
34 34
35#include <boost/function.hpp>
36
35#ifndef LL_TIMER_H 37#ifndef LL_TIMER_H
36 #include "lltimer.h" 38 #include "lltimer.h"
37#endif 39#endif
@@ -85,7 +87,9 @@ public:
85 void add(LLWatchdogEntry* e); 87 void add(LLWatchdogEntry* e);
86 void remove(LLWatchdogEntry* e); 88 void remove(LLWatchdogEntry* e);
87 89
88 void init(); 90 typedef boost::function<void (void)> killer_event_callback;
91
92 void init(killer_event_callback func = NULL);
89 void run(); 93 void run();
90 void cleanup(); 94 void cleanup();
91 95
@@ -98,6 +102,8 @@ private:
98 LLMutex* mSuspectsAccessMutex; 102 LLMutex* mSuspectsAccessMutex;
99 LLWatchdogTimerThread* mTimer; 103 LLWatchdogTimerThread* mTimer;
100 U64 mLastClockCount; 104 U64 mLastClockCount;
105
106 killer_event_callback mKillerCallback;
101}; 107};
102 108
103#endif // LL_LLTHREADWATCHDOG_H 109#endif // LL_LLTHREADWATCHDOG_H