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

remove unused file/driver tracking

Browse Source
This commit is contained in:
Glenn Maynard
2005-06-27 05:22:09 +00:00
parent cd43ae66f1
commit 5de59d0c51
1 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileManager.cpp
+1 -45
View File
@@ -23,9 +23,6 @@ static RageEvent *g_Mutex;
CString InitialWorkingDirectory; CString InitialWorkingDirectory;
CString DirOfExecutable; CString DirOfExecutable;
typedef map< const RageFileBasic *, RageFileDriver * > FileReferences;
static FileReferences g_Refs;
struct LoadedDriver struct LoadedDriver
{ {
/* A loaded driver may have a base path, which modifies the path we /* A loaded driver may have a base path, which modifies the path we
@@ -684,29 +681,6 @@ static bool SortBySecond( const pair<int,int> &a, const pair<int,int> &b )
return a.second < b.second; return a.second < b.second;
} }
void AddReference( const RageFileBasic *obj, RageFileDriver *driver )
{
LockMut( *g_Mutex );
pair< const RageFileBasic *, RageFileDriver * > ref;
ref.first = obj;
ref.second = driver;
/* map::insert returns an iterator (which we discard) and a bool, indicating whether
* this is a new entry. This should always be new. */
const pair< FileReferences::iterator, bool > ret = g_Refs.insert( ref );
ASSERT_M( ret.second, ssprintf( "RemoveReference: Duplicate reference (%s)", obj->GetDisplayPath().c_str() ) );
}
void RemoveReference( const RageFileBasic *obj )
{
LockMut( *g_Mutex );
FileReferences::iterator it = g_Refs.find( obj );
ASSERT_M( it != g_Refs.end(), ssprintf( "RemoveReference: Missing reference (%s)", obj->GetDisplayPath().c_str() ) );
g_Refs.erase( it );
}
/* /*
* Return true if the given path should use slow, reliable writes. * Return true if the given path should use slow, reliable writes.
* *
@@ -749,17 +723,7 @@ RageFileBasic *RageFileManager::Open( CString sPath, int mode, int &err )
/* Copy a RageFileBasic for a new RageFile. */ /* Copy a RageFileBasic for a new RageFile. */
RageFileBasic *RageFileManager::CopyFileObj( const RageFileBasic *cpy ) RageFileBasic *RageFileManager::CopyFileObj( const RageFileBasic *cpy )
{ {
LockMut( *g_Mutex ); return cpy->Copy();
FileReferences::const_iterator it = g_Refs.find( cpy );
ASSERT_M( it != g_Refs.end(), ssprintf( "CopyFileObj: Missing reference (%s)", cpy->GetDisplayPath().c_str() ) );
RageFileBasic *ret = cpy->Copy();
/* It's from the same driver as the original. */
AddReference( ret, it->second );
return ret;
} }
RageFileBasic *RageFileManager::OpenForReading( CString sPath, int mode, int &err ) RageFileBasic *RageFileManager::OpenForReading( CString sPath, int mode, int &err )
@@ -777,7 +741,6 @@ RageFileBasic *RageFileManager::OpenForReading( CString sPath, int mode, int &er
RageFileBasic *ret = ld.driver->Open( path, mode, error ); RageFileBasic *ret = ld.driver->Open( path, mode, error );
if( ret ) if( ret )
{ {
AddReference( ret, ld.driver );
UnreferenceAllDrivers( aDriverList ); UnreferenceAllDrivers( aDriverList );
return ret; return ret;
} }
@@ -844,10 +807,7 @@ RageFileBasic *RageFileManager::OpenForWriting( CString sPath, int mode, int &er
int error; int error;
RageFileBasic *ret = ld.driver->Open( path, mode, error ); RageFileBasic *ret = ld.driver->Open( path, mode, error );
if( ret ) if( ret )
{
AddReference( ret, ld.driver );
return ret; return ret;
}
/* The drivers are in order of priority; if they all return error, return the /* The drivers are in order of priority; if they all return error, return the
* first. Never return ERROR_WRITING_NOT_SUPPORTED. */ * first. Never return ERROR_WRITING_NOT_SUPPORTED. */
@@ -865,10 +825,6 @@ RageFileBasic *RageFileManager::OpenForWriting( CString sPath, int mode, int &er
void RageFileManager::Close( RageFileBasic *obj ) void RageFileManager::Close( RageFileBasic *obj )
{ {
if( obj == NULL )
return;
RemoveReference( obj );
delete obj; delete obj;
} }