actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When Move()ing, Remove()ing, or Close()ing a file opened for writing, update the cache when possible (RageFileDriverDirect) or invalidate the directory cache for the directory containing that file (everything else). Remove most of the FlushDirCache() calls as they are no longer needed. This fixes a long standing bug where files added into the cache were stat(2)ed O(n^2) times--that is, each file is stat(2)ed O(n) times.

Browse Source
This commit is contained in:
Steve Checkoway
2009-09-14 08:08:06 +00:00
parent b60a92e633
commit 76f0af145b
25 changed files with 140 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil_FileDB.cpp
+41 -26
View File
@@ -412,18 +412,14 @@ void FilenameDB::AddFile( const RString &sPath_, int iSize, int iHash, void *pPr
FileSet *fs = GetFileSet( dir );
ASSERT( m_Mutex.IsLockedByThisThread() );
File f;
f.SetName( fn );
if( fs->files.find( f ) == fs->files.end() )
// const_cast to cast away the constness that is only needed for the name
File &f = const_cast<File&>(*fs->files.insert( fn ).first);
f.dir = IsDir;
if( !IsDir )
{
f.dir = IsDir;
if( !IsDir )
{
f.size = iSize;
f.hash = iHash;
f.priv = pPriv;
}
fs->files.insert( f );
f.size = iSize;
f.hash = iHash;
f.priv = pPriv;
}
m_Mutex.Unlock(); /* locked by GetFileSet */
IsDir = true;
@@ -475,19 +471,35 @@ void FilenameDB::DelFile( const RString &sPath )
SplitPath(sPath, Dir, Name);
FileSet *Parent = GetFileSet( Dir, false );
if( Parent )
{
set<File>::iterator i = Parent->files.find( File(Name) );
if( i != Parent->files.end() )
{
Parent->files.erase( i );
}
}
Parent->files.erase( Name );
m_Mutex.Unlock(); /* locked by GetFileSet */
}
void FilenameDB::FlushDirCache()
void FilenameDB::FlushDirCache( const RString &sDir )
{
FileSet *pFileSet = NULL;
m_Mutex.Lock();
if( !sDir.empty() )
{
RString lower = sDir;
lower.MakeLower();
map<RString, FileSet *>::iterator it = dirs.find( lower );
if( it != dirs.end() )
{
pFileSet = it->second;
dirs.erase( it );
while( !pFileSet->m_bFilled )
m_Mutex.Wait();
delete pFileSet;
}
else
{
LOG->Warn( "Trying to flush an unknown directory %s.", sDir.c_str() );
}
m_Mutex.Unlock();
return;
}
while( true )
{
if( dirs.empty() )
@@ -495,7 +507,7 @@ void FilenameDB::FlushDirCache()
/* Grab the first entry. Take it out of the list while we hold the
* lock, to guarantee that we own it. */
FileSet *pFileSet = dirs.begin()->second;
pFileSet = dirs.begin()->second;
dirs.erase( dirs.begin() );
@@ -522,14 +534,10 @@ const File *FilenameDB::GetFile( const RString &sPath )
if( it == fs->files.end() )
return NULL;
/* Oops. &*it is a const File &, because you can't change the order
* of something once it's in a list. Cast away the const; we won't
* change the filename (used for the ordering), but the rest of the
* values are non-const. */
return const_cast<File *> (&*it);
return &*it;
}
const void *FilenameDB::GetFilePriv( const RString &path )
void *FilenameDB::GetFilePriv( const RString &path )
{
ASSERT( !m_Mutex.IsLockedByThisThread() );
@@ -592,6 +600,13 @@ void FilenameDB::GetFileSetCopy( const RString &sDir, FileSet &out )
m_Mutex.Unlock(); /* locked by GetFileSet */
}
void FilenameDB::CacheFile( const RString &sPath )
{
LOG->Warn( "Slow cache due to: %s", sPath.c_str() );
FlushDirCache( Dirname(sPath) );
}
/*
* Copyright (c) 2003-2004 Glenn Maynard
* All rights reserved.