gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: Try stopping extmidi player with SIGINT first. (#11404)

Browse Source 
This may give the player a chance to issue MIDI note-off commands.

The kill/waitpid cycle is also less aggressive, waiting 50ms each time.
This commit is contained in:
Peter Nelson 2023-11-27 20:39:22 +00:00 committed by GitHub
parent a856fbeca9
commit 4c6ccb5248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/music/extmidi.cpp
View File

@ -130,22 +130,37 @@ void MusicDriver_ExtMidi::DoPlay()
}
}
/**
* Try to end child process with kill/waitpid for up to 1 second.
* @param pid The process ID to end.
* @param signal The signal type to send.
* @return True if the process has been ended.
*/
static bool KillWait(pid_t &pid, int signal)
{
/* First try to stop for about a second;
* 1 seconds = 1000 milliseconds, 50 ms per cycle => 20 cycles. */
for (int i = 0; i < 20; i++) {
kill(pid, signal);
if (waitpid(pid, nullptr, WNOHANG) == pid) {
/* It has shut down, so we are done */
pid = -1;
return true;
}
/* Wait 50 milliseconds. */
CSleep(50);
}
return false;
}
void MusicDriver_ExtMidi::DoStop()
{
if (this->pid <= 0) return;
/* First try to gracefully stop for about five seconds;
* 5 seconds = 5000 milliseconds, 10 ms per cycle => 500 cycles. */
for (int i = 0; i < 500; i++) {
kill(this->pid, SIGTERM);
if (waitpid(this->pid, nullptr, WNOHANG) == this->pid) {
/* It has shut down, so we are done */
this->pid = -1;
return;
}
/* Wait 10 milliseconds. */
CSleep(10);
}
if (KillWait(this->pid, SIGINT)) return;
if (KillWait(this->pid, SIGTERM)) return;
Debug(driver, 0, "extmidi: gracefully stopping failed, trying the hard way");
/* Gracefully stopping failed. Do it the hard way