derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemc: Use the eq pointer directly less often in the scheduler.

Browse Source 
This takes advantage of the utility functions that exist a little
better, and also avoids accidentally asymetrically using
eventsToSchedule and eq->(de)schedule.

Change-Id: I1eb1c228d47684cccb9deaf6f3409b77cfbad4cd
Reviewed-on: https://gem5-review.googlesource.com/12260
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-08-22 23:51:16 -07:00
parent dd8b71b413
commit 33341f42eb
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/systemc/core/scheduler.cc
View File

@@ -70,21 +70,21 @@ Scheduler::clear()
TimeSlot *&ts = tsp.second;
for (auto &e: ts->events)
e->deschedule();
eq->deschedule(ts);
deschedule(ts);
}
timeSlots.clear();
// gem5 events.
if (readyEvent.scheduled())
eq->deschedule(&readyEvent);
deschedule(&readyEvent);
if (pauseEvent.scheduled())
eq->deschedule(&pauseEvent);
deschedule(&pauseEvent);
if (stopEvent.scheduled())
eq->deschedule(&stopEvent);
deschedule(&stopEvent);
if (starvationEvent.scheduled())
eq->deschedule(&starvationEvent);
deschedule(&starvationEvent);
if (maxTickEvent.scheduled())
eq->deschedule(&maxTickEvent);
deschedule(&maxTickEvent);
Process *p;
while ((p = toFinalize.getNext()))
@@ -312,13 +312,13 @@ Scheduler::start(Tick max_tick, bool run_to_time)
Fiber::primaryFiber()->run();
if (pauseEvent.scheduled())
eq->deschedule(&pauseEvent);
deschedule(&pauseEvent);
if (stopEvent.scheduled())
eq->deschedule(&stopEvent);
deschedule(&stopEvent);
if (maxTickEvent.scheduled())
eq->deschedule(&maxTickEvent);
deschedule(&maxTickEvent);
if (starvationEvent.scheduled())
eq->deschedule(&starvationEvent);
deschedule(&starvationEvent);
}
void
@@ -334,7 +334,7 @@ Scheduler::schedulePause()
if (pauseEvent.scheduled())
return;
eq->schedule(&pauseEvent, eq->getCurTick());
schedule(&pauseEvent);
}
void
@@ -348,7 +348,7 @@ Scheduler::scheduleStop(bool finish_delta)
// pending activity.
clear();
}
eq->schedule(&stopEvent, eq->getCurTick());
schedule(&stopEvent);
}
Scheduler scheduler;