summaryrefslogtreecommitdiff
path: root/indra/newview/llwatchdog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llwatchdog.cpp')
-rw-r--r--indra/newview/llwatchdog.cpp266
1 files changed, 133 insertions, 133 deletions
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
index ceff5cc8ee..0a1d346266 100644
--- a/indra/newview/llwatchdog.cpp
+++ b/indra/newview/llwatchdog.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llthreadwatchdog.cpp
* @brief The LLThreadWatchdog class definitions
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -35,34 +35,34 @@ const U32 WATCHDOG_SLEEP_TIME_USEC = 1000000;
class LLWatchdogTimerThread : public LLThread
{
public:
- LLWatchdogTimerThread() :
- LLThread("Watchdog"),
- mSleepMsecs(0),
- mStopping(false)
- {
- }
-
- ~LLWatchdogTimerThread() {}
-
- void setSleepTime(long ms) { mSleepMsecs = ms; }
- void stop()
- {
- mStopping = true;
- mSleepMsecs = 1;
- }
-
- /* virtual */ void run()
- {
- while(!mStopping)
- {
- LLWatchdog::getInstance()->run();
- ms_sleep(mSleepMsecs);
- }
- }
+ LLWatchdogTimerThread() :
+ LLThread("Watchdog"),
+ mSleepMsecs(0),
+ mStopping(false)
+ {
+ }
+
+ ~LLWatchdogTimerThread() {}
+
+ void setSleepTime(long ms) { mSleepMsecs = ms; }
+ void stop()
+ {
+ mStopping = true;
+ mSleepMsecs = 1;
+ }
+
+ /* virtual */ void run()
+ {
+ while(!mStopping)
+ {
+ LLWatchdog::getInstance()->run();
+ ms_sleep(mSleepMsecs);
+ }
+ }
private:
- long mSleepMsecs;
- bool mStopping;
+ long mSleepMsecs;
+ bool mStopping;
};
// LLWatchdogEntry
@@ -72,12 +72,12 @@ LLWatchdogEntry::LLWatchdogEntry()
LLWatchdogEntry::~LLWatchdogEntry()
{
- stop();
+ stop();
}
void LLWatchdogEntry::start()
{
- LLWatchdog::getInstance()->add(this);
+ LLWatchdog::getInstance()->add(this);
}
void LLWatchdogEntry::stop()
@@ -92,67 +92,67 @@ void LLWatchdogEntry::stop()
// LLWatchdogTimeout
const std::string UNINIT_STRING = "uninitialized";
-LLWatchdogTimeout::LLWatchdogTimeout() :
- mTimeout(0.0f),
- mPingState(UNINIT_STRING)
+LLWatchdogTimeout::LLWatchdogTimeout() :
+ mTimeout(0.0f),
+ mPingState(UNINIT_STRING)
{
}
-LLWatchdogTimeout::~LLWatchdogTimeout()
+LLWatchdogTimeout::~LLWatchdogTimeout()
{
}
-bool LLWatchdogTimeout::isAlive() const
-{
- return (mTimer.getStarted() && !mTimer.hasExpired());
+bool LLWatchdogTimeout::isAlive() const
+{
+ return (mTimer.getStarted() && !mTimer.hasExpired());
}
void LLWatchdogTimeout::reset()
{
- mTimer.setTimerExpirySec(mTimeout);
+ mTimer.setTimerExpirySec(mTimeout);
}
-void LLWatchdogTimeout::setTimeout(F32 d)
+void LLWatchdogTimeout::setTimeout(F32 d)
{
- mTimeout = d;
+ mTimeout = d;
}
-void LLWatchdogTimeout::start(const std::string& state)
+void LLWatchdogTimeout::start(const std::string& state)
{
if (mTimeout == 0)
{
LL_WARNS() << "Cant' start watchdog entry - no timeout set" << LL_ENDL;
return;
}
- // Order of operation is very important here.
- // After LLWatchdogEntry::start() is called
- // LLWatchdogTimeout::isAlive() will be called asynchronously.
- ping(state);
- mTimer.start();
+ // Order of operation is very important here.
+ // After LLWatchdogEntry::start() is called
+ // LLWatchdogTimeout::isAlive() will be called asynchronously.
+ ping(state);
+ mTimer.start();
mTimer.setTimerExpirySec(mTimeout); // timer expiration set to 0 by start()
- LLWatchdogEntry::start();
+ LLWatchdogEntry::start();
}
-void LLWatchdogTimeout::stop()
+void LLWatchdogTimeout::stop()
{
- LLWatchdogEntry::stop();
- mTimer.stop();
+ LLWatchdogEntry::stop();
+ mTimer.stop();
}
-void LLWatchdogTimeout::ping(const std::string& state)
-{
- if(!state.empty())
- {
- mPingState = state;
- }
- reset();
+void LLWatchdogTimeout::ping(const std::string& state)
+{
+ if(!state.empty())
+ {
+ mPingState = state;
+ }
+ reset();
}
// LLWatchdog
LLWatchdog::LLWatchdog()
:mSuspectsAccessMutex()
,mTimer(NULL)
- ,mLastClockCount(0)
+ ,mLastClockCount(0)
{
}
@@ -162,105 +162,105 @@ LLWatchdog::~LLWatchdog()
void LLWatchdog::add(LLWatchdogEntry* e)
{
- lockThread();
- mSuspects.insert(e);
- unlockThread();
+ lockThread();
+ mSuspects.insert(e);
+ unlockThread();
}
void LLWatchdog::remove(LLWatchdogEntry* e)
{
- lockThread();
+ lockThread();
mSuspects.erase(e);
- unlockThread();
+ unlockThread();
}
void LLWatchdog::init()
{
- if(!mSuspectsAccessMutex && !mTimer)
- {
- mSuspectsAccessMutex = new LLMutex();
- mTimer = new LLWatchdogTimerThread();
- mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000);
- mLastClockCount = LLTimer::getTotalTime();
-
- // mTimer->start() kicks off the thread, any code after
- // start needs to use the mSuspectsAccessMutex
- mTimer->start();
- }
+ if(!mSuspectsAccessMutex && !mTimer)
+ {
+ mSuspectsAccessMutex = new LLMutex();
+ mTimer = new LLWatchdogTimerThread();
+ mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000);
+ mLastClockCount = LLTimer::getTotalTime();
+
+ // mTimer->start() kicks off the thread, any code after
+ // start needs to use the mSuspectsAccessMutex
+ mTimer->start();
+ }
}
void LLWatchdog::cleanup()
{
- if(mTimer)
- {
- mTimer->stop();
- delete mTimer;
- mTimer = NULL;
- }
-
- if(mSuspectsAccessMutex)
- {
- delete mSuspectsAccessMutex;
- mSuspectsAccessMutex = NULL;
- }
-
- mLastClockCount = 0;
+ if(mTimer)
+ {
+ mTimer->stop();
+ delete mTimer;
+ mTimer = NULL;
+ }
+
+ if(mSuspectsAccessMutex)
+ {
+ delete mSuspectsAccessMutex;
+ mSuspectsAccessMutex = NULL;
+ }
+
+ mLastClockCount = 0;
}
void LLWatchdog::run()
{
- lockThread();
-
- // Check the time since the last call to run...
- // If the time elapsed is two times greater than the regualr sleep time
- // reset the active timeouts.
- const U32 TIME_ELAPSED_MULTIPLIER = 2;
- U64 current_time = LLTimer::getTotalTime();
- U64 current_run_delta = current_time - mLastClockCount;
- mLastClockCount = current_time;
-
- if(current_run_delta > (WATCHDOG_SLEEP_TIME_USEC * TIME_ELAPSED_MULTIPLIER))
- {
- LL_INFOS() << "Watchdog thread delayed: resetting entries." << LL_ENDL;
- for (const auto& suspect : mSuspects)
- {
- suspect->reset();
- }
- }
- else
- {
- SuspectsRegistry::iterator result =
- std::find_if(mSuspects.begin(),
- mSuspects.end(),
- [](const LLWatchdogEntry* suspect){ return ! suspect->isAlive(); });
- if(result != mSuspects.end())
- {
- // error!!!
- if(mTimer)
- {
- mTimer->stop();
- }
+ lockThread();
+
+ // Check the time since the last call to run...
+ // If the time elapsed is two times greater than the regualr sleep time
+ // reset the active timeouts.
+ const U32 TIME_ELAPSED_MULTIPLIER = 2;
+ U64 current_time = LLTimer::getTotalTime();
+ U64 current_run_delta = current_time - mLastClockCount;
+ mLastClockCount = current_time;
+
+ if(current_run_delta > (WATCHDOG_SLEEP_TIME_USEC * TIME_ELAPSED_MULTIPLIER))
+ {
+ LL_INFOS() << "Watchdog thread delayed: resetting entries." << LL_ENDL;
+ for (const auto& suspect : mSuspects)
+ {
+ suspect->reset();
+ }
+ }
+ else
+ {
+ SuspectsRegistry::iterator result =
+ std::find_if(mSuspects.begin(),
+ mSuspects.end(),
+ [](const LLWatchdogEntry* suspect){ return ! suspect->isAlive(); });
+ if(result != mSuspects.end())
+ {
+ // error!!!
+ if(mTimer)
+ {
+ mTimer->stop();
+ }
LL_ERRS() << "Watchdog timer expired; assuming viewer is hung and crashing" << LL_ENDL;
- }
- }
+ }
+ }
- unlockThread();
+ unlockThread();
}
void LLWatchdog::lockThread()
{
- if(mSuspectsAccessMutex != NULL)
- {
- mSuspectsAccessMutex->lock();
- }
+ if(mSuspectsAccessMutex != NULL)
+ {
+ mSuspectsAccessMutex->lock();
+ }
}
void LLWatchdog::unlockThread()
{
- if(mSuspectsAccessMutex != NULL)
- {
- mSuspectsAccessMutex->unlock();
- }
+ if(mSuspectsAccessMutex != NULL)
+ {
+ mSuspectsAccessMutex->unlock();
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-11 23:11:29 +0000