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

reduce lock contention

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-08 01:38:22 +00:00
parent eff24b6380
commit a5dae29422
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameSoundManager.cpp
+29 -9
View File
@@ -93,14 +93,31 @@ CHECKPOINT;
CHECKPOINT; CHECKPOINT;
if( ToPlay.file.empty() ) if( ToPlay.file.empty() )
{ {
if( g_Playing->m_Music->IsPlaying() ) /* StopPlaying() can take a while, so don't hold the lock while we stop the sound.
g_Playing->m_Music->StopPlaying(); * Be sure to leave the rest of g_Playing in place. */
g_Playing->m_Music->Unload(); RageSound *pOldSound = g_Playing->m_Music;
g_Playing->m_Music = new RageSound;
L.Unlock();
/* We're not allowed to delete the sound in a separate thread, because
* RageSoundManager::FlushPosMapQueue might be running. Stop the sound,
* and give it to RageSoundManager to delete. */
SOUNDMAN->DeleteSound( pOldSound );
return; return;
} }
CHECKPOINT; CHECKPOINT;
/* Unlock, load the sound here, and relock. Loading may take a while if we're
* reading from CD and we have to seek far, which can throw off the timing below. */
MusicPlaying *NewMusic;
{
g_Mutex->Unlock();
RageSound *pSound = new RageSound;
pSound->Load( ToPlay.file, false );
g_Mutex->Lock();
NewMusic = new MusicPlaying( pSound );
}
MusicPlaying *NewMusic = new MusicPlaying( new RageSound );
NewMusic->m_Timing = g_Playing->m_Timing; NewMusic->m_Timing = g_Playing->m_Timing;
CHECKPOINT; CHECKPOINT;
@@ -199,7 +216,7 @@ CHECKPOINT;
if( ToPlay.HasTiming ) if( ToPlay.HasTiming )
NewMusic->m_NewTiming = ToPlay.timing_data; NewMusic->m_NewTiming = ToPlay.timing_data;
NewMusic->m_TimingDelayed = true; NewMusic->m_TimingDelayed = true;
NewMusic->m_Music->Load( ToPlay.file, false ); // NewMusic->m_Music->Load( ToPlay.file, false );
RageSoundParams p; RageSoundParams p;
p.m_StartSecond = ToPlay.start_sec; p.m_StartSecond = ToPlay.start_sec;
@@ -282,10 +299,13 @@ static void StartQueuedSounds()
else else
{ {
CHECKPOINT; CHECKPOINT;
LockMutex L( *g_Mutex ); /* StopPlaying() can take a while, so don't hold the lock while we stop the sound. */
if( g_Playing->m_Music->IsPlaying() ) g_Mutex->Lock();
g_Playing->m_Music->StopPlaying(); RageSound *pOldSound = g_Playing->m_Music;
g_Playing->m_Music->Unload(); g_Playing->m_Music = new RageSound;
g_Mutex->Unlock();
SOUNDMAN->DeleteSound( pOldSound );
} }
delete pMusic; delete pMusic;
} }