diff options
| -rw-r--r-- | src/sim/ticked_object.cc | 7 | ||||
| -rw-r--r-- | src/sim/ticked_object.hh | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/sim/ticked_object.cc b/src/sim/ticked_object.cc index 4cd0dc171..a9f3aceb7 100644 --- a/src/sim/ticked_object.cc +++ b/src/sim/ticked_object.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 ARM Limited + * Copyright (c) 2013-2014, 2017 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -60,7 +60,7 @@ Ticked::regStats() { if (numCyclesLocal) { numCycles - .name(object.name() + ".tickCycles") + .name(object.name() + ".totalTickCycles") .desc("Number of cycles that the object ticked or was stopped"); } @@ -98,7 +98,7 @@ Ticked::unserialize(CheckpointIn &cp) lastStopped = Cycles(lastStoppedUint); } -TickedObject::TickedObject(TickedObjectParams *params, +TickedObject::TickedObject(const TickedObjectParams *params, Event::Priority priority) : ClockedObject(params), /* Make numCycles in Ticked */ @@ -109,6 +109,7 @@ void TickedObject::regStats() { Ticked::regStats(); + ClockedObject::regStats(); } void diff --git a/src/sim/ticked_object.hh b/src/sim/ticked_object.hh index d8b69a320..3ba0045fc 100644 --- a/src/sim/ticked_object.hh +++ b/src/sim/ticked_object.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 ARM Limited + * Copyright (c) 2013-2014, 2017 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -190,7 +190,7 @@ class Ticked : public Serializable class TickedObject : public ClockedObject, public Ticked { public: - TickedObject(TickedObjectParams *params, + TickedObject(const TickedObjectParams *params, Event::Priority priority = Event::CPU_Tick_Pri); /** Disambiguate to make these functions overload correctly */ |