LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere) LLEventTimer now using LLInstanceTracker Updated LLLiveAppConfig (Though it appears unused, really) processor.h is obsolete, thus removed. (llprocessor.h replaces it)
215 lines
5.9 KiB
C++
215 lines
5.9 KiB
C++
/**
|
|
* @file llerrorthread.cpp
|
|
*
|
|
* $LicenseInfo:firstyear=2004&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2004-2009, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#include "linden_common.h"
|
|
#include "llerrorthread.h"
|
|
#include "llapp.h"
|
|
#include "lltimer.h" // ms_sleep()
|
|
|
|
LLErrorThread::LLErrorThread()
|
|
: LLThread("Error"),
|
|
mUserDatap(NULL)
|
|
{
|
|
}
|
|
|
|
LLErrorThread::~LLErrorThread()
|
|
{
|
|
}
|
|
|
|
void LLErrorThread::setUserData(void* user_data)
|
|
{
|
|
mUserDatap = user_data;
|
|
}
|
|
|
|
|
|
void* LLErrorThread::getUserData() const
|
|
{
|
|
return mUserDatap;
|
|
}
|
|
|
|
#if !LL_WINDOWS
|
|
//
|
|
// Various signal/error handling functions that can't be put into the class
|
|
//
|
|
void get_child_status(const int waitpid_status, int &process_status, bool &exited, bool do_logging)
|
|
{
|
|
exited = false;
|
|
process_status = -1;
|
|
// The child process exited. Call its callback, and then clean it up
|
|
if (WIFEXITED(waitpid_status))
|
|
{
|
|
process_status = WEXITSTATUS(waitpid_status);
|
|
exited = true;
|
|
if (do_logging)
|
|
{
|
|
llinfos << "get_child_status - Child exited cleanly with return of " << process_status << llendl;
|
|
}
|
|
return;
|
|
}
|
|
else if (WIFSIGNALED(waitpid_status))
|
|
{
|
|
process_status = WTERMSIG(waitpid_status);
|
|
exited = true;
|
|
if (do_logging)
|
|
{
|
|
llinfos << "get_child_status - Child died because of uncaught signal " << process_status << llendl;
|
|
#ifdef WCOREDUMP
|
|
if (WCOREDUMP(waitpid_status))
|
|
{
|
|
llinfos << "get_child_status - Child dumped core" << llendl;
|
|
}
|
|
else
|
|
{
|
|
llinfos << "get_child_status - Child didn't dump core" << llendl;
|
|
}
|
|
#endif
|
|
}
|
|
return;
|
|
}
|
|
else if (do_logging)
|
|
{
|
|
// This is weird. I just dump the waitpid status into the status code,
|
|
// not that there's any way of telling what it is...
|
|
llinfos << "get_child_status - Got SIGCHILD but child didn't exit" << llendl;
|
|
process_status = waitpid_status;
|
|
}
|
|
|
|
}
|
|
#endif
|
|
|
|
void LLErrorThread::run()
|
|
{
|
|
LLApp::sErrorThreadRunning = TRUE;
|
|
// This thread sits and waits for the sole purpose
|
|
// of waiting for the signal/exception handlers to flag the
|
|
// application state as APP_STATUS_ERROR.
|
|
llinfos << "thread_error - Waiting for an error" << llendl;
|
|
|
|
S32 counter = 0;
|
|
#if !LL_WINDOWS
|
|
U32 last_sig_child_count = 0;
|
|
#endif
|
|
while (1)
|
|
{
|
|
if (LLApp::isError() || LLApp::isStopped())
|
|
{
|
|
// The application has stopped running, time to take action (maybe)
|
|
break;
|
|
}
|
|
#if !LL_WINDOWS
|
|
// Check whether or not the main thread had a sig child we haven't handled.
|
|
U32 current_sig_child_count = LLApp::getSigChildCount();
|
|
if (last_sig_child_count != current_sig_child_count)
|
|
{
|
|
int status = 0;
|
|
pid_t child_pid = 0;
|
|
last_sig_child_count = current_sig_child_count;
|
|
if (LLApp::sLogInSignal)
|
|
{
|
|
llinfos << "thread_error handling SIGCHLD #" << current_sig_child_count << llendl;
|
|
}
|
|
for (LLApp::child_map::iterator iter = LLApp::sChildMap.begin(); iter != LLApp::sChildMap.end();)
|
|
{
|
|
child_pid = iter->first;
|
|
LLChildInfo &child_info = iter->second;
|
|
// check the status of *all* children, in case we missed a signal
|
|
if (0 != waitpid(child_pid, &status, WNOHANG))
|
|
{
|
|
bool exited = false;
|
|
int exit_status = -1;
|
|
get_child_status(status, exit_status, exited, LLApp::sLogInSignal);
|
|
|
|
if (child_info.mCallback)
|
|
{
|
|
if (LLApp::sLogInSignal)
|
|
{
|
|
llinfos << "Signal handler - Running child callback" << llendl;
|
|
}
|
|
child_info.mCallback(child_pid, exited, status);
|
|
}
|
|
LLApp::sChildMap.erase(iter++);
|
|
}
|
|
else
|
|
{
|
|
// Child didn't terminate, yet we got a sigchild somewhere...
|
|
if (child_info.mGotSigChild && child_info.mCallback)
|
|
{
|
|
child_info.mCallback(child_pid, false, 0);
|
|
}
|
|
child_info.mGotSigChild = FALSE;
|
|
iter++;
|
|
}
|
|
}
|
|
|
|
// check the status of *all* children, in case we missed a signal
|
|
// Same as above, but use the default child callback
|
|
while(0 < (child_pid = waitpid( -1, &status, WNOHANG )))
|
|
{
|
|
if (0 != waitpid(child_pid, &status, WNOHANG))
|
|
{
|
|
bool exited = false;
|
|
int exit_status = -1;
|
|
get_child_status(status, exit_status, exited, LLApp::sLogInSignal);
|
|
if (LLApp::sDefaultChildCallback)
|
|
{
|
|
if (LLApp::sLogInSignal)
|
|
{
|
|
llinfos << "Signal handler - Running default child callback" << llendl;
|
|
}
|
|
LLApp::sDefaultChildCallback(child_pid, true, status);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
#endif
|
|
ms_sleep(10);
|
|
counter++;
|
|
}
|
|
if (LLApp::isError())
|
|
{
|
|
// The app is in an error state, run the application's error handler.
|
|
//llinfos << "thread_error - An error has occurred, running error callback!" << llendl;
|
|
// Run the error handling callback
|
|
LLApp::runErrorHandler();
|
|
}
|
|
else
|
|
{
|
|
// Everything is okay, a clean exit.
|
|
//llinfos << "thread_error - Application exited cleanly" << llendl;
|
|
}
|
|
|
|
//llinfos << "thread_error - Exiting" << llendl;
|
|
LLApp::sErrorThreadRunning = FALSE;
|
|
}
|
|
|