Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BMediaEventLooper::ControlLoop: Review style/logic, no functional change

Browse Source 
* The code is just reversed to be better organized.
* Since the first event will be handled after a port write, at thread
  spawn we just wait with infinite timeout for new messages.
* Remove goto which then become a continue.
* This permitted to remove the double waitUntil assignment which
  was in different braces.
* lateness var become tempLateness, so it become more obvious than
  before that it's a cached value and we are doing this to avoid
  double calculus.
This commit is contained in:
Dario Casalinuovo 2015-08-04 12:02:00 +02:00
parent 2ffa9f8e54
commit b0ed323924
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/kits/media/MediaEventLooper.cpp
View File

@ -214,8 +214,8 @@ BMediaEventLooper::ControlLoop()
CALLED();
status_t err;
bigtime_t waitUntil = 0;
bigtime_t lateness = 0;
bigtime_t waitUntil = B_INFINITE_TIMEOUT;
bigtime_t tempLateness = 0;
bool hasRealtime = false;
bool hasEvent = false;
@ -228,11 +228,28 @@ BMediaEventLooper::ControlLoop()
if (RunState() == B_QUITTING)
return;
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) {
tempLateness -= TimeSource()->RealTime();
if (tempLateness < 0)
tempLateness = 0;
DispatchEvent(&event, tempLateness, hasRealtime);
}
} else if (err != B_OK)
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();
@ -240,9 +257,10 @@ BMediaEventLooper::ControlLoop()
waitUntil = TimeSource()->RealTimeFor(
fEventQueue.FirstEvent()->event_time,
fEventLatency + fSchedulingLatency);
lateness = waitUntil;
} else if (!hasEvent && !hasRealtime)
goto ahead;
} else if (!hasRealtime) {
waitUntil = B_INFINITE_TIMEOUT;
continue;
}
if (hasEvent && hasRealtime) {
if (fRealTimeQueue.FirstEventTime()
@ -255,29 +273,11 @@ BMediaEventLooper::ControlLoop()
if (hasRealtime) {
waitUntil = fRealTimeQueue.FirstEventTime()
- fSchedulingLatency;
lateness = waitUntil;
}
if (waitUntil <= TimeSource()->RealTime())
tempLateness = waitUntil;
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;
}
}