Skip to content

WinMM: avoid deadlock #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkeller51 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WinMM: avoid deadlock #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions RtMidi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2688,6 +2688,7 @@ struct WinMidiData {
MidiInApi::MidiMessage message;
std::vector<LPMIDIHDR> sysexBuffer;
CRITICAL_SECTION _mutex; // [Patrice] see https://groups.google.com/forum/#!topic/mididev/6OUjHutMpEo
std::atomic<bool> closing;
};

//*********************************************************************//
Expand Down Expand Up @@ -2761,12 +2762,15 @@ static void CALLBACK midiInputCallback( HMIDIIN /*hmin*/,
// avoid requeueing it, else the computer suddenly reboots after
// one or two minutes.
if ( apiData->sysexBuffer[sysex->dwUser]->dwBytesRecorded > 0 ) {
//if ( sysex->dwBytesRecorded > 0 ) {
EnterCriticalSection( &(apiData->_mutex) );
MMRESULT result = midiInAddBuffer( apiData->inHandle, apiData->sysexBuffer[sysex->dwUser], sizeof(MIDIHDR) );
LeaveCriticalSection( &(apiData->_mutex) );
if ( result != MMSYSERR_NOERROR )
std::cerr << "\nRtMidiIn::midiInputCallback: error sending sysex to Midi device!!\n\n";

if (!apiData->closing)
{
EnterCriticalSection(&(apiData->_mutex));
MMRESULT result = midiInAddBuffer(apiData->inHandle, apiData->sysexBuffer[sysex->dwUser], sizeof(MIDIHDR));
LeaveCriticalSection(&(apiData->_mutex));
if (result != MMSYSERR_NOERROR)
std::cerr << "\nRtMidiIn::midiInputCallback: error sending sysex to Midi device!!\n\n";
}

if ( data->ignoreFlags & 0x01 ) return;
}
Expand Down Expand Up @@ -2823,6 +2827,7 @@ void MidiInWinMM :: initialize( const std::string& /*clientName*/ )
apiData_ = (void *) data;
inputData_.apiData = (void *) data;
data->message.bytes.clear(); // needs to be empty for first input message
data->closing = false;

if ( !InitializeCriticalSectionAndSpinCount( &(data->_mutex), 0x00000400 ) ) {
errorString_ = "MidiInWinMM::initialize: InitializeCriticalSectionAndSpinCount failed.";
Expand Down Expand Up @@ -2917,9 +2922,13 @@ void MidiInWinMM :: closePort( void )
{
if ( connected_ ) {
WinMidiData *data = static_cast<WinMidiData *> (apiData_);
EnterCriticalSection( &(data->_mutex) );
midiInReset( data->inHandle );
midiInStop( data->inHandle );

// avoid deadlock in midiInputCallback
data->closing = true;

EnterCriticalSection(&(data->_mutex));
midiInReset(data->inHandle);
midiInStop(data->inHandle);

for ( size_t i=0; i < data->sysexBuffer.size(); ++i ) {
int result = midiInUnprepareHeader(data->inHandle, data->sysexBuffer[i], sizeof(MIDIHDR));
Expand Down
Loading