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

SL-13443 Reduced viewer stalls after teleport 

Eliminates stall from saveObjectCache() on region deletion
meow-7.2.2
Andrey Kleshchev 2020-06-26 16:47:08 +00:00 committed by Dave Houlton
parent e1e25f9a0d
commit 4ba11db750
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llviewerregion.cpp
View File

@ -102,6 +102,7 @@ const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
BOOL LLViewerRegion::sVOCacheCullingEnabled = FALSE;
S32 LLViewerRegion::sLastCameraUpdated = 0;
S32 LLViewerRegion::sNewObjectCreationThrottle = -1;
LLViewerRegion::vocache_entry_map_t LLViewerRegion::sRegionCacheCleanup;
typedef std::map<std::string, std::string> CapabilityMap;
@ -635,6 +636,9 @@ void LLViewerRegion::initStats()
mAlive = false; // can become false if circuit disconnects
}
static LLTrace::BlockTimerStatHandle FTM_CLEANUP_REGION_OBJECTS("Cleanup Region Objects");
static LLTrace::BlockTimerStatHandle FTM_SAVE_REGION_CACHE("Save Region Cache");
LLViewerRegion::~LLViewerRegion()
{
mDead = TRUE;
@ -649,7 +653,10 @@ LLViewerRegion::~LLViewerRegion()
disconnectAllNeighbors();
LLViewerPartSim::getInstance()->cleanupRegion(this);
gObjectList.killObjects(this);
{
LL_RECORD_BLOCK_TIME(FTM_CLEANUP_REGION_OBJECTS);
gObjectList.killObjects(this);
}
delete mImpl->mCompositionp;
delete mParcelOverlay;
@ -660,7 +667,10 @@ LLViewerRegion::~LLViewerRegion()
#endif
std::for_each(mImpl->mObjectPartition.begin(), mImpl->mObjectPartition.end(), DeletePointer());
saveObjectCache();
{
LL_RECORD_BLOCK_TIME(FTM_SAVE_REGION_CACHE);
saveObjectCache();
}
delete mImpl;
mImpl = NULL;
@ -729,6 +739,8 @@ void LLViewerRegion::saveObjectCache()
mCacheDirty = FALSE;
}
// Map of LLVOCacheEntry takes time to release, store map for cleanup on idle
sRegionCacheCleanup.insert(mImpl->mCacheMap.begin(), mImpl->mCacheMap.end());
mImpl->mCacheMap.clear();
}
@ -1490,6 +1502,16 @@ void LLViewerRegion::idleUpdate(F32 max_update_time)
return;
}
// static
void LLViewerRegion::idleCleanup(F32 max_update_time)
{
LLTimer update_timer;
while (!sRegionCacheCleanup.empty() && (max_update_time - update_timer.getElapsedTimeF32() > 0))
{
sRegionCacheCleanup.erase(sRegionCacheCleanup.begin());
}
}
//update the throttling number for new object creation
void LLViewerRegion::calcNewObjectCreationThrottle()
{

6
indra/newview/llviewerregion.h
View File

@ -232,6 +232,9 @@ public:
F32 getWidth() const { return mWidth; }
// regions are expensive to release, this function gradually releases cache from memory
static void idleCleanup(F32 max_update_time);
void idleUpdate(F32 max_update_time);
void lightIdleUpdate();
bool addVisibleGroup(LLViewerOctreeGroup* group);
@ -550,6 +553,9 @@ private:
LLSD mSimulatorFeatures;
typedef std::map<U32, LLPointer<LLVOCacheEntry> > vocache_entry_map_t;
static vocache_entry_map_t sRegionCacheCleanup;
// the materials capability throttle
LLFrameTimer mMaterialsCapThrottleTimer;
LLFrameTimer mRenderInfoRequestTimer;

18
indra/newview/llworld.cpp
View File

@ -730,11 +730,20 @@ void LLWorld::updateRegions(F32 max_update_time)
{
//perform some necessary but very light updates.
(*iter)->lightIdleUpdate();
}
}
}
if(max_time > 0.f)
{
max_time = llmin((F32)(max_update_time - update_timer.getElapsedTimeF32()), max_update_time * 0.25f);
}
if(max_time > 0.f)
{
LLViewerRegion::idleCleanup(max_time);
}
sample(sNumActiveCachedObjects, mNumOfActiveCachedObjects);
}
}
void LLWorld::clearAllVisibleObjects()
{
@ -1208,11 +1217,12 @@ public:
}
};
static LLTrace::BlockTimerStatHandle FTM_DISABLE_REGION("Disable Region");
// disable the circuit to this simulator
// Called in response to "DisableSimulator" message.
void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)
{
LLHost host = mesgsys->getSender();
{
LL_RECORD_BLOCK_TIME(FTM_DISABLE_REGION); LLHost host = mesgsys->getSender();
//LL_INFOS() << "Disabling simulator with message from " << host << LL_ENDL;
LLWorld::getInstance()->removeRegion(host);