summaryrefslogtreecommitdiff
path: root/indra/llfilesystem
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2021-07-21 17:42:08 -0700
committerCallum Prentice <callum@lindenlab.com>2021-07-21 17:42:08 -0700
commit0c3b78105d49185f37eff60d9c167d17e6072fc8 (patch)
treef2b2e52481cc4fb482faa328bb0c78e91af9af73 /indra/llfilesystem
parent484aa963af598a96eca6d9a1715ff1d8ed7ef7b4 (diff)
Another tweak for 'SL-15547: Viewer hung while looking for a file in cache' - this time based on Henri's suggestion in this discussion: https://bitbucket.org/lindenlab/viewer/commits/e28c1b46e9944f0215a13cab8ee7dded88d7fc90#comment-10537114
Diffstat (limited to 'indra/llfilesystem')
-rw-r--r--indra/llfilesystem/llfilesystem.cpp41
1 files changed, 25 insertions, 16 deletions
diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp
index af5e8bf8b7..4c836c8838 100644
--- a/indra/llfilesystem/llfilesystem.cpp
+++ b/indra/llfilesystem/llfilesystem.cpp
@@ -48,6 +48,28 @@ LLFileSystem::LLFileSystem(const LLUUID& file_id, const LLAssetType::EType file_
mPosition = 0;
mBytesRead = 0;
mMode = mode;
+
+ // This block of code was originally called in the read() method but after comments here:
+ // https://bitbucket.org/lindenlab/viewer/commits/e28c1b46e9944f0215a13cab8ee7dded88d7fc90#comment-10537114
+ // we decided to follow Henri's suggestion and move the code to update the last access time here.
+ if (mode == LLFileSystem::READ)
+ {
+ // build the filename (TODO: we do this in a few places - perhaps we should factor into a single function)
+ std::string id;
+ mFileID.toString(id);
+ const std::string extra_info = "";
+ const std::string filename = LLDiskCache::getInstance()->metaDataToFilepath(id, mFileType, extra_info);
+
+ // update the last access time for the file if it exists - this is required
+ // even though we are reading and not writing because this is the
+ // way the cache works - it relies on a valid "last accessed time" for
+ // each file so it knows how to remove the oldest, unused files
+ bool exists = gDirUtilp->fileExists(filename);
+ if (exists)
+ {
+ LLDiskCache::getInstance()->updateFileAccessTime(filename);
+ }
+ }
}
LLFileSystem::~LLFileSystem()
@@ -133,7 +155,7 @@ S32 LLFileSystem::getFileSize(const LLUUID& file_id, const LLAssetType::EType fi
BOOL LLFileSystem::read(U8* buffer, S32 bytes)
{
- BOOL success = TRUE;
+ BOOL success = FALSE;
std::string id;
mFileID.toString(id);
@@ -159,24 +181,11 @@ BOOL LLFileSystem::read(U8* buffer, S32 bytes)
file.close();
mPosition += mBytesRead;
- if (!mBytesRead)
+ if (mBytesRead)
{
- success = FALSE;
+ success = TRUE;
}
}
- else
- {
- success = FALSE;
- }
-
- if (success == TRUE)
- {
- // update the last access time for the file - this is required
- // even though we are reading and not writing because this is the
- // way the cache works - it relies on a valid "last accessed time" for
- // each file so it knows how to remove the oldest, unused files
- LLDiskCache::getInstance()->updateFileAccessTime(filename);
- }
return success;
}