From 743a1b5cdd8e607f2e1bb5ad182047c512eae3f8 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 18 Jul 2018 20:59:56 -0700 Subject: systemc: Implement pending activity related functions Track the number of notifications/timeouts that are scheduled at any given time. This lets us implement sc_pending_activity_at_current_time, sc_pending_activity_at_future_time, and sc_time_to_pending_activity. Change-Id: Ia3fcd29bdbfe1a6c77eb52ce4836982d4705263c Reviewed-on: https://gem5-review.googlesource.com/12032 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/event.cc | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/systemc/core/event.cc') diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc index 5008074f6..1623cf9e8 100644 --- a/src/systemc/core/event.cc +++ b/src/systemc/core/event.cc @@ -43,7 +43,7 @@ namespace sc_gem5 Event::Event(sc_core::sc_event *_sc_event) : Event(_sc_event, "") {} Event::Event(sc_core::sc_event *_sc_event, const char *_basename) : - _sc_event(_sc_event), _basename(_basename), delayedNotify(this) + _sc_event(_sc_event), _basename(_basename), delayedNotifyEvent(this) { Module *p = currentModule(); @@ -120,29 +120,35 @@ Event::notify() s->notify(this); } +void +Event::delayedNotify() +{ + scheduler.eventHappened(); + notify(); +} + void Event::notify(const sc_core::sc_time &t) { //XXX We're assuming the systemc time resolution is in ps. - Tick new_tick = t.value() * SimClock::Int::ps + - scheduler.eventQueue().getCurTick(); - if (delayedNotify.scheduled()) { - Tick old_tick = delayedNotify.when(); + Tick new_tick = t.value() * SimClock::Int::ps + scheduler.getCurTick(); + if (delayedNotifyEvent.scheduled()) { + Tick old_tick = delayedNotifyEvent.when(); if (new_tick >= old_tick) return; - scheduler.eventQueue().deschedule(&delayedNotify); + scheduler.deschedule(&delayedNotifyEvent); } - scheduler.eventQueue().schedule(&delayedNotify, new_tick); + scheduler.schedule(&delayedNotifyEvent, new_tick); } void Event::cancel() { - if (delayedNotify.scheduled()) - scheduler.eventQueue().deschedule(&delayedNotify); + if (delayedNotifyEvent.scheduled()) + scheduler.deschedule(&delayedNotifyEvent); } bool -- cgit v1.2.3