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

ESC-228 ESC-227 Corrections for metrics counters and send-on-quit delivery. 

Wanted to avoid computing metrics for duplicate requests as much as
possible, they artificially depress averages but missed an opportunity
and was including them in the counts.  The non-texture case is solid.
Textures are.... confounding still.  Do a better job of trying to send
one last packet to the grid when quitting.  It is succeeding now, at
least sometimes.  Put a comment in base llassetstorage.cpp pointing
to cut-n-paste derivation in llviewerassetstorage.cpp so that changes
can be replicated.  Hate doing this but current design forces it.
meow-7.2.2
Monty Brandenberg 2010-12-10 16:05:19 -05:00
parent 38476e3593
commit 4bab98f5cd
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmessage/llassetstorage.cpp
View File

@ -513,6 +513,10 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, LL
}
//
// *NOTE: Logic here is replicated in LLViewerAssetStorage::_queueDataRequest.
// Changes here may need to be replicated in the viewer's derived class.
//
void LLAssetStorage::_queueDataRequest(const LLUUID& uuid, LLAssetType::EType atype,
LLGetAssetCallback callback,
void *user_data, BOOL duplicate,

4
indra/newview/llappviewer.cpp
View File

@ -3036,6 +3036,9 @@ void LLAppViewer::requestQuit()
return;
}
// Try to send metrics back to the grid
metricsSend(!gDisconnected);
LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
effectp->setPositionGlobal(gAgent.getPositionGlobal());
effectp->setColor(LLColor4U(gAgent.getEffectColor()));
@ -3053,7 +3056,6 @@ void LLAppViewer::requestQuit()
LLSideTray::getInstance()->notifyChildren(LLSD().with("request","quit"));
send_stats();
metricsSend(!gDisconnected);
gLogoutTimer.reset();
mQuitRequested = true;

7
indra/newview/llviewerassetstorage.cpp
View File

@ -348,7 +348,12 @@ void LLViewerAssetStorage::_queueDataRequest(
req->mDownCallback = callback;
req->mUserData = user_data;
req->mIsPriority = is_priority;
req->mMetricsStartTime = LLViewerAssetStatsFF::get_timestamp();
if (!duplicate)
{
// Only collect metrics for non-duplicate requests. Others
// are piggy-backing and will artificially lower averages.
req->mMetricsStartTime = LLViewerAssetStatsFF::get_timestamp();
}
mPendingDownloads.push_back(req);