livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#4770 Crashes on ~LLCoprocedureManager() 

Situation is not clear, so hoping that explicit
cleanup will reveal something.
master
Andrey Kleshchev 2025-10-01 19:28:51 +03:00
parent 69312e248e
commit f05fe9c195
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/llmessage/llcoproceduremanager.cpp
View File

@ -138,7 +138,22 @@ LLCoprocedureManager::LLCoprocedureManager()
LLCoprocedureManager::~LLCoprocedureManager()
{
close();
try
{
close();
}
catch (const boost::fibers::fiber_error&)
{
LL_WARNS() << "Fiber error during ~LLCoprocedureManager()" << LL_ENDL;
}
catch (const std::exception& e)
{
// Shutting down, just log it
LL_WARNS() << "Exception during ~LLCoprocedureManager(): " << e.what() << LL_ENDL;
}
mPropertyQueryFn.clear();
mPropertyDefineFn.clear();
mPoolMap.clear();
}
void LLCoprocedureManager::initializePool(const std::string &poolName, size_t queue_size)
@ -365,6 +380,22 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size, s
LLCoprocedurePool::~LLCoprocedurePool()
{
try
{
close(); // should have been closed already, but shouldn't hurt
mStatusListener.disconnect();
mPendingCoprocs.reset();
mCoroMapping.clear();
}
catch (const boost::fibers::fiber_error&)
{
LL_WARNS() << "Fiber error during ~LLCoprocedurePool() " << mPoolName << LL_ENDL;
}
catch (const std::exception& e)
{
// Shutting down, just log it
LL_WARNS() << "Exception " << e.what() << " during ~LLCoprocedurePool() in " << mPoolName << LL_ENDL;
}
}
//-------------------------------------------------------------------------