From 6f1187943cf78c2fd0334bd7e4372ae79a587fa4 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 7 Jan 2011 21:50:29 -0800 Subject: Replace curTick global variable with accessor functions. This step makes it easy to replace the accessor functions (which still access a global variable) with ones that access per-thread curTick values. --- src/sim/serialize.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/sim/serialize.cc') diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc index aa343d0e9..b050027e2 100644 --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -400,7 +400,7 @@ void Globals::serialize(ostream &os) { nameOut(os); - SERIALIZE_SCALAR(curTick); + SERIALIZE_SCALAR(curTick()); nameOut(os, "MainEventQueue"); mainEventQueue.serialize(os); @@ -410,7 +410,9 @@ void Globals::unserialize(Checkpoint *cp) { const string §ion = name(); - UNSERIALIZE_SCALAR(curTick); + Tick tick; + paramIn(cp, section, "curTick", tick); + curTick(tick); mainEventQueue.unserialize(cp, "MainEventQueue"); } @@ -533,10 +535,10 @@ string Checkpoint::currentDirectory; string Checkpoint::setDir(const string &name) { - // use csprintf to insert curTick into directory name if it + // use csprintf to insert curTick() into directory name if it // appears to have a format placeholder in it. currentDirectory = (name.find("%") != string::npos) ? - csprintf(name, curTick) : name; + csprintf(name, curTick()) : name; if (currentDirectory[currentDirectory.size() - 1] != '/') currentDirectory += "/"; return currentDirectory; -- cgit v1.2.3