From 313ed73b5052aa56878487ee050095659542b1dd Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Sat, 1 Aug 2015 14:08:44 +0200 Subject: [PATCH] Revert "media_server: Fix deadlock when killing from ProcessController" This reverts commit 5934b30b95a239eee4a088a9b9cb425eef13f22d. * 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. --- src/servers/media/media_server.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/servers/media/media_server.cpp b/src/servers/media/media_server.cpp index 6fd937f276..241c1148e5 100644 --- a/src/servers/media/media_server.cpp +++ b/src/servers/media/media_server.cpp @@ -918,13 +918,6 @@ ServerApp::_ControlThread(void* _server) int32 code; while ((size = read_port_etc(server->_ControlPort(), &code, data, 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); }