6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Withdraws advance_to_next; once it has to cope with simultaneous events it stops being faster than advance.

Browse Source 
I could possibly try to deal with those at insertion time, but it'd get messy.
This commit is contained in:
Thomas Harte 2020-01-29 22:45:10 -05:00
parent f0a6e0f3d5
commit ee16095863
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ClockReceiver/DeferredQueue.hpp
View File

@ -22,7 +22,7 @@ template <typename TimeUnit> class DeferredQueue {
*/ */
void defer(TimeUnit delay, const std::function<void(void)> &action) { void defer(TimeUnit delay, const std::function<void(void)> &action) {
// Apply immediately if there's no delay (or a negative delay). // Apply immediately if there's no delay (or a negative delay).
if(delay <= 0) { if(delay <= TimeUnit(0)) {
action(); action();
return; return;
} }
@ -74,20 +74,6 @@ template <typename TimeUnit> class DeferredQueue {
} }
} }
/*!
Advances the queue by @c min(time_until_next_action(),duration) time.
*/
void advance_to_next(TimeUnit duration) {
if(pending_actions_.empty()) return;
auto front = pending_actions_.front();
front.delay -= duration;
if(front.delay <= TimeUnit(0)) {
front.action();
pending_actions_.erase(pending_actions_.begin());
}
}
private: private:
// The list of deferred actions. // The list of deferred actions.
struct DeferredAction { struct DeferredAction {
@ -122,11 +108,13 @@ template <typename TimeUnit> class DeferredQueuePerformer: public DeferredQueue<
while(time_to_next != TimeUnit(-1) && time_to_next <= length) { while(time_to_next != TimeUnit(-1) && time_to_next <= length) {
target_(time_to_next); target_(time_to_next);
length -= time_to_next; length -= time_to_next;
DeferredQueue<TimeUnit>::advance_to_next(time_to_next); DeferredQueue<TimeUnit>::advance(time_to_next);
} }
DeferredQueue<TimeUnit>::advance_to_next(length); DeferredQueue<TimeUnit>::advance(length);
target_(length); target_(length);
// TODO: optimise this to avoid the multiple std::vector deletes. Find a neat way to expose that solution, maybe?
} }
private: private: