From b9ddc1a7262abe747eaf77118c2c6992617d4e91 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 10 Jan 2011 11:11:17 -0800
Subject: [PATCH] stats: fix stat test from curTick change

---
 src/unittest/stattest.cc | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 0c9a07c00..b676ed9bd 100644
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -38,6 +38,7 @@
 #include "base/stats/text.hh"
 #include "base/stats/mysql.hh"
 #include "base/types.hh"
+#include "sim/core.hh"
 #include "sim/stat_control.hh"
 
 using namespace std;
@@ -332,7 +333,7 @@ main(int argc, char *argv[])
     s15[9].sample(1234);
 
     s10.sample(1000000000);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s10.sample(100000);
     s10.sample(100000);
     s10.sample(100000);
@@ -407,50 +408,50 @@ main(int argc, char *argv[])
 
     s15[0].sample(1234);
     s15[1].sample(4134);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[4].sample(1213);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[3].sample(1124);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[2].sample(1243);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[7].sample(1244);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[4].sample(7234);
     s15[2].sample(9234);
     s15[3].sample(1764);
     s15[7].sample(1564);
     s15[3].sample(3234);
     s15[1].sample(2234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[5].sample(1234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[9].sample(4334);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[2].sample(1234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[4].sample(4334);
     s15[6].sample(1234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[8].sample(8734);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[1].sample(5234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[3].sample(8234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[7].sample(5234);
     s15[4].sample(4434);
     s15[3].sample(7234);
     s15[2].sample(1934);
     s15[1].sample(9234);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[5].sample(5634);
     s15[3].sample(1264);
     s15[7].sample(5223);
     s15[0].sample(1234);
     s15[0].sample(5434);
     s15[3].sample(8634);
-    curTick() += ULL(1000000);
+    curTick(curTick() + ULL(1000000));
     s15[1].sample(1234);
 
     s4 = curTick();
@@ -459,7 +460,7 @@ main(int argc, char *argv[])
 
     s3 = 12;
     s3++;
-    curTick() += 9;
+    curTick(curTick() + 9);
 
     s1 = 9;
     s1 += 9;
@@ -534,7 +535,7 @@ main(int argc, char *argv[])
     s9.sample(10);
     s9.sample(10);
 
-    curTick() += 9;
+    curTick(curTick() + 9);
     s4 = curTick();
     s6.sample(100);
     s6.sample(100);