430,431c430
< setCheckpointDir(cpt_dir);
< string dir = Checkpoint::dir();
---
> string dir = Checkpoint::setDir(cpt_dir);
449,452c448
< setCheckpointDir(cpt_dir);
< string dir = Checkpoint::dir();
< string cpt_file = dir + Checkpoint::baseFilename;
< string section = "";
---
> string dir = Checkpoint::setDir(cpt_dir);
454,456c450,451
< DPRINTFR(Config, "Loading checkpoint dir '%s'\n",
< dir);
< Checkpoint *cp = new Checkpoint(dir, section);
---
> DPRINTFR(Config, "Loading checkpoint dir '%s'\n", dir);
> Checkpoint *cp = new Checkpoint(dir);
467,470d461
< const char *Checkpoint::baseFilename = "m5.cpt";
<
< static string checkpointDirBase;
<
472,488d462
< setCheckpointDir(const string &name)
< {
< checkpointDirBase = name;
< if (checkpointDirBase[checkpointDirBase.size() - 1] != '/')
< checkpointDirBase += "/";
< }
<
< string
< Checkpoint::dir()
< {
< // 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;
< }
<
< void
557,558c531,536
< Checkpoint::Checkpoint(const string &cpt_dir, const 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)
559a538,556
> // 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(cpt_dir)
> {