hrev49503 adds 5 changesets to branch 'master'
old head: 8982293017b132c73aff734fa8baa7afd261e125
new head: 7771139cdf652d3712c0b96b8e9e2dda6db6191e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=7771139cdf65+%5E8982293017b1
----------------------------------------------------------------------------
75b9de169f3c: MediaDefs: Fix percentage in when notifying the system
* Use TRACE instead of PRINT.
313ed73b5052: 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.
7e74eb0f42d1: MediaPlayer VideoProducer: Flush event on stop
8ecc32df1138: BBufferProducer: Returning B_ERROR hang up things
7771139cdf65: BMediaEventLooper: Rewrite ControlLoop()
* The first problem was the O(n^2) complexity of the algorithm, it's
now linear and try to act in a circular way by dispatching
events and reading the port in a balanced way. This exclude
a certain degree of possible deadlocks.
* Add detection and escape when the system try to kill the
thread. This solve some blocking issues on exit et similia
that i had with libjackcompat.
* The algorithm choose soon which event to focus on.
* Lateness is calculated just before the event is dispatched
as it is the more appropriate place, otherwise we would be
calculating something imprecise/guessed.
* Remove timed_event_queue::queued_time. It's more precise to
just use the RealTime() before to Dispatch the event.
* It should solve the BSoundPlayer lateness problems.
* With those improvements the media_kit is not going to lock
completely under stress conditions, instead it try to work
in a best effort shape.
* There's still room for improvements, for example i'm considering some
strategies in lateness situations such as update scheduling latency,
try to decrease waiting time and detect when we are too early on
the other hand to recover when the load go down.
* Thanks to Julian Harnath for sharing his WIP patch which helped
with some controls such as avoiding negative lateness.
* Comments are welcome!
[ Dario Casalinuovo <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
7 files changed, 74 insertions(+), 75 deletions(-)
headers/os/media/TimedEventQueue.h | 3 +-
.../media_node_framework/video/VideoProducer.cpp | 5 +
src/kits/media/BufferProducer.cpp | 2 +-
src/kits/media/MediaDefs.cpp | 10 +-
src/kits/media/MediaEventLooper.cpp | 120 ++++++++++---------
src/kits/media/TimedEventQueuePrivate.cpp | 2 -
src/servers/media/media_server.cpp | 7 --
############################################################################
Commit: 75b9de169f3cd4aa9a35e12f92f347a534398476
URL: http://cgit.haiku-os.org/haiku/commit/?id=75b9de169f3c
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sun Aug 2 23:05:12 2015 UTC
MediaDefs: Fix percentage in when notifying the system
* Use TRACE instead of PRINT.
----------------------------------------------------------------------------
diff --git a/src/kits/media/MediaDefs.cpp b/src/kits/media/MediaDefs.cpp
index cd6e95a..614e89f 100644
--- a/src/kits/media/MediaDefs.cpp
+++ b/src/kits/media/MediaDefs.cpp
@@ -1261,7 +1261,7 @@ progress_shutdown(int stage,
// parameter "message" is no longer used. It is kept for compatibility
with
// BeOS as this is used as a shutdown_media_server callback.
- PRINT(("stage : %i\n", stage));
+ TRACE("stage : %i\n", stage);
const char* string = "Unknown stage";
switch (stage) {
case 10:
@@ -1285,7 +1285,7 @@ progress_shutdown(int stage,
}
if (progress == NULL)
- notify_system(stage, string);
+ notify_system(stage/100.0f, string);
else
progress(stage, string, cookie);
}
@@ -1365,14 +1365,14 @@ progress_startup(int stage,
// parameter "message" is no longer used. It is kept for compatibility
with
// BeOS as this is used as a shutdown_media_server callback.
- PRINT(("stage : %i\n", stage));
+ TRACE("stage : %i\n", stage);
const char* string = "Unknown stage";
switch (stage) {
case 10:
string = B_TRANSLATE("Stopping media server"
B_UTF8_ELLIPSIS);
break;
case 20:
- string = B_TRANSLATE("Telling media_addon_server to
quit.");
+ string = B_TRANSLATE("Stopping media_addon_server.");
break;
case 50:
string = B_TRANSLATE("Starting media_services.");
@@ -1386,7 +1386,7 @@ progress_startup(int stage,
}
if (progress == NULL)
- notify_system(stage, string);
+ notify_system(stage/100.0f, string);
else
progress(stage, string, cookie);
}
############################################################################
Commit: 313ed73b5052aa56878487ee050095659542b1dd
URL: http://cgit.haiku-os.org/haiku/commit/?id=313ed73b5052
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sat Aug 1 12:08:44 2015 UTC
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.
----------------------------------------------------------------------------
diff --git a/src/servers/media/media_server.cpp
b/src/servers/media/media_server.cpp
index 6fd937f..241c114 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);
}
############################################################################
Commit: 7e74eb0f42d1c18b16dca999fbd4fd750a12cebb
URL: http://cgit.haiku-os.org/haiku/commit/?id=7e74eb0f42d1
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sun Aug 2 18:46:34 2015 UTC
MediaPlayer VideoProducer: Flush event on stop
----------------------------------------------------------------------------
diff --git a/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
b/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
index 6423860..774dfc3 100644
--- a/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
+++ b/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
@@ -170,8 +170,13 @@ VideoProducer::HandleEvent(const media_timed_event* event,
_HandleStart(event->event_time);
break;
case BTimedEventQueue::B_STOP:
+ {
+ EventQueue()->FlushEvents(event->event_time,
+ BTimedEventQueue::B_ALWAYS,
+ true, BTimedEventQueue::B_HANDLE_BUFFER);
_HandleStop();
break;
+ }
case BTimedEventQueue::B_WARP:
_HandleTimeWarp(event->bigdata);
break;
############################################################################
Commit: 8ecc32df1138c4468af5abdfd07a5bcb528a312e
URL: http://cgit.haiku-os.org/haiku/commit/?id=8ecc32df1138
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sun Aug 2 22:56:18 2015 UTC
BBufferProducer: Returning B_ERROR hang up things
----------------------------------------------------------------------------
diff --git a/src/kits/media/BufferProducer.cpp
b/src/kits/media/BufferProducer.cpp
index 2540a23..3358a7b 100644
--- a/src/kits/media/BufferProducer.cpp
+++ b/src/kits/media/BufferProducer.cpp
@@ -275,7 +275,7 @@ BBufferProducer::HandleMessage(int32 message, const void*
data, size_t size)
ERROR("BBufferProducer::HandleMessage
PRODUCER_SET_BUFFER_GROUP"
" group InitCheck() failed.\n");
delete group;
- return B_ERROR;
+ return B_OK;
}
status_t status = SetBufferGroup(command->source,
group);
if (command->destination == media_destination::null)
############################################################################
Revision: hrev49503
Commit: 7771139cdf652d3712c0b96b8e9e2dda6db6191e
URL: http://cgit.haiku-os.org/haiku/commit/?id=7771139cdf65
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Sun Aug 2 23:35:09 2015 UTC
BMediaEventLooper: Rewrite ControlLoop()
* The first problem was the O(n^2) complexity of the algorithm, it's
now linear and try to act in a circular way by dispatching
events and reading the port in a balanced way. This exclude
a certain degree of possible deadlocks.
* Add detection and escape when the system try to kill the
thread. This solve some blocking issues on exit et similia
that i had with libjackcompat.
* The algorithm choose soon which event to focus on.
* Lateness is calculated just before the event is dispatched
as it is the more appropriate place, otherwise we would be
calculating something imprecise/guessed.
* Remove timed_event_queue::queued_time. It's more precise to
just use the RealTime() before to Dispatch the event.
* It should solve the BSoundPlayer lateness problems.
* With those improvements the media_kit is not going to lock
completely under stress conditions, instead it try to work
in a best effort shape.
* There's still room for improvements, for example i'm considering some
strategies in lateness situations such as update scheduling latency,
try to decrease waiting time and detect when we are too early on
the other hand to recover when the load go down.
* Thanks to Julian Harnath for sharing his WIP patch which helped
with some controls such as avoiding negative lateness.
* Comments are welcome!
----------------------------------------------------------------------------
diff --git a/headers/os/media/TimedEventQueue.h
b/headers/os/media/TimedEventQueue.h
index 190a792..732fd17 100644
--- a/headers/os/media/TimedEventQueue.h
+++ b/headers/os/media/TimedEventQueue.h
@@ -38,9 +38,8 @@ struct media_timed_event {
int32 data;
int64 bigdata;
char user_data[64];
- bigtime_t queued_time; // Real
time when put in queue
- uint32
_reserved_media_timed_event_[6];
+ uint32
_reserved_media_timed_event_[8];
};
diff --git a/src/kits/media/MediaEventLooper.cpp
b/src/kits/media/MediaEventLooper.cpp
index 0ce44f5..d072bc3 100644
--- a/src/kits/media/MediaEventLooper.cpp
+++ b/src/kits/media/MediaEventLooper.cpp
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2015 Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
* Copyright (c) 2002, 2003 Marcus Overhagen <Marcus@xxxxxxxxxxxx>
*
* Permission is hereby granted, free of charge, to any person obtaining
@@ -212,68 +213,71 @@ BMediaEventLooper::ControlLoop()
{
CALLED();
- bool is_realtime = false;
status_t err;
- bigtime_t latency;
- bigtime_t waituntil;
- bigtime_t lateness;
- for (;;) {
- // while there are no events or it is not time for the earliest
event,
- // process messages using WaitForMessages. Whenever this
funtion times out,
- // we need to handle the next event
- for (;;) {
- if (RunState() == B_QUITTING)
- return;
- // BMediaEventLooper compensates your performance time
by adding the event latency
- // (see SetEventLatency()) and the scheduling latency
(or, for real-time events,
- // only the scheduling latency).
-
- latency = fEventLatency + fSchedulingLatency;
- waituntil = B_INFINITE_TIMEOUT;
- if (fEventQueue.HasEvents()) {
- const media_timed_event *firstEvent =
fEventQueue.FirstEvent();
- waituntil =
TimeSource()->RealTimeFor(firstEvent->event_time, latency);
- is_realtime = false;
- lateness = firstEvent->queued_time - waituntil;
- if (lateness > 0) {
-// if (lateness > 1000)
-// printf("node %02ld handling
%12Ld at %12Ld -- %Ld late, queued at %Ld now %12Ld \n",
-// ID(),
fEventQueue.FirstEventTime(), TimeSource()->Now(), lateness,
-//
firstEvent->queued_time, TimeSource()->RealTime());
- is_realtime = false;
- break;
- }
-// printf("node %02ld waiting for %12Ld that will
happen at %12Ld\n", ID(), fEventQueue.FirstEventTime(), waituntil);
- }
- if (fRealTimeQueue.HasEvents()) {
- const media_timed_event *firstEvent =
fRealTimeQueue.FirstEvent();
- bigtime_t temp;
- temp = firstEvent->event_time -
fSchedulingLatency;
- lateness = firstEvent->queued_time - temp;
- if (lateness > 0) {
- is_realtime = true;
- break;
- }
- if (temp < waituntil) {
- waituntil = temp;
- is_realtime = true;
- }
- }
- lateness = 0; // remove any extraneous value if we
get this far
- err = WaitForMessage(waituntil);
- if (err == B_TIMED_OUT)
- break;
+ bigtime_t waitUntil = 0;
+ bigtime_t lateness = 0;
+ bool hasRealtime = false;
+ bool hasEvent = false;
+
+ // While there are no events or it is not time for the earliest event,
+ // process messages using WaitForMessages. Whenever this funtion times
out,
+ // we need to handle the next event
+
+ fSchedulingLatency = estimate_max_scheduling_latency(fControlThread);
+ while (true) {
+ if (RunState() == B_QUITTING)
+ return;
+
+ // BMediaEventLooper compensates your performance time by adding
+ // the event latency (see SetEventLatency()) and the scheduling
+ // latency (or, for real-time events, only the scheduling
latency).
+
+ waitUntil = B_INFINITE_TIMEOUT;
+ hasRealtime = fRealTimeQueue.HasEvents();
+ hasEvent = fEventQueue.HasEvents();
+
+ if (hasEvent) {
+ waitUntil = TimeSource()->RealTimeFor(
+ fEventQueue.FirstEvent()->event_time,
+ fEventLatency + fSchedulingLatency);
+ lateness = waitUntil;
+ } else if (!hasEvent && !hasRealtime)
+ goto ahead;
+
+ if (hasEvent && hasRealtime) {
+ if (fRealTimeQueue.FirstEventTime()
+ - fSchedulingLatency <= waitUntil) {
+ hasEvent = false;
+ } else
+ hasRealtime = false;
}
- /// we have timed out - so handle the next event
- media_timed_event event;
- if (is_realtime)
- err = fRealTimeQueue.RemoveFirstEvent(&event);
- else
- err = fEventQueue.RemoveFirstEvent(&event);
-// printf("node %02ld handling %12Ld at %12Ld\n", ID(),
event.event_time, TimeSource()->Now());
+ if (hasRealtime) {
+ waitUntil = fRealTimeQueue.FirstEventTime()
+ - fSchedulingLatency;
+ lateness = waitUntil;
+ }
- if (err == B_OK) DispatchEvent(&event, lateness, is_realtime);
+ if (waitUntil <= TimeSource()->RealTime())
+ waitUntil = 0;
+
+ahead:
+ err = WaitForMessage(waitUntil);
+ if (err == B_TIMED_OUT) {
+ media_timed_event event;
+ if (hasEvent)
+ err = fEventQueue.RemoveFirstEvent(&event);
+ else
+ err = fRealTimeQueue.RemoveFirstEvent(&event);
+
+ if (err == B_OK) {
+ lateness -= TimeSource()->RealTime();
+ if (lateness < 0)
+ lateness = 0;
+ DispatchEvent(&event, lateness, hasRealtime);
+ }
+ } else if (err != B_OK)
+ return;
}
}
diff --git a/src/kits/media/TimedEventQueuePrivate.cpp
b/src/kits/media/TimedEventQueuePrivate.cpp
index 3cc337c..6b5be4d 100644
--- a/src/kits/media/TimedEventQueuePrivate.cpp
+++ b/src/kits/media/TimedEventQueuePrivate.cpp
@@ -78,8 +78,6 @@ _event_queue_imp::AddEvent(const media_timed_event &event)
return B_BAD_VALUE;
}
- *(bigtime_t *)&event.queued_time = BTimeSource::RealTime();
-
//create a new queue
if (fFirstEntry == NULL) {
ASSERT(fEventCount == 0);
