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

Crash getting acccounting cost

meow-7.2.2
Andrey Kleshchev 2024-01-24 22:45:37 +02:00 committed by Andrey Kleshchev
parent 65eec6d217
commit 03afd4ee78
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llaccountingcostmanager.cpp
View File

@ -58,16 +58,19 @@ void LLAccountingCostManager::accountingCostCoro(std::string url,
try
{
LLAccountingCostManager* self = LLAccountingCostManager::getInstance();
uuid_set_t diffSet;
std::set_difference(mObjectList.begin(), mObjectList.end(),
mPendingObjectQuota.begin(), mPendingObjectQuota.end(),
std::inserter(diffSet, diffSet.begin()));
std::set_difference(self->mObjectList.begin(),
self->mObjectList.end(),
self->mPendingObjectQuota.begin(),
self->mPendingObjectQuota.end(),
std::inserter(diffSet, diffSet.begin()));
if (diffSet.empty())
return;
mObjectList.clear();
self->mObjectList.clear();
std::string keystr;
if (selectionType == Roots)
@ -91,18 +94,25 @@ void LLAccountingCostManager::accountingCostCoro(std::string url,
objectList.append(*it);
}
mPendingObjectQuota.insert(diffSet.begin(), diffSet.end());
self->mPendingObjectQuota.insert(diffSet.begin(), diffSet.end());
LLSD dataToPost = LLSD::emptyMap();
dataToPost[keystr.c_str()] = objectList;
LLAccountingCostObserver* observer = NULL;
LLSD results = httpAdapter->postAndSuspend(httpRequest, url, dataToPost);
LLSD httpResults = results["http_result"];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (LLApp::isQuitting()
|| observerHandle.isDead()
|| !LLAccountingCostManager::instanceExists())
{
return;
}
LLAccountingCostObserver* observer = NULL;
// do/while(false) allows error conditions to break out of following
// block while normal flow goes forward once.
do
@ -159,7 +169,8 @@ void LLAccountingCostManager::accountingCostCoro(std::string url,
throw;
}
mPendingObjectQuota.clear();
// self can be obsolete by this point
LLAccountingCostManager::getInstance()->mPendingObjectQuota.clear();
}
//===============================================================================
@ -172,7 +183,7 @@ void LLAccountingCostManager::fetchCosts( eSelectionType selectionType,
{
std::string coroname =
LLCoros::instance().launch("LLAccountingCostManager::accountingCostCoro",
boost::bind(&LLAccountingCostManager::accountingCostCoro, this, url, selectionType, observer_handle));
boost::bind(accountingCostCoro, url, selectionType, observer_handle));
LL_DEBUGS() << coroname << " with url '" << url << LL_ENDL;
}

2
indra/newview/llaccountingcostmanager.h
View File

@ -70,7 +70,7 @@ private:
//a fetch has been instigated.
uuid_set_t mPendingObjectQuota;
void accountingCostCoro(std::string url, eSelectionType selectionType, const LLHandle<LLAccountingCostObserver> observerHandle);
static void accountingCostCoro(std::string url, eSelectionType selectionType, const LLHandle<LLAccountingCostObserver> observerHandle);
};
//===============================================================================