Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/29409 )
Change subject: sim,mem,dev: Merge eventq_impl.hh into eventq.hh.
......................................................................
sim,mem,dev: Merge eventq_impl.hh into eventq.hh.
Having some methods (which are supposed to be inline) defined in another
file which is only included sometimes creates a lot of opportunities for
errors. They no longer need to be separate, so merge them together.
Change-Id: I5846e55f53f59b9c2081680a6441659265a765f7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29409
Maintainer: Gabe Black <[email protected]>
Reviewed-by: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/dev/intel_8254_timer.hh
M src/dev/mc146818.hh
M src/mem/packet_queue.hh
M src/sim/debug.cc
M src/sim/dvfs_handler.cc
M src/sim/eventq.cc
M src/sim/eventq.hh
D src/sim/eventq_impl.hh
M src/sim/global_event.hh
M src/sim/root.cc
M src/sim/sim_events.cc
M src/sim/sim_object.hh
M src/sim/simulate.cc
13 files changed, 78 insertions(+), 119 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index 15e0e61..2279457 100644
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -36,7 +36,7 @@
#include "base/types.hh"
#include "base/trace.hh"
#include "debug/Intel8254Timer.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
#include "sim/serialize.hh"
/** Programmable Interval Timer (Intel 8254) */
diff --git a/src/dev/mc146818.hh b/src/dev/mc146818.hh
index 0ed5636..038141b 100644
--- a/src/dev/mc146818.hh
+++ b/src/dev/mc146818.hh
@@ -32,7 +32,7 @@
#include "base/bitunion.hh"
#include "base/logging.hh"
#include "sim/core.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
/** Real-Time Clock (MC146818) */
class MC146818 : public EventManager
diff --git a/src/mem/packet_queue.hh b/src/mem/packet_queue.hh
index 71670e4..a50c858 100644
--- a/src/mem/packet_queue.hh
+++ b/src/mem/packet_queue.hh
@@ -53,7 +53,7 @@
#include "mem/port.hh"
#include "sim/drain.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
/**
* A packet queue is a class that holds deferred packets and later
diff --git a/src/sim/debug.cc b/src/sim/debug.cc
index 484d4a6..b2b3d45 100644
--- a/src/sim/debug.cc
+++ b/src/sim/debug.cc
@@ -33,7 +33,7 @@
#include "base/debug.hh"
#include "cpu/pc_event.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
#include "sim/global_event.hh"
#include "sim/kernel_workload.hh"
#include "sim/sim_events.hh"
diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc
index 9c452ee..9591d8f 100644
--- a/src/sim/dvfs_handler.cc
+++ b/src/sim/dvfs_handler.cc
@@ -45,7 +45,7 @@
#include "debug/DVFS.hh"
#include "params/DVFSHandler.hh"
#include "sim/clock_domain.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
#include "sim/stat_control.hh"
#include "sim/voltage_domain.hh"
diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index 25131b3..bc4864c 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -28,6 +28,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "sim/eventq.hh"
+
#include <cassert>
#include <iostream>
#include <string>
@@ -39,7 +41,6 @@
#include "cpu/smt.hh"
#include "debug/Checkpoint.hh"
#include "sim/core.hh"
-#include "sim/eventq_impl.hh"
using namespace std;
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 522b394..ddba8bd 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -44,6 +44,7 @@
#include <mutex>
#include <string>
+#include "base/debug.hh"
#include "base/flags.hh"
#include "base/types.hh"
#include "debug/Event.hh"
@@ -750,14 +751,56 @@
*
* @ingroup api_eventq
*/
- void schedule(Event *event, Tick when, bool global = false);
+ void
+ schedule(Event *event, Tick when, bool global=false)
+ {
+ assert(when >= getCurTick());
+ assert(!event->scheduled());
+ assert(event->initialized());
+
+ event->setWhen(when, this);
+
+ // The check below is to make sure of two things
+ // a. A thread schedules local events on other queues through the
+ // asyncq.
+ // b. A thread schedules global events on the asyncq, whether or
not
+ // this event belongs to this eventq. This is required to
maintain
+ // a total order amongst the global events. See
global_event.{cc,hh}
+ // for more explanation.
+ if (inParallelMode && (this != curEventQueue() || global)) {
+ asyncInsert(event);
+ } else {
+ insert(event);
+ }
+ event->flags.set(Event::Scheduled);
+ event->acquire();
+
+ if (DTRACE(Event))
+ event->trace("scheduled");
+ }
/**
* Deschedule the specified event. Should be called only from the
owning
* thread.
* @ingroup api_eventq
*/
- void deschedule(Event *event);
+ void
+ deschedule(Event *event)
+ {
+ assert(event->scheduled());
+ assert(event->initialized());
+ assert(!inParallelMode || this == curEventQueue());
+
+ remove(event);
+
+ event->flags.clear(Event::Squashed);
+ event->flags.clear(Event::Scheduled);
+
+ if (DTRACE(Event))
+ event->trace("descheduled");
+
+ event->release();
+ }
/**
* Reschedule the specified event. Should be called only from the
owning
@@ -765,7 +808,28 @@
*
* @ingroup api_eventq
*/
- void reschedule(Event *event, Tick when, bool always = false);
+ void
+ reschedule(Event *event, Tick when, bool always=false)
+ {
+ assert(when >= getCurTick());
+ assert(always || event->scheduled());
+ assert(event->initialized());
+ assert(!inParallelMode || this == curEventQueue());
+
+ if (event->scheduled()) {
+ remove(event);
+ } else {
+ event->acquire();
+ }
+
+ event->setWhen(when, this);
+ insert(event);
+ event->flags.clear(Event::Squashed);
+ event->flags.set(Event::Scheduled);
+
+ if (DTRACE(Event))
+ event->trace("rescheduled");
+ }
Tick nextTick() const { return head->when(); }
void setCurTick(Tick newVal) { _curTick = newVal; }
diff --git a/src/sim/eventq_impl.hh b/src/sim/eventq_impl.hh
deleted file mode 100644
index 0e4f408..0000000
--- a/src/sim/eventq_impl.hh
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2012 The Regents of The University of Michigan
- * Copyright (c) 2012-2013 Mark D. Hill and David A. Wood
- * Copyright (c) 2013 Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SIM_EVENTQ_IMPL_HH__
-#define __SIM_EVENTQ_IMPL_HH__
-
-#include "base/debug.hh"
-#include "sim/eventq.hh"
-
-inline void
-EventQueue::schedule(Event *event, Tick when, bool global)
-{
- assert(when >= getCurTick());
- assert(!event->scheduled());
- assert(event->initialized());
-
- event->setWhen(when, this);
-
- // The check below is to make sure of two things
- // a. a thread schedules local events on other queues through the
asyncq
- // b. a thread schedules global events on the asyncq, whether or not
- // this event belongs to this eventq. This is required to maintain
- // a total order amongst the global events. See global_event.{cc,hh}
- // for more explanation.
- if (inParallelMode && (this != curEventQueue() || global)) {
- asyncInsert(event);
- } else {
- insert(event);
- }
- event->flags.set(Event::Scheduled);
- event->acquire();
-
- if (DTRACE(Event))
- event->trace("scheduled");
-}
-
-inline void
-EventQueue::deschedule(Event *event)
-{
- assert(event->scheduled());
- assert(event->initialized());
- assert(!inParallelMode || this == curEventQueue());
-
- remove(event);
-
- event->flags.clear(Event::Squashed);
- event->flags.clear(Event::Scheduled);
-
- if (DTRACE(Event))
- event->trace("descheduled");
-
- event->release();
-}
-
-inline void
-EventQueue::reschedule(Event *event, Tick when, bool always)
-{
- assert(when >= getCurTick());
- assert(always || event->scheduled());
- assert(event->initialized());
- assert(!inParallelMode || this == curEventQueue());
-
- if (event->scheduled()) {
- remove(event);
- } else {
- event->acquire();
- }
-
- event->setWhen(when, this);
- insert(event);
- event->flags.clear(Event::Squashed);
- event->flags.set(Event::Scheduled);
-
- if (DTRACE(Event))
- event->trace("rescheduled");
-}
-
-#endif // __SIM_EVENTQ_IMPL_HH__
diff --git a/src/sim/global_event.hh b/src/sim/global_event.hh
index 0dd4c1e..8e4254b 100644
--- a/src/sim/global_event.hh
+++ b/src/sim/global_event.hh
@@ -34,7 +34,7 @@
#include <vector>
#include "base/barrier.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
/**
* @file sim/global_event.hh
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 1c396dd..5a17442 100644
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@@ -31,7 +31,7 @@
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "debug/TimeSync.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
#include "sim/full_system.hh"
#include "sim/root.hh"
diff --git a/src/sim/sim_events.cc b/src/sim/sim_events.cc
index bcfa062..5888ea0 100644
--- a/src/sim/sim_events.cc
+++ b/src/sim/sim_events.cc
@@ -46,7 +46,7 @@
#include "base/callback.hh"
#include "base/hostinfo.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
#include "sim/sim_exit.hh"
#include "sim/stats.hh"
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh
index de89fbf..27f675c 100644
--- a/src/sim/sim_object.hh
+++ b/src/sim/sim_object.hh
@@ -53,7 +53,6 @@
#include "params/SimObject.hh"
#include "sim/drain.hh"
#include "sim/eventq.hh"
-#include "sim/eventq_impl.hh"
#include "sim/port.hh"
#include "sim/serialize.hh"
diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index 11efd9b..c0d1055 100644
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -37,7 +37,7 @@
#include "base/pollevent.hh"
#include "base/types.hh"
#include "sim/async.hh"
-#include "sim/eventq_impl.hh"
+#include "sim/eventq.hh"
#include "sim/sim_events.hh"
#include "sim/sim_exit.hh"
#include "sim/stat_control.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29409
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5846e55f53f59b9c2081680a6441659265a765f7
Gerrit-Change-Number: 29409
Gerrit-PatchSet: 5
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Bradford Beckmann <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
