[gem5-dev] Change in gem5/gem5[master]: systemc: Use the eq pointer directly less often in the scheduler.

[Gabe Black (Gerrit)]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/12260

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

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

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
---
M src/systemc/core/scheduler.cc
1 file changed, 12 insertions(+), 12 deletions(-)



diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index 58c7956..2dc3aa7 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -70,21 +70,21 @@
         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 @@
     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 @@
     if (pauseEvent.scheduled())
         return;

-    eq->schedule(&pauseEvent, eq->getCurTick());
+    schedule(&pauseEvent);
 }

 void
@@ -348,7 +348,7 @@
         // pending activity.
         clear();
     }
-    eq->schedule(&stopEvent, eq->getCurTick());
+    schedule(&stopEvent);
 }

 Scheduler scheduler;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12260
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I1eb1c228d47684cccb9deaf6f3409b77cfbad4cd
Gerrit-Change-Number: 12260
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev