}
+template <>
+void
+showParam(ostream &os, const signed char &value)
+{
+ os << (int)value;
+}
+
+
template <>
void
showParam(ostream &os, const unsigned char &value)
template <class T>
void
-paramOut(ostream &os, const std::string &name, const T ¶m)
+paramOut(ostream &os, const string &name, const T ¶m)
{
os << name << "=";
showParam(os, param);
os << "\n";
}
+template <class T>
+void
+arrayParamOut(ostream &os, const string &name, const vector<T> ¶m)
+{
+ typename vector<T>::size_type size = param.size();
+ os << name << "=";
+ if (size > 0)
+ showParam(os, param[0]);
+ for (typename vector<T>::size_type i = 1; i < size; ++i) {
+ os << " ";
+ showParam(os, param[i]);
+ }
+ os << "\n";
+}
+
template <class T>
void
-paramIn(Checkpoint *cp, const std::string §ion,
- const std::string &name, T ¶m)
+paramIn(Checkpoint *cp, const string §ion, const string &name, T ¶m)
{
- std::string str;
+ string str;
if (!cp->find(section, name, str) || !parseParam(str, param)) {
fatal("Can't unserialize '%s:%s'\n", section, name);
}
}
+template <class T>
+bool
+optParamIn(Checkpoint *cp, const string §ion, const string &name, T ¶m)
+{
+ string str;
+ if (!cp->find(section, name, str) || !parseParam(str, param)) {
+ warn("optional parameter %s:%s not present\n", section, name);
+ return false;
+ } else {
+ return true;
+ }
+}
template <class T>
void
-arrayParamOut(ostream &os, const std::string &name,
- const T *param, int size)
+arrayParamOut(ostream &os, const string &name, const T *param, unsigned size)
{
os << name << "=";
if (size > 0)
showParam(os, param[0]);
- for (int i = 1; i < size; ++i) {
+ for (unsigned i = 1; i < size; ++i) {
os << " ";
showParam(os, param[i]);
}
template <class T>
void
-arrayParamIn(Checkpoint *cp, const std::string §ion,
- const std::string &name, T *param, int size)
+arrayParamIn(Checkpoint *cp, const string §ion, const string &name,
+ T *param, unsigned size)
{
- std::string str;
+ string str;
if (!cp->find(section, name, str)) {
fatal("Can't unserialize '%s:%s'\n", section, name);
}
fatal("Array size mismatch on %s:%s'\n", section, name);
}
- for (int i = 0; i < tokens.size(); i++) {
+ for (vector<string>::size_type i = 0; i < tokens.size(); i++) {
// need to parse into local variable to handle vector<bool>,
// for which operator[] returns a special reference class
// that's not the same as 'bool&', (since it's a packed
// vector)
- T scalar_value;
+ T scalar_value = 0;
if (!parseParam(tokens[i], scalar_value)) {
string err("could not parse \"");
}
}
+template <class T>
+void
+arrayParamIn(Checkpoint *cp, const string §ion,
+ const string &name, vector<T> ¶m)
+{
+ string str;
+ if (!cp->find(section, name, str)) {
+ fatal("Can't unserialize '%s:%s'\n", section, name);
+ }
+
+ // code below stolen from VectorParam<T>::parse().
+ // it would be nice to unify these somehow...
+
+ vector<string> tokens;
+
+ tokenize(tokens, str, ' ');
+
+ // Need this if we were doing a vector
+ // value.resize(tokens.size());
+
+ param.resize(tokens.size());
+
+ for (vector<string>::size_type i = 0; i < tokens.size(); i++) {
+ // need to parse into local variable to handle vector<bool>,
+ // for which operator[] returns a special reference class
+ // that's not the same as 'bool&', (since it's a packed
+ // vector)
+ T scalar_value = 0;
+ if (!parseParam(tokens[i], scalar_value)) {
+ string err("could not parse \"");
+
+ err += str;
+ err += "\"";
+
+ fatal(err);
+ }
+
+ // assign parsed value to vector
+ param[i] = scalar_value;
+ }
+}
void
-objParamIn(Checkpoint *cp, const std::string §ion,
- const std::string &name, SimObject * ¶m)
+objParamIn(Checkpoint *cp, const string §ion,
+ const string &name, SimObject * ¶m)
{
if (!cp->findObj(section, name, param)) {
fatal("Can't unserialize '%s:%s'\n", section, name);
}
-#define INSTANTIATE_PARAM_TEMPLATES(type) \
-template void \
-paramOut(ostream &os, const std::string &name, type const ¶m); \
-template void \
-paramIn(Checkpoint *cp, const std::string §ion, \
- const std::string &name, type & param); \
-template void \
-arrayParamOut(ostream &os, const std::string &name, \
- type const *param, int size); \
-template void \
-arrayParamIn(Checkpoint *cp, const std::string §ion, \
- const std::string &name, type *param, int size);
-
+#define INSTANTIATE_PARAM_TEMPLATES(type) \
+template void \
+paramOut(ostream &os, const string &name, type const ¶m); \
+template void \
+paramIn(Checkpoint *cp, const string §ion, \
+ const string &name, type & param); \
+template bool \
+optParamIn(Checkpoint *cp, const string §ion, \
+ const string &name, type & param); \
+template void \
+arrayParamOut(ostream &os, const string &name, \
+ type const *param, unsigned size); \
+template void \
+arrayParamIn(Checkpoint *cp, const string §ion, \
+ const string &name, type *param, unsigned size); \
+template void \
+arrayParamOut(ostream &os, const string &name, \
+ const vector<type> ¶m); \
+template void \
+arrayParamIn(Checkpoint *cp, const string §ion, \
+ const string &name, vector<type> ¶m);
+
+INSTANTIATE_PARAM_TEMPLATES(char)
INSTANTIATE_PARAM_TEMPLATES(signed char)
INSTANTIATE_PARAM_TEMPLATES(unsigned char)
INSTANTIATE_PARAM_TEMPLATES(signed short)
INSTANTIATE_PARAM_TEMPLATES(signed long long)
INSTANTIATE_PARAM_TEMPLATES(unsigned long long)
INSTANTIATE_PARAM_TEMPLATES(bool)
+INSTANTIATE_PARAM_TEMPLATES(float)
+INSTANTIATE_PARAM_TEMPLATES(double)
INSTANTIATE_PARAM_TEMPLATES(string)
mainEventQueue.unserialize(cp, "MainEventQueue");
}
-void
-Serializable::serializeAll(const std::string &cpt_dir)
+Serializable::Serializable()
{
- setCheckpointDir(cpt_dir);
- string dir = Checkpoint::dir();
- if (mkdir(dir.c_str(), 0775) == -1 && errno != EEXIST)
- fatal("couldn't mkdir %s\n", dir);
-
- string cpt_file = dir + Checkpoint::baseFilename;
- ofstream outstream(cpt_file.c_str());
- time_t t = time(NULL);
- outstream << "// checkpoint generated: " << ctime(&t);
+}
- globals.serialize(outstream);
- SimObject::serializeAll(outstream);
+Serializable::~Serializable()
+{
}
void
-Serializable::unserializeAll(const std::string &cpt_dir)
+Serializable::serialize(ostream &os)
{
- setCheckpointDir(cpt_dir);
- string dir = Checkpoint::dir();
- string cpt_file = dir + Checkpoint::baseFilename;
- string section = "";
-
- DPRINTFR(Config, "Loading checkpoint dir '%s'\n",
- dir);
- Checkpoint *cp = new Checkpoint(dir, section);
- unserializeGlobals(cp);
-
- SimObject::unserializeAll(cp);
}
void
-Serializable::unserializeGlobals(Checkpoint *cp)
+Serializable::unserialize(Checkpoint *cp, const string §ion)
{
- globals.unserialize(cp);
}
-const char *Checkpoint::baseFilename = "m5.cpt";
-
-static string checkpointDirBase;
-
void
-setCheckpointDir(const std::string &name)
+Serializable::serializeAll(const string &cpt_dir)
{
- checkpointDirBase = name;
- if (checkpointDirBase[checkpointDirBase.size() - 1] != '/')
- checkpointDirBase += "/";
+ string dir = Checkpoint::setDir(cpt_dir);
+ if (mkdir(dir.c_str(), 0775) == -1 && errno != EEXIST)
+ fatal("couldn't mkdir %s\n", dir);
+
+ string cpt_file = dir + Checkpoint::baseFilename;
+ ofstream outstream(cpt_file.c_str());
+ time_t t = time(NULL);
+ if (!outstream.is_open())
+ fatal("Unable to open file %s for writing\n", cpt_file.c_str());
+ outstream << "## checkpoint generated: " << ctime(&t);
+
+ globals.serialize(outstream);
+ SimObject::serializeAll(outstream);
}
-string
-Checkpoint::dir()
+void
+Serializable::unserializeGlobals(Checkpoint *cp)
{
- // use csprintf to insert curTick into directory name if it
- // appears to have a format placeholder in it.
- return (checkpointDirBase.find("%") != string::npos) ?
- csprintf(checkpointDirBase, curTick) : checkpointDirBase;
+ globals.unserialize(cp);
}
void
-debug_serialize(const std::string &cpt_dir)
+debug_serialize(const string &cpt_dir)
{
Serializable::serializeAll(cpt_dir);
}
// Need to make this a pointer so we can force initialization on the
// first reference; otherwise, some SerializableClass constructors
// may be invoked before the classMap constructor.
-map<string,SerializableClass::CreateFunc> *SerializableClass::classMap = 0;
+map<string, SerializableClass::CreateFunc> *SerializableClass::classMap = 0;
// SerializableClass constructor: add mapping to classMap
SerializableClass::SerializableClass(const string &className,
- CreateFunc createFunc)
+ CreateFunc createFunc)
{
if (classMap == NULL)
- classMap = new map<string,SerializableClass::CreateFunc>();
+ classMap = new map<string, SerializableClass::CreateFunc>();
if ((*classMap)[className])
- {
- cerr << "Error: simulation object class " << className << " redefined"
- << endl;
- fatal("");
- }
+ fatal("Error: simulation object class %s redefined\n", className);
// add className --> createFunc to class map
(*classMap)[className] = createFunc;
}
-
//
//
Serializable *
-SerializableClass::createObject(Checkpoint *cp,
- const std::string §ion)
+SerializableClass::createObject(Checkpoint *cp, const string §ion)
{
string className;
Serializable *
-Serializable::create(Checkpoint *cp, const std::string §ion)
+Serializable::create(Checkpoint *cp, const string §ion)
{
Serializable *object = SerializableClass::createObject(cp, section);
object->unserialize(cp, section);
}
-Checkpoint::Checkpoint(const std::string &cpt_dir, const std::string &path)
- : db(new IniFile), basePath(path), cptDir(cpt_dir)
+const char *Checkpoint::baseFilename = "m5.cpt";
+
+string Checkpoint::currentDirectory;
+
+string
+Checkpoint::setDir(const string &name)
+{
+ // 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;
+ if (currentDirectory[currentDirectory.size() - 1] != '/')
+ currentDirectory += "/";
+ return currentDirectory;
+}
+
+string
+Checkpoint::dir()
+{
+ return currentDirectory;
+}
+
+
+Checkpoint::Checkpoint(const string &cpt_dir)
+ : db(new IniFile), cptDir(setDir(cpt_dir))
{
- string filename = cpt_dir + "/" + Checkpoint::baseFilename;
+ string filename = cptDir + "/" + Checkpoint::baseFilename;
if (!db->load(filename)) {
fatal("Can't load checkpoint file '%s'\n", filename);
}
bool
-Checkpoint::find(const std::string §ion, const std::string &entry,
- std::string &value)
+Checkpoint::find(const string §ion, const string &entry, string &value)
{
return db->find(section, entry, value);
}
bool
-Checkpoint::findObj(const std::string §ion, const std::string &entry,
+Checkpoint::findObj(const string §ion, const string &entry,
SimObject *&value)
{
string path;
bool
-Checkpoint::sectionExists(const std::string §ion)
+Checkpoint::sectionExists(const string §ion)
{
return db->sectionExists(section);
}
projects / gem5.git / blobdiff