December 2006 - Wine-commits

Ken Thomases : winecoreaudio: Replace pthread mutex with OSSpinLock.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 5cbc520318980cdeb22b39d7da81f6bc6b87ec12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc520318980cdeb22b39d7d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:50:18 2006 -0600 winecoreaudio: Replace pthread mutex with OSSpinLock. --- dlls/winmm/winecoreaudio/audio.c | 72 +++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index e5b9e41..d7dc314 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -32,9 +32,6 @@ # include <unistd.h> #endif #include <fcntl.h> -#ifdef HAVE_PTHREAD_H -# include <pthread.h> -#endif #include "windef.h" #include "winbase.h" @@ -55,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H) #include <CoreAudio/CoreAudio.h> #include <CoreFoundation/CoreFoundation.h> +#include <libkern/OSAtomic.h> /* Due to AudioUnit headers conflict define some needed types. @@ -152,7 +150,7 @@ typedef struct { DWORD tickCountMS; /* time in MS of last AudioUnit callback */ - pthread_mutex_t lock; /* synchronization stuff */ + OSSpinLock lock; /* synchronization stuff */ BOOL trace_on; BOOL warn_on; @@ -177,7 +175,7 @@ typedef struct { char interface_name[32];*/ /* synchronization stuff */ - pthread_mutex_t lock; + OSSpinLock lock; } WINE_WAVEIN; static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; @@ -505,7 +503,7 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16; - pthread_mutex_init(&WOutDev[i].lock, NULL); /* initialize the mutex */ + WOutDev[i].lock = 0; /* initialize the mutex */ } /* create mach messages handler */ @@ -554,18 +552,11 @@ LONG CoreAudio_WaveInit(void) void CoreAudio_WaveRelease(void) { /* Stop CFRunLoop in messageThread */ - int i; - TRACE("()\n"); CFMessagePortSendRequest(Port_SendToMessageThread, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); CFRelease(Port_SendToMessageThread); Port_SendToMessageThread = NULL; - - for (i = 0; i < MAX_WAVEOUTDRV; ++i) - { - pthread_mutex_destroy(&WOutDev[i].lock); - } } /*======================================================================* @@ -661,18 +652,19 @@ static DWORD wodOpen(WORD wDevID, LPWAVE } wwo = &WOutDev[wDevID]; - pthread_mutex_lock(&wwo->lock); + if (!OSSpinLockTry(&wwo->lock)) + return MMSYSERR_ALLOCATED; if (wwo->state != WINE_WS_CLOSED) { - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); return MMSYSERR_ALLOCATED; } if (!AudioUnit_CreateDefaultAudioUnit((void *) wwo, &wwo->audioUnit)) { ERR("CoreAudio_CreateDefaultAudioUnit(%p) failed\n", wwo); - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); return MMSYSERR_ERROR; } @@ -701,7 +693,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE if (!ret) { AudioUnit_CloseAudioUnit(wwo->audioUnit); - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); return WAVERR_BADFORMAT; /* FIXME return an error based on the OSStatus */ } wwo->streamDescription = streamFormat; @@ -712,7 +704,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE ERR("AudioOutputUnitStart failed: %08x\n", ret); AudioUnitUninitialize(wwo->audioUnit); AudioUnit_CloseAudioUnit(wwo->audioUnit); - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } @@ -738,7 +730,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE wwo->warn_on = WARN_ON(wave); wwo->err_on = ERR_ON(wave); - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); retval = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); @@ -762,11 +754,11 @@ static DWORD wodClose(WORD wDevID) } wwo = &WOutDev[wDevID]; - pthread_mutex_lock(&wwo->lock); + OSSpinLockLock(&wwo->lock); if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); ret = WAVERR_STILLPLAYING; } else { @@ -776,7 +768,7 @@ static DWORD wodClose(WORD wDevID) wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); err = AudioUnitUninitialize(wwo->audioUnit); if (err) { @@ -920,7 +912,7 @@ static void wodHelper_NotifyCompletions( LPWAVEHDR lpWaveHdr; LPWAVEHDR lpFirstDoneWaveHdr = NULL; - pthread_mutex_lock(&wwo->lock); + OSSpinLockLock(&wwo->lock); /* First, excise all of the done headers from the queue into * a free-standing list. */ @@ -957,8 +949,8 @@ static void wodHelper_NotifyCompletions( lpLastDoneWaveHdr->lpNext = NULL; } } - - pthread_mutex_unlock(&wwo->lock); + + OSSpinLockUnlock(&wwo->lock); /* Now, send the "done" notification for each header in our list. */ for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) @@ -1007,7 +999,7 @@ static DWORD wodWrite(WORD wDevID, LPWAV lpWaveHdr->dwFlags |= WHDR_INQUEUE; lpWaveHdr->lpNext = 0; - pthread_mutex_lock(&wwo->lock); + OSSpinLockLock(&wwo->lock); /* insert buffer at the end of queue */ for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext)) /* Do nothing */; @@ -1024,8 +1016,8 @@ static DWORD wodWrite(WORD wDevID, LPWAV wwo->dwPartialOffset = 0; } - pthread_mutex_unlock(&wwo->lock); - + OSSpinLockUnlock(&wwo->lock); + return MMSYSERR_NOERROR; } @@ -1058,10 +1050,10 @@ static DWORD wodPause(WORD wDevID) (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); } - pthread_mutex_lock(&WOutDev[wDevID].lock); + OSSpinLockLock(&WOutDev[wDevID].lock); if (WOutDev[wDevID].state == WINE_WS_PLAYING || WOutDev[wDevID].state == WINE_WS_STOPPED) WOutDev[wDevID].state = WINE_WS_PAUSED; - pthread_mutex_unlock(&WOutDev[wDevID].lock); + OSSpinLockUnlock(&WOutDev[wDevID].lock); return MMSYSERR_NOERROR; } @@ -1089,7 +1081,7 @@ static DWORD wodRestart(WORD wDevID) * Although we can be in PAUSED state with the Audio Unit still running, * that's harmless because the render callback will just produce silence. */ - pthread_mutex_lock(&WOutDev[wDevID].lock); + OSSpinLockLock(&WOutDev[wDevID].lock); if (WOutDev[wDevID].state == WINE_WS_PAUSED) { if (WOutDev[wDevID].lpPlayPtr) @@ -1097,7 +1089,7 @@ static DWORD wodRestart(WORD wDevID) else WOutDev[wDevID].state = WINE_WS_STOPPED; } - pthread_mutex_unlock(&WOutDev[wDevID].lock); + OSSpinLockUnlock(&WOutDev[wDevID].lock); status = AudioOutputUnitStart(WOutDev[wDevID].audioUnit); if (status) { @@ -1132,16 +1124,16 @@ static DWORD wodReset(WORD wDevID) /* updates current notify list */ /* if resetting, remove all wave headers and notify client that all headers were completed */ wodHelper_NotifyCompletions(wwo, TRUE); - - pthread_mutex_lock(&wwo->lock); - + + OSSpinLockLock(&wwo->lock); + wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; wwo->dwPartialOffset = 0; /* Clear partial wavehdr */ - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); status = AudioOutputUnitStart(wwo->audioUnit); @@ -1175,9 +1167,9 @@ static DWORD wodGetPosition(WORD wDevID, wwo = &WOutDev[wDevID]; - pthread_mutex_lock(&WOutDev[wDevID].lock); + OSSpinLockLock(&WOutDev[wDevID].lock); val = wwo->dwPlayedTotal; - pthread_mutex_unlock(&WOutDev[wDevID].lock); + OSSpinLockUnlock(&WOutDev[wDevID].lock); return bytes_to_mmtime(lpTime, val, &wwo->format); } @@ -1363,7 +1355,7 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi unsigned int dataNeeded = ioData->mBuffers[0].mDataByteSize; unsigned int dataProvided = 0; - pthread_mutex_lock(&wwo->lock); + OSSpinLockLock(&wwo->lock); while (dataNeeded > 0 && wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { @@ -1393,7 +1385,7 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi } } - pthread_mutex_unlock(&wwo->lock); + OSSpinLockUnlock(&wwo->lock); /* We can't provide any more wave data. Fill the rest with silence. */ if (dataNeeded > 0)

1 0

Ken Thomases : winecoreaudio: Report when the render callback is just providing silence.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 0bb13dd31c40eeda294935285629fced1f6fa3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb13dd31c40eeda294935285… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:49:24 2006 -0600 winecoreaudio: Report when the render callback is just providing silence. --- dlls/winmm/winecoreaudio/audio.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index c967ebb..ae1067a 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -63,6 +63,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); typedef void *AudioUnit; /* From AudioUnit/AUComponents.h */ +enum +{ + kAudioUnitRenderAction_OutputIsSilence = (1 << 4), + /* provides hint on return from Render(): if set the buffer contains all zeroes */ +}; typedef UInt32 AudioUnitRenderActionFlags; /* only allow 10 output devices through this driver, this ought to be adequate */ @@ -1441,6 +1446,8 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi } else { + if (!dataProvided) + *ioActionFlags |= kAudioUnitRenderAction_OutputIsSilence; memset((char*)ioData->mBuffers[0].mData + dataProvided, 0, dataNeeded); dataProvided += dataNeeded; dataNeeded = 0;

1 0

Ken Thomases : winecoreaudio: Remove more mutexes from around Audio Unit calls.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: e24533cb6df59587ed26bfa0e8d40f2735ff2be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24533cb6df59587ed26bfa0e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:49:35 2006 -0600 winecoreaudio: Remove more mutexes from around Audio Unit calls. --- dlls/winmm/winecoreaudio/audio.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index ae1067a..9acbd06 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -798,23 +798,22 @@ static DWORD wodClose(WORD wDevID) wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ + pthread_mutex_unlock(&wwo->lock); + err = AudioUnitUninitialize(wwo->audioUnit); if (err) { ERR("AudioUnitUninitialize return %c%c%c%c\n", (char) (err >> 24), (char) (err >> 16), (char) (err >> 8), (char) err); - pthread_mutex_unlock(&wwo->lock); return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } if ( !AudioUnit_CloseAudioUnit(wwo->audioUnit) ) { ERR("Can't close AudioUnit\n"); - pthread_mutex_unlock(&wwo->lock); return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } - pthread_mutex_unlock(&wwo->lock); ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } @@ -1239,13 +1238,9 @@ static DWORD wodGetVolume(WORD wDevID, L } TRACE("(%u, %p);\n", wDevID, lpdwVol); - - pthread_mutex_lock(&WOutDev[wDevID].lock); - + AudioUnit_GetVolume(WOutDev[wDevID].audioUnit, &left, &right); - - pthread_mutex_unlock(&WOutDev[wDevID].lock); - + *lpdwVol = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16); return MMSYSERR_NOERROR; @@ -1269,13 +1264,9 @@ static DWORD wodSetVolume(WORD wDevID, D right = HIWORD(dwParam) / 65535.0f; TRACE("(%u, %08x);\n", wDevID, dwParam); - - pthread_mutex_lock(&WOutDev[wDevID].lock); - + AudioUnit_SetVolume(WOutDev[wDevID].audioUnit, left, right); - - pthread_mutex_unlock(&WOutDev[wDevID].lock); - + return MMSYSERR_NOERROR; }

1 0

Ken Thomases : winecoreaudio: Push notify of completions from render callback to message thread.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: d5975872af50aa8c318513961be090c44b1486f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5975872af50aa8c318513961… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:49:43 2006 -0600 winecoreaudio: Push notify of completions from render callback to message thread. Rather than have the Audio Unit render callback traverse the queue of wave headers looking for complete ones, and sending a message to the message thread for each one it finds, just send one message to tell the message thread to do that work itself. The render callback is called in a real-time priority thread and is expected to return as quickly as possible. --- dlls/winmm/winecoreaudio/audio.c | 119 ++++++++++++++++++++------------------ 1 files changed, 62 insertions(+), 57 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 9acbd06..54393df 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -185,7 +185,7 @@ static WINE_WAVEOUT WOutDev [MAX_WAVEO static CFMessagePortRef Port_SendToMessageThread; static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); -static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); +static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); extern int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au); extern int AudioUnit_CloseAudioUnit(AudioUnit au); @@ -256,26 +256,19 @@ static const char * getMessage(UINT msg) } #define kStopLoopMessage 0 -#define kWaveOutCallbackMessage 1 +#define kWaveOutNotifyCompletionsMessage 1 #define kWaveInCallbackMessage 2 /* Mach Message Handling */ static CFDataRef wodMessageHandler(CFMessagePortRef port_ReceiveInMessageThread, SInt32 msgid, CFDataRef data, void *info) { UInt32 *buffer = NULL; - WINE_WAVEOUT* wwo = NULL; - + switch (msgid) { - case kWaveOutCallbackMessage: + case kWaveOutNotifyCompletionsMessage: buffer = (UInt32 *) CFDataGetBytePtr(data); - wwo = &WOutDev[buffer[0]]; - - pthread_mutex_lock(&wwo->lock); - DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, - (HDRVR)wwo->waveDesc.hWave, (WORD)buffer[1], wwo->waveDesc.dwInstance, - (DWORD)buffer[2], (DWORD)buffer[3]); - pthread_mutex_unlock(&wwo->lock); + wodHelper_NotifyCompletions(&WOutDev[buffer[0]], FALSE); break; case kWaveInCallbackMessage: default: @@ -303,25 +296,23 @@ static DWORD WINAPI messageThread(LPVOID return 0; } -static DWORD wodSendDriverCallbackMessage(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +/************************************************************************** +* wodSendNotifyCompletionsMessage [internal] +* Call from AudioUnit IO thread can't use Wine debug channels. +*/ +static void wodSendNotifyCompletionsMessage(WINE_WAVEOUT* wwo) { CFDataRef data; - UInt32 buffer[4]; - SInt32 ret; - - buffer[0] = (UInt32) wwo->woID; - buffer[1] = (UInt32) wMsg; - buffer[2] = (UInt32) dwParam1; - buffer[3] = (UInt32) dwParam2; + UInt32 buffer; + + buffer = (UInt32) wwo->woID; - data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)buffer, sizeof(buffer)); + data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)&buffer, sizeof(buffer)); if (!data) - return 0; - - ret = CFMessagePortSendRequest(Port_SendToMessageThread, kWaveOutCallbackMessage, data, 0.0, 0.0, NULL, NULL); + return; + + CFMessagePortSendRequest(Port_SendToMessageThread, kWaveOutNotifyCompletionsMessage, data, 0.0, 0.0, NULL, NULL); CFRelease(data); - - return (ret == kCFMessagePortSuccess)?1:0; } static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, @@ -589,13 +580,13 @@ void CoreAudio_WaveRelease(void) /************************************************************************** * wodNotifyClient [internal] -* Call from AudioUnit IO thread can't use Wine debug channels. */ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { switch (wMsg) { case WOM_OPEN: case WOM_CLOSE: + case WOM_DONE: if (wwo->wFlags != DCB_NULL && !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, @@ -604,13 +595,6 @@ static DWORD wodNotifyClient(WINE_WAVEOU return MMSYSERR_ERROR; } break; - case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - ! wodSendDriverCallbackMessage(wwo, wMsg, dwParam1, dwParam2)) - { - return MMSYSERR_ERROR; - } - break; default: return MMSYSERR_INVALPARAM; } @@ -936,39 +920,60 @@ static void wodHelper_PlayPtrNext(WINE_W } /* if force is TRUE then notify the client that all the headers were completed - * Call from AudioUnit IO thread can't use Wine debug channels. */ -static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) +static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) { LPWAVEHDR lpWaveHdr; - DWORD retval; + LPWAVEHDR lpFirstDoneWaveHdr = NULL; pthread_mutex_lock(&wwo->lock); - /* Start from lpQueuePtr and keep notifying until: - * - we hit an unwritten wavehdr - * - we hit the beginning of a running loop - * - we hit a wavehdr which hasn't finished playing - */ - while ((lpWaveHdr = wwo->lpQueuePtr) && - (force || - (lpWaveHdr != wwo->lpPlayPtr && - lpWaveHdr != wwo->lpLoopPtr))) + /* First, excise all of the done headers from the queue into + * a free-standing list. */ + if (force) + { + lpFirstDoneWaveHdr = wwo->lpQueuePtr; + wwo->lpQueuePtr = NULL; + } + else + { + LPWAVEHDR lpLastDoneWaveHdr = NULL; + + /* Start from lpQueuePtr and keep notifying until: + * - we hit an unwritten wavehdr + * - we hit the beginning of a running loop + * - we hit a wavehdr which hasn't finished playing + */ + for ( + lpWaveHdr = wwo->lpQueuePtr; + lpWaveHdr && + lpWaveHdr != wwo->lpPlayPtr && + lpWaveHdr != wwo->lpLoopPtr; + lpWaveHdr = lpWaveHdr->lpNext + ) + { + if (!lpFirstDoneWaveHdr) + lpFirstDoneWaveHdr = lpWaveHdr; + lpLastDoneWaveHdr = lpWaveHdr; + } + + if (lpLastDoneWaveHdr) + { + wwo->lpQueuePtr = lpLastDoneWaveHdr->lpNext; + lpLastDoneWaveHdr->lpNext = NULL; + } + } + + pthread_mutex_unlock(&wwo->lock); + + /* Now, send the "done" notification for each header in our list. */ + for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) { - wwo->lpQueuePtr = lpWaveHdr->lpNext; - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - + wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); } - - retval = (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != - wwo->lpLoopPtr) ? 0 : INFINITE; - - pthread_mutex_unlock(&wwo->lock); - - return retval; } /************************************************************************** @@ -1453,7 +1458,7 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi memset(ioData->mBuffers[buffer].mData, 0, ioData->mBuffers[buffer].mDataByteSize); } - if (needNotify) wodHelper_NotifyCompletions(wwo, FALSE); + if (needNotify) wodSendNotifyCompletionsMessage(wwo); return noErr; } #else

1 0

Ken Thomases : winecoreaudio: Change to faster non-recursive mutex.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 3ade58b0b974140828ed7d666df6234a874e567f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ade58b0b974140828ed7d666… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:49:51 2006 -0600 winecoreaudio: Change to faster non-recursive mutex. --- dlls/winmm/winecoreaudio/audio.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 54393df..b0d6c2c 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -438,7 +438,6 @@ LONG CoreAudio_WaveInit(void) OSStatus status; UInt32 propertySize; CHAR szPname[MAXPNAMELEN]; - pthread_mutexattr_t mutexattr; int i; HANDLE hThread; CFStringRef messageThreadPortName; @@ -472,9 +471,6 @@ LONG CoreAudio_WaveInit(void) CoreAudio_DefaultDevice.interface_name=HeapAlloc(GetProcessHeap(),0,strlen(CoreAudio_DefaultDevice.dev_name)+1); sprintf(CoreAudio_DefaultDevice.interface_name, "%s", CoreAudio_DefaultDevice.dev_name); - pthread_mutexattr_init(&mutexattr); - pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE); - for (i = 0; i < MAX_WAVEOUTDRV; ++i) { WOutDev[i].state = WINE_WS_CLOSED; @@ -509,10 +505,8 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16; - pthread_mutex_init(&WOutDev[i].lock, &mutexattr); /* initialize the mutex */ + pthread_mutex_init(&WOutDev[i].lock, NULL); /* initialize the mutex */ } - - pthread_mutexattr_destroy(&mutexattr); /* create mach messages handler */ srandomdev();

1 0

Ken Thomases : winecoreaudio: Lift mutex lock/ unlock out of wodHelper_PlayPtrNext to caller.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 82fff94c338571ec95a1cda47570a3b71523588e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fff94c338571ec95a1cda47… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:49:07 2006 -0600 winecoreaudio: Lift mutex lock/unlock out of wodHelper_PlayPtrNext to caller. --- dlls/winmm/winecoreaudio/audio.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index d38fe9b..c967ebb 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -897,14 +897,13 @@ static void wodHelper_CheckForLoopBegin( * wodHelper_PlayPtrNext [internal] * * Advance the play pointer to the next waveheader, looping if required. +* This is called with the WAVEOUT lock held. * Call from AudioUnit IO thread can't use Wine debug channels. */ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) { BOOL didLoopBack = FALSE; - pthread_mutex_lock(&wwo->lock); - wwo->dwPartialOffset = 0; if ((wwo->lpPlayPtr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr) { @@ -930,8 +929,6 @@ static void wodHelper_PlayPtrNext(WINE_W else wodHelper_CheckForLoopBegin(wwo); } - - pthread_mutex_unlock(&wwo->lock); } /* if force is TRUE then notify the client that all the headers were completed @@ -1406,16 +1403,15 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi { UInt32 buffer; WINE_WAVEOUT *wwo = (WINE_WAVEOUT *) inRefCon; - int nextPtr = 0; int needNotify = 0; unsigned int dataNeeded = ioData->mBuffers[0].mDataByteSize; unsigned int dataProvided = 0; + pthread_mutex_lock(&wwo->lock); + while (dataNeeded > 0) { - pthread_mutex_lock(&wwo->lock); - if (wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { unsigned int available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset; @@ -1438,9 +1434,10 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi } if (available == 0) - nextPtr = 1; - - needNotify = 1; + { + wodHelper_PlayPtrNext(wwo); + needNotify = 1; + } } else { @@ -1448,16 +1445,10 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi dataProvided += dataNeeded; dataNeeded = 0; } - - pthread_mutex_unlock(&wwo->lock); - - if (nextPtr) - { - wodHelper_PlayPtrNext(wwo); - nextPtr = 0; - } } + pthread_mutex_unlock(&wwo->lock); + /* We only fill buffer 0. Set any others that might be requested to 0. */ for (buffer = 1; buffer < ioData->mNumberBuffers; buffer++) {

1 0

Ken Thomases : winecoreaudio: Leave audio unit running, except when waveout device paused.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: bdbe803cb632f8f12f621eb60e966cf55b2c4ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbe803cb632f8f12f621eb60… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:48:59 2006 -0600 winecoreaudio: Leave audio unit running, except when waveout device paused. --- dlls/winmm/winecoreaudio/audio.c | 89 +++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 39 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 265b9af..d38fe9b 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -722,6 +722,17 @@ static DWORD wodOpen(WORD wDevID, LPWAVE return WAVERR_BADFORMAT; /* FIXME return an error based on the OSStatus */ } wwo->streamDescription = streamFormat; + + ret = AudioOutputUnitStart(wwo->audioUnit); + if (ret) + { + ERR("AudioOutputUnitStart failed: %08x\n", ret); + AudioUnitUninitialize(wwo->audioUnit); + AudioUnit_CloseAudioUnit(wwo->audioUnit); + pthread_mutex_unlock(&wwo->lock); + return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ + } + wwo->state = WINE_WS_STOPPED; wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); @@ -915,14 +926,7 @@ static void wodHelper_PlayPtrNext(WINE_W wwo->lpPlayPtr = wwo->lpPlayPtr->lpNext; if (!wwo->lpPlayPtr) - { - OSStatus status; wwo->state = WINE_WS_STOPPED; - status = AudioOutputUnitStop(wwo->audioUnit); - if (status && wwo->err_on) - fprintf(stderr, "err:winecoreaudio:wodHelper_PlayPtrNext AudioOutputUnitStop return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - } else wodHelper_CheckForLoopBegin(wwo); } @@ -1022,12 +1026,12 @@ static DWORD wodHelper_Reset(WINE_WAVE wwo->state = WINE_WS_PAUSED; } - status = AudioOutputUnitStop(wwo->audioUnit); - pthread_mutex_unlock(&wwo->lock); + status = AudioOutputUnitStart(wwo->audioUnit); + if (status) { - ERR( "AudioOutputUnitStop return %c%c%c%c\n", + ERR( "AudioOutputUnitStart return %c%c%c%c\n", (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } @@ -1083,13 +1087,7 @@ static DWORD wodWrite(WORD wDevID, LPWAV wwo->lpPlayPtr = lpWaveHdr; if (wwo->state == WINE_WS_STOPPED) - { - OSStatus status = AudioOutputUnitStart(wwo->audioUnit); - if (status) { - ERR("AudioOutputUnitStart return %c%c%c%c\n", (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - } - else wwo->state = WINE_WS_PLAYING; - } + wwo->state = WINE_WS_PLAYING; wodHelper_CheckForLoopBegin(wwo); @@ -1114,21 +1112,26 @@ static DWORD wodPause(WORD wDevID) WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } - + + /* The order of the following operations is important since we can't hold + * the mutex while we make an Audio Unit call. Stop the Audio Unit before + * setting the PAUSED state. In wodRestart, the order is reversed. This + * guarantees that we can't get into a situation where the state is + * PLAYING or STOPPED but the Audio Unit isn't running. Although we can + * be in PAUSED state with the Audio Unit still running, that's harmless + * because the render callback will just produce silence. + */ + status = AudioOutputUnitStop(WOutDev[wDevID].audioUnit); + if (status) { + WARN("AudioOutputUnitStop return %c%c%c%c\n", + (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); + } + pthread_mutex_lock(&WOutDev[wDevID].lock); if (WOutDev[wDevID].state == WINE_WS_PLAYING || WOutDev[wDevID].state == WINE_WS_STOPPED) - { WOutDev[wDevID].state = WINE_WS_PAUSED; - status = AudioOutputUnitStop(WOutDev[wDevID].audioUnit); - if (status) { - ERR( "AudioOutputUnitStop return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - pthread_mutex_unlock(&WOutDev[wDevID].lock); - return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ - } - } pthread_mutex_unlock(&WOutDev[wDevID].lock); - + return MMSYSERR_NOERROR; } @@ -1137,6 +1140,8 @@ static DWORD wodPause(WORD wDevID) */ static DWORD wodRestart(WORD wDevID) { + OSStatus status; + TRACE("(%u);\n", wDevID); if (wDevID >= MAX_WAVEOUTDRV ) @@ -1144,26 +1149,32 @@ static DWORD wodRestart(WORD wDevID) WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } - + + /* The order of the following operations is important since we can't hold + * the mutex while we make an Audio Unit call. Set the PLAYING/STOPPED + * state before starting the Audio Unit. In wodPause, the order is + * reversed. This guarantees that we can't get into a situation where + * the state is PLAYING or STOPPED but the Audio Unit isn't running. + * Although we can be in PAUSED state with the Audio Unit still running, + * that's harmless because the render callback will just produce silence. + */ pthread_mutex_lock(&WOutDev[wDevID].lock); if (WOutDev[wDevID].state == WINE_WS_PAUSED) { if (WOutDev[wDevID].lpPlayPtr) - { - OSStatus status = AudioOutputUnitStart(WOutDev[wDevID].audioUnit); - if (status) { - ERR("AudioOutputUnitStart return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - pthread_mutex_unlock(&WOutDev[wDevID].lock); - return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ - } WOutDev[wDevID].state = WINE_WS_PLAYING; - } else WOutDev[wDevID].state = WINE_WS_STOPPED; } pthread_mutex_unlock(&WOutDev[wDevID].lock); - + + status = AudioOutputUnitStart(WOutDev[wDevID].audioUnit); + if (status) { + ERR("AudioOutputUnitStart return %c%c%c%c\n", + (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); + return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ + } + return MMSYSERR_NOERROR; }

1 0

Ken Thomases : winecoreaudio: Inline & eliminate the specializations of wodHelper_BeginWaveHdr.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 7cecf7a40aeaaeab710b80b3e7462cd99892b2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cecf7a40aeaaeab710b80b3e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:48:45 2006 -0600 winecoreaudio: Inline & eliminate the specializations of wodHelper_BeginWaveHdr. --- dlls/winmm/winecoreaudio/audio.c | 93 ++++++++++++++------------------------ 1 files changed, 34 insertions(+), 59 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 8b416bb..ac3095d 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -883,58 +883,6 @@ static void wodHelper_CheckForLoopBegin( /************************************************************************** -* wodHelper_BeginWaveHdrPlay [internal] -* -* Makes the specified lpWaveHdr the currently playing wave header. -* If the specified wave header is a begin loop and we're not already in -* a loop, setup the loop. -* Call from AudioUnit IO thread can't use Wine debug channels. -*/ -static void wodHelper_BeginWaveHdrPlay(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) -{ - wwo->lpPlayPtr = lpWaveHdr; - - if (!lpWaveHdr) - { - OSStatus status; - wwo->state = WINE_WS_STOPPED; - status = AudioOutputUnitStop(wwo->audioUnit); - if (status && wwo->err_on) - fprintf(stderr, "err:winecoreaudio:wodHelper_BeginWaveHdrPlay AudioOutputUnitStop return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - } - else - wodHelper_CheckForLoopBegin(wwo); -} - - -/************************************************************************** -* wodHelper_BeginWaveHdrWrite [internal] -* -* Makes the specified lpWaveHdr the currently playing wave header. -* If the specified wave header is a begin loop and we're not already in -* a loop, setup the loop. -*/ -static void wodHelper_BeginWaveHdrWrite(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) -{ - wwo->lpPlayPtr = lpWaveHdr; - - if (wwo->state == WINE_WS_STOPPED) - { - OSStatus status = AudioOutputUnitStart(wwo->audioUnit); - if (status) { - ERR("AudioOutputUnitStart return %c%c%c%c\n", (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - } - else wwo->state = WINE_WS_PLAYING; - } - - wodHelper_CheckForLoopBegin(wwo); - - wwo->dwPartialOffset = 0; -} - - -/************************************************************************** * wodHelper_PlayPtrNext [internal] * * Advance the play pointer to the next waveheader, looping if required. @@ -969,15 +917,27 @@ static LPWAVEHDR wodHelper_PlayPtrNext(W wwo->lpLoopPtr = NULL; } } - if (!didLoopBack) { /* We didn't loop back. Advance to the next wave header */ - wodHelper_BeginWaveHdrPlay(wwo, lpWaveHdr = lpWaveHdr->lpNext); - } + lpWaveHdr = lpWaveHdr->lpNext; - pthread_mutex_unlock(&wwo->lock); + wwo->lpPlayPtr = lpWaveHdr; + + if (!lpWaveHdr) + { + OSStatus status; + wwo->state = WINE_WS_STOPPED; + status = AudioOutputUnitStop(wwo->audioUnit); + if (status && wwo->err_on) + fprintf(stderr, "err:winecoreaudio:wodHelper_PlayPtrNext AudioOutputUnitStop return %c%c%c%c\n", + (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); + } + else + wodHelper_CheckForLoopBegin(wwo); + } + pthread_mutex_unlock(&wwo->lock); return lpWaveHdr; } @@ -1128,11 +1088,26 @@ static DWORD wodWrite(WORD wDevID, LPWAV for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext)) /* Do nothing */; *wh = lpWaveHdr; - + if (!wwo->lpPlayPtr) - wodHelper_BeginWaveHdrWrite(wwo,lpWaveHdr); - pthread_mutex_unlock(&wwo->lock); + { + wwo->lpPlayPtr = lpWaveHdr; + if (wwo->state == WINE_WS_STOPPED) + { + OSStatus status = AudioOutputUnitStart(wwo->audioUnit); + if (status) { + ERR("AudioOutputUnitStart return %c%c%c%c\n", (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); + } + else wwo->state = WINE_WS_PLAYING; + } + + wodHelper_CheckForLoopBegin(wwo); + + wwo->dwPartialOffset = 0; + } + pthread_mutex_unlock(&wwo->lock); + return MMSYSERR_NOERROR; }

1 0

Ken Thomases : winecoreaudio: Eliminate unnecessary variable, unreachable code, unused retval.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: aef21c19c1d7c97b129f13391d1d8b1c5b43322a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef21c19c1d7c97b129f13391… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:48:52 2006 -0600 winecoreaudio: Eliminate unnecessary variable, unreachable code, unused retval. --- dlls/winmm/winecoreaudio/audio.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index ac3095d..265b9af 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -179,7 +179,7 @@ static WINE_WAVEOUT WOutDev [MAX_WAVEO static CFMessagePortRef Port_SendToMessageThread; -static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); +static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); extern int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au); @@ -888,22 +888,14 @@ static void wodHelper_CheckForLoopBegin( * Advance the play pointer to the next waveheader, looping if required. * Call from AudioUnit IO thread can't use Wine debug channels. */ -static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) +static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) { - LPWAVEHDR lpWaveHdr; BOOL didLoopBack = FALSE; pthread_mutex_lock(&wwo->lock); - lpWaveHdr = wwo->lpPlayPtr; - if (!lpWaveHdr) - { - pthread_mutex_unlock(&wwo->lock); - return NULL; - } - wwo->dwPartialOffset = 0; - if ((lpWaveHdr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr) + if ((wwo->lpPlayPtr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr) { /* We're at the end of a loop, loop if required */ if (wwo->dwLoops > 1) @@ -920,11 +912,9 @@ static LPWAVEHDR wodHelper_PlayPtrNext(W if (!didLoopBack) { /* We didn't loop back. Advance to the next wave header */ - lpWaveHdr = lpWaveHdr->lpNext; - - wwo->lpPlayPtr = lpWaveHdr; + wwo->lpPlayPtr = wwo->lpPlayPtr->lpNext; - if (!lpWaveHdr) + if (!wwo->lpPlayPtr) { OSStatus status; wwo->state = WINE_WS_STOPPED; @@ -938,7 +928,6 @@ static LPWAVEHDR wodHelper_PlayPtrNext(W } pthread_mutex_unlock(&wwo->lock); - return lpWaveHdr; } /* if force is TRUE then notify the client that all the headers were completed

1 0

Ken Thomases : winecoreaudio: Simplify handling of BEGIN+ENDLOOP wave headers.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 551f7d94a3a0855774c65b7b4b62cf5ca25d6352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551f7d94a3a0855774c65b7b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:48:23 2006 -0600 winecoreaudio: Simplify handling of BEGIN+ENDLOOP wave headers. --- dlls/winmm/winecoreaudio/audio.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index d28759b..9e26c31 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -935,6 +935,7 @@ static void wodHelper_BeginWaveHdr(WINE_ static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) { LPWAVEHDR lpWaveHdr; + BOOL didLoopBack = FALSE; pthread_mutex_lock(&wwo->lock); @@ -953,24 +954,17 @@ static LPWAVEHDR wodHelper_PlayPtrNext(W { wwo->dwLoops--; wwo->lpPlayPtr = wwo->lpLoopPtr; - } else + didLoopBack = TRUE; + } + else { - /* Handle overlapping loops correctly */ - if (wwo->lpLoopPtr != lpWaveHdr && (lpWaveHdr->dwFlags & WHDR_BEGINLOOP)) { - /* shall we consider the END flag for the closing loop or for - * the opening one or for both ??? - * code assumes for closing loop only - */ - } else - { - lpWaveHdr = lpWaveHdr->lpNext; - } wwo->lpLoopPtr = NULL; - wodHelper_BeginWaveHdr(wwo, lpWaveHdr); } - } else + } + + if (!didLoopBack) { - /* We're not in a loop. Advance to the next wave header */ + /* We didn't loop back. Advance to the next wave header */ wodHelper_BeginWaveHdr(wwo, lpWaveHdr = lpWaveHdr->lpNext); }

1 0