derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sim: Implement optParamIn using paramIn.

Browse Source 
This means only paramIn needs to be specialized, and then optParamIn
will be as well for free. It also removes some duplicate implementation.

Change-Id: Id124a05d04e1c0897121d0e13dd46efe90e8eed0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36276
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2020-10-20 18:46:02 -07:00
parent c1217f4e89
commit 368e5a492b
1 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/sim/serialize.hh
View File

@@ -471,6 +471,41 @@ paramOut(CheckpointOut &os, const std::string &name, const T &param)
os << "\n";
}
template <class T>
bool
paramInImpl(CheckpointIn &cp, const std::string &name, T &param)
{
const std::string &section(Serializable::currentSection());
std::string str;
return cp.find(section, name, str) && parseParam(str, param);
}
/**
* This function is used for restoring optional parameters from the
* checkpoint.
* @param cp The checkpoint to be written to.
* @param name Name of the parameter to be written.
* @param param Value of the parameter to be written.
* @param do_warn If the do_warn is set to true then the function prints the
* warning message.
* @return If the parameter we are searching for does not exist
* the function returns false else it returns true.
*
* @ingroup api_serialize
*/
template <class T>
bool
optParamIn(CheckpointIn &cp, const std::string &name, T &param,
bool do_warn=true)
{
if (paramInImpl(cp, name, param))
return true;
warn_if(do_warn, "optional parameter %s:%s not present",
Serializable::currentSection(), name);
return false;
}
/**
* This function is used for restoring parameters from a checkpoint.
* @param os The checkpoint to be restored from.
@@ -482,40 +517,8 @@ template <class T>
void
paramIn(CheckpointIn &cp, const std::string &name, T &param)
{
const std::string &section(Serializable::currentSection());
std::string str;
if (!cp.find(section, name, str) || !parseParam(str, param)) {
fatal("Can't unserialize '%s:%s'\n", section, name);
}
}
/**
* This function is used for restoring optional parameters from the
* checkpoint.
* @param cp The checkpoint to be written to.
* @param name Name of the parameter to be written.
* @param param Value of the parameter to be written.
* @param warn If the warn is set to true then the function prints the warning
* message.
* @return If the parameter we are searching for does not exist
* the function returns false else it returns true.
*
* @ingroup api_serialize
*/
template <class T>
bool
optParamIn(CheckpointIn &cp, const std::string &name,
T &param, bool warn = true)
{
const std::string &section(Serializable::currentSection());
std::string str;
if (!cp.find(section, name, str) || !parseParam(str, param)) {
if (warn)
warn("optional parameter %s:%s not present\n", section, name);
return false;
} else {
return true;
}
fatal_if(!paramInImpl(cp, name, param),
"Can't unserialize '%s:%s'", Serializable::currentSection(), name);
}
/**