Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash upon exit if we fail to cleanup.

Browse Source
This commit is contained in:
Aleric Inglewood
2012-07-18 03:13:33 +02:00
parent 7f78870295
commit f772cbee51
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llmessage/aicurl.cpp
View File

@@ -1101,6 +1101,8 @@ CurlResponderBuffer::CurlResponderBuffer()
curl_easy_request_w->send_events_to(this); curl_easy_request_w->send_events_to(this);
} }
#define llmaybeerrs lllog(LLApp::isExiting() ? LLError::LEVEL_WARN : LLError::LEVEL_ERROR, NULL, NULL, false)
// The callbacks need to be revoked when the CurlResponderBuffer is destructed (because that is what the callbacks use). // The callbacks need to be revoked when the CurlResponderBuffer is destructed (because that is what the callbacks use).
// The AIThreadSafeSimple<CurlResponderBuffer> is destructed first (right to left), so when we get here then the // The AIThreadSafeSimple<CurlResponderBuffer> is destructed first (right to left), so when we get here then the
// ThreadSafeCurlEasyRequest base class of ThreadSafeBufferedCurlEasyRequest is still intact and we can create // ThreadSafeCurlEasyRequest base class of ThreadSafeBufferedCurlEasyRequest is still intact and we can create
@@ -1117,9 +1119,18 @@ CurlResponderBuffer::~CurlResponderBuffer()
// never called, which means that the removed_from_multi_handle event never happened. // never called, which means that the removed_from_multi_handle event never happened.
// This is definitely an internal error as it can only happen when libcurl is too slow, // This is definitely an internal error as it can only happen when libcurl is too slow,
// in which case AICurlEasyRequestStateMachine::mTimer times out, but that already // in which case AICurlEasyRequestStateMachine::mTimer times out, but that already
// calls CurlResponderBuffer::timed_out(). So, this really should never happen. // calls CurlResponderBuffer::timed_out().
llerrs << "Calling ~CurlResponderBuffer() with active responder!" << llendl; llmaybeerrs << "Calling ~CurlResponderBuffer() with active responder!" << llendl;
timed_out(); if (LLApp::isExiting())
{
// It might happen if some CurlResponderBuffer escaped clean up somehow :/
mResponder = NULL;
}
else
{
// User chose to continue.
timed_out();
}
} }
} }