stats: Fix swig wrapping for Tick in stats

Tick was not correctly wrapped for the stats system, and therefore it was not
possible to configure the stats dumping from the python scripts without
defining Ticks as long long. This patch fixes the wrapping of Tick by copying
the typemap of uint64_t to Tick.

diff --git a/src/python/swig/stats.i b/src/python/swig/stats.i
index 46395eb22bfbf27908767b9adfcf8a94c9f9f44b..3bdd2c9aae19a9fddb0486f32795700910537558 100644 (file)
--- a/src/python/swig/stats.i
+++ b/src/python/swig/stats.i
@@ -123,6 +123,7 @@ reset()
 %ignore Stats::Info::flags;
 
 %import  "base/stats/types.hh"
+%import  "base/types.hh"
 
 %include "base/stats/info.hh"
 %include "base/stats/output.hh"
@@ -152,7 +153,7 @@ Output *initText(const std::string &filename, bool desc);
 void schedStatEvent(bool dump, bool reset,
                     Tick when = curTick(), Tick repeat = 0);
 
-void periodicStatDump(long long period = 0);
+void periodicStatDump(Tick period = 0);
 
 void updateEvents();
 

diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index 2b47ded8d5e4a2305cfb50b75f60e070a4898e6d..715bb54aa5d8c5bc02fc018ff9765112ddc374b2 100644 (file)
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -253,7 +253,7 @@ schedStatEvent(bool dump, bool reset, Tick when, Tick repeat)
 }
 
 void
-periodicStatDump(uint64_t period)
+periodicStatDump(Tick period)
 {
     /*
      * If the period is set to 0, then we do not want to dump periodically,

diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 9731d87cfc3dd2b90f8638698e94d232a1c7c272..1a0fcb35b38b85bbb8640b2573f7cbecf2720d46 100644 (file)
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -74,7 +74,7 @@ void schedStatEvent(bool dump, bool reset, Tick when = curTick(),
  * temporal trends in the data.
  * @param period The period at which the dumping should occur.
  */
-void periodicStatDump(uint64_t period = 0);
+void periodicStatDump(Tick period = 0);
 } // namespace Stats
 
 #endif // __SIM_STAT_CONTROL_HH__