i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "media_server: Fix deadlock when killing from ProcessController"

Browse Source 
This reverts commit 5934b30b95.

* It got the way of an heisenbug and it seems this change
  fixed the problems, but after 2 days the media_server returned
  to block. Sorry about that! Will investigate further.
This commit is contained in:
Dario Casalinuovo
2015-08-03 01:19:28 +02:00
parent 75b9de169f
commit 313ed73b50
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/media/media_server.cpp
-7
View File
@@ -918,13 +918,6 @@ ServerApp::_ControlThread(void* _server)
int32 code; int32 code;
while ((size = read_port_etc(server->_ControlPort(), &code, data, while ((size = read_port_etc(server->_ControlPort(), &code, data,
sizeof(data), 0, 0)) > 0) { sizeof(data), 0, 0)) > 0) {
// NOTE: This prevents locks in Deskbar and
// possibly in other situations.
if (size == B_WOULD_BLOCK) {
snooze(100);
continue;
}
server->_HandleMessage(code, data, size); server->_HandleMessage(code, data, size);
} }