[gem5-dev] changeset in gem5: sim: support checkpointing std::set

[Curtis Dunham]

changeset 463a4b0f0dda in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=463a4b0f0dda
description:
        sim: support checkpointing std::set<std::string>'s

        This is in support of tag-based checkpoint versioning; the version tags
        are stored in string sets. This commit adds such support.

diffstat:

 src/sim/serialize.cc |  53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/sim/serialize.hh |   9 ++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)

diffs (110 lines):

diff -r f959b7f89d4d -r 463a4b0f0dda src/sim/serialize.cc
--- a/src/sim/serialize.cc      Wed Sep 02 15:19:43 2015 -0500
+++ b/src/sim/serialize.cc      Wed Sep 02 15:19:44 2015 -0500
@@ -212,6 +212,24 @@
 
 template <class T>
 void
+arrayParamOut(CheckpointOut &os, const string &name, const set<T> &param)
+{
+    typename set<T>::const_iterator it = param.begin();
+
+    os << name << "=";
+    if (param.size() > 0)
+        showParam(os, *it);
+    it++;
+    while (it != param.end()) {
+        os << " ";
+        showParam(os, *it);
+        it++;
+    }
+    os << "\n";
+}
+
+template <class T>
+void
 paramIn(CheckpointIn &cp, const string &name, T &param)
 {
     const string &section(Serializable::currentSection());
@@ -368,6 +386,36 @@
     }
 }
 
+template <class T>
+void
+arrayParamIn(CheckpointIn &cp, const string &name, set<T> &param)
+{
+    const string &section(Serializable::currentSection());
+    string str;
+    if (!cp.find(section, name, str)) {
+        fatal("Can't unserialize '%s:%s'\n", section, name);
+    }
+    param.clear();
+
+    vector<string> tokens;
+    tokenize(tokens, str, ' ');
+
+    for (vector<string>::size_type i = 0; i < tokens.size(); i++) {
+        T scalar_value;
+        if (!parseParam(tokens[i], scalar_value)) {
+            string err("could not parse \"");
+
+            err += str;
+            err += "\"";
+
+            fatal(err);
+        }
+
+        // assign parsed value to vector
+        param.insert(scalar_value);
+    }
+}
+
 
 void
 objParamIn(CheckpointIn &cp, const string &name, SimObject * &param)
@@ -423,6 +471,11 @@
 INSTANTIATE_PARAM_TEMPLATES(string)
 INSTANTIATE_PARAM_TEMPLATES(Pixel)
 
+// set is only used with strings and furthermore doesn't agree with Pixel
+template void
+arrayParamOut(CheckpointOut &, const string &, const set<string> &);
+template void
+arrayParamIn(CheckpointIn &, const string &, set<string> &);
 
 /////////////////////////////
 
diff -r f959b7f89d4d -r 463a4b0f0dda src/sim/serialize.hh
--- a/src/sim/serialize.hh      Wed Sep 02 15:19:43 2015 -0500
+++ b/src/sim/serialize.hh      Wed Sep 02 15:19:44 2015 -0500
@@ -55,6 +55,7 @@
 #include <list>
 #include <map>
 #include <stack>
+#include <set>
 #include <vector>
 
 #include "base/bitunion.hh"
@@ -124,6 +125,10 @@
                    const std::list<T> &param);
 
 template <class T>
+void arrayParamOut(CheckpointOut &cp, const std::string &name,
+                   const std::set<T> &param);
+
+template <class T>
 void arrayParamIn(CheckpointIn &cp, const std::string &name,
                   T *param, unsigned size);
 
@@ -135,6 +140,10 @@
 void arrayParamIn(CheckpointIn &cp, const std::string &name,
                   std::list<T> &param);
 
+template <class T>
+void arrayParamIn(CheckpointIn &cp, const std::string &name,
+                  std::set<T> &param);
+
 void
 objParamIn(CheckpointIn &cp, const std::string &name, SimObject * &param);
 
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev