Port Viewer 2 indra/llvfs
This introduces some API changes, like the new LLDirIterator, that causes changes elsewhere. It also include Log Linden's cache changes that aren't in viewer-development yet that increase the maximum cache size to ~10 GB.
This commit is contained in:
@@ -38,7 +38,6 @@
|
||||
#include "llthread.h"
|
||||
#include "llstat.h"
|
||||
#include "llvfs.h"
|
||||
#include "llfasttimer.h"
|
||||
|
||||
const S32 LLVFile::READ = 0x00000001;
|
||||
const S32 LLVFile::WRITE = 0x00000002;
|
||||
@@ -319,7 +318,7 @@ BOOL LLVFile::setMaxSize(S32 size)
|
||||
|
||||
if (!mVFS->checkAvailable(size))
|
||||
{
|
||||
LLFastTimer t(LLFastTimer::FTM_VFILE_WAIT);
|
||||
//LLFastTimer t(FTM_VFILE_WAIT);
|
||||
S32 count = 0;
|
||||
while (sVFSThread->getPending() > 1000)
|
||||
{
|
||||
@@ -427,7 +426,7 @@ bool LLVFile::isLocked(EVFSLock lock)
|
||||
|
||||
void LLVFile::waitForLock(EVFSLock lock)
|
||||
{
|
||||
LLFastTimer t(LLFastTimer::FTM_VFILE_WAIT);
|
||||
//LLFastTimer t(FTM_VFILE_WAIT);
|
||||
// spin until the lock clears
|
||||
while (isLocked(lock))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user