Skip to content
Snippets Groups Projects
Commit 58ba75f6 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-13783 Workaround for enqueueCoprocedure() crash #2

parent fa0cc7b6
No related branches found
No related tags found
No related merge requests found
...@@ -140,12 +140,6 @@ LLCoprocedureManager::~LLCoprocedureManager() ...@@ -140,12 +140,6 @@ LLCoprocedureManager::~LLCoprocedureManager()
close(); close();
} }
void LLCoprocedureManager::initSingleton()
{
// workaround until we get mutex into initializePool
initializePool("VAssetStorage");
}
LLCoprocedureManager::poolPtr_t LLCoprocedureManager::initializePool(const std::string &poolName) LLCoprocedureManager::poolPtr_t LLCoprocedureManager::initializePool(const std::string &poolName)
{ {
// Attempt to look up a pool size in the configuration. If found use that // Attempt to look up a pool size in the configuration. If found use that
...@@ -197,8 +191,13 @@ LLUUID LLCoprocedureManager::enqueueCoprocedure(const std::string &pool, const s ...@@ -197,8 +191,13 @@ LLUUID LLCoprocedureManager::enqueueCoprocedure(const std::string &pool, const s
void LLCoprocedureManager::setPropertyMethods(SettingQuery_t queryfn, SettingUpdate_t updatefn) void LLCoprocedureManager::setPropertyMethods(SettingQuery_t queryfn, SettingUpdate_t updatefn)
{ {
// functions to discover and store the pool sizes
mPropertyQueryFn = queryfn; mPropertyQueryFn = queryfn;
mPropertyDefineFn = updatefn; mPropertyDefineFn = updatefn;
// workaround until we get mutex into initializePool
initializePool("VAssetStorage");
initializePool("Upload");
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
......
...@@ -40,7 +40,6 @@ class LLCoprocedureManager : public LLSingleton < LLCoprocedureManager > ...@@ -40,7 +40,6 @@ class LLCoprocedureManager : public LLSingleton < LLCoprocedureManager >
{ {
LLSINGLETON(LLCoprocedureManager); LLSINGLETON(LLCoprocedureManager);
virtual ~LLCoprocedureManager(); virtual ~LLCoprocedureManager();
/*virtual*/ void initSingleton();
public: public:
typedef boost::function<U32(const std::string &)> SettingQuery_t; typedef boost::function<U32(const std::string &)> SettingQuery_t;
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
/// LLViewerAssetRequest /// LLViewerAssetRequest
///---------------------------------------------------------------------------- ///----------------------------------------------------------------------------
// There is also PoolSizeVAssetStorage value in setting that should mirror this name
static const std::string VIEWER_ASSET_STORAGE_CORO_POOL = "VAssetStorage"; static const std::string VIEWER_ASSET_STORAGE_CORO_POOL = "VAssetStorage";
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment