1066c1066
< CPA::serialize(std::ostream &os)
---
> CPA::serialize(CheckpointOut &cp) const
1080,1081d1079
< std::list<AnnDataPtr>::iterator ai;
<
1214,1218c1212,1213
< ai = qData[x].begin();
< while (ai != qData[x].end()) {
< nameOut(os, csprintf("%s.Q%d_%d", name(), x, y));
< (*ai)->serialize(os);
< ai++;
---
> for (auto &ann : qData[x]) {
> ann->serializeSection(os, csprintf("Q%d_%d", x, y));
1225c1220
< CPA::unserialize(Checkpoint *cp, const std::string &section)
---
> CPA::unserialize(CheckpointIn &cp)
1229,1230c1224,1225
< arrayParamIn(cp, section, "numSt", numSt);
< arrayParamIn(cp, section, "numQ", numQ);
---
> UNSERIALIZE_CONTAINER(numSt);
> UNSERIALIZE_CONTAINER(numQ);
1234,1235c1229,1230
< arrayParamIn(cp, section, "qSize", qSize);
< arrayParamIn(cp, section, "qBytes", qBytes);
---
> UNSERIALIZE_CONTAINER(qSize);
> UNSERIALIZE_CONTAINER(qBytes);
1242,1243c1237,1238
< paramIn(cp, section, csprintf("smtCache%d.str", x), str);
< paramIn(cp, section, csprintf("smtCache%d.int", x), smi);
---
> paramIn(cp, csprintf("smtCache%d.str", x), str);
> paramIn(cp, csprintf("smtCache%d.int", x), smi);
1251,1252c1246,1247
< paramIn(cp, section, csprintf("stCache%d_%d.str", x,y), str);
< paramIn(cp, section, csprintf("stCache%d_%d.int", x,y), smi);
---
> paramIn(cp, csprintf("stCache%d_%d.str", x,y), str);
> paramIn(cp, csprintf("stCache%d_%d.int", x,y), smi);
1262,1264c1257,1259
< paramIn(cp, section, csprintf("qCache%d_%d.str", x,y), str);
< paramIn(cp, section, csprintf("qCache%d_%d.id", x,y), id);
< paramIn(cp, section, csprintf("qCache%d_%d.int", x,y), smi);
---
> paramIn(cp, csprintf("qCache%d_%d.str", x,y), str);
> paramIn(cp, csprintf("qCache%d_%d.id", x,y), id);
> paramIn(cp, csprintf("qCache%d_%d.int", x,y), smi);
1273c1268
< paramIn(cp, section, csprintf("smCache%d", x), size);
---
> paramIn(cp, csprintf("smCache%d", x), size);
1275,1277c1270,1272
< paramIn(cp, section, csprintf("smCache%d_%d.str", x,y), str);
< paramIn(cp, section, csprintf("smCache%d_%d.id", x,y), id);
< paramIn(cp, section, csprintf("smCache%d_%d.int", x,y), smi);
---
> paramIn(cp, csprintf("smCache%d_%d.str", x,y), str);
> paramIn(cp, csprintf("smCache%d_%d.id", x,y), id);
> paramIn(cp, csprintf("smCache%d_%d.int", x,y), smi);
1293c1288
< objParamIn(cp, section, csprintf("nameCache%d.name", x), sptr);
---
> objParamIn(cp, csprintf("nameCache%d.name", x), sptr);
1296,1297c1291,1292
< paramIn(cp, section, csprintf("nameCache%d.str", x), str);
< paramIn(cp, section, csprintf("nameCache%d.int", x), sysi);
---
> paramIn(cp, csprintf("nameCache%d.str", x), str);
> paramIn(cp, csprintf("nameCache%d.int", x), sysi);
1303c1298
< paramIn(cp, section, "smStackIdCount", smStack_size);
---
> paramIn(cp, "smStackIdCount", smStack_size);
1308,1310c1303,1305
< paramIn(cp, section, csprintf("smStackId%d.sys", x), sysi);
< paramIn(cp, section, csprintf("smStackId%d.frame", x), frame);
< paramIn(cp, section, csprintf("smStackId%d.count", x), count);
---
> paramIn(cp, csprintf("smStackId%d.sys", x), sysi);
> paramIn(cp, csprintf("smStackId%d.frame", x), frame);
> paramIn(cp, csprintf("smStackId%d.count", x), count);
1313c1308
< paramIn(cp, section, csprintf("smStackId%d_%d", x, y), smi);
---
> paramIn(cp, csprintf("smStackId%d_%d", x, y), smi);
1321c1316
< paramIn(cp, section, "lnMapSize", lnMap_size);
---
> paramIn(cp, "lnMapSize", lnMap_size);
1323,1324c1318,1319
< paramIn(cp, section, csprintf("lnMap%d.smi", x), smi);
< paramIn(cp, section, csprintf("lnMap%d.lsmi", x), lsmi);
---
> paramIn(cp, csprintf("lnMap%d.smi", x), smi);
> paramIn(cp, csprintf("lnMap%d.lsmi", x), lsmi);
1330c1325
< paramIn(cp, section, "swExplCount", swExpl_size);
---
> paramIn(cp, "swExplCount", swExpl_size);
1335,1337c1330,1332
< paramIn(cp, section, csprintf("swExpl%d.sys", x), sysi);
< paramIn(cp, section, csprintf("swExpl%d.frame", x), frame);
< paramIn(cp, section, csprintf("swExpl%d.swexpl", x), b);
---
> paramIn(cp, csprintf("swExpl%d.sys", x), sysi);
> paramIn(cp, csprintf("swExpl%d.frame", x), frame);
> paramIn(cp, csprintf("swExpl%d.swexpl", x), b);
1345c1340
< paramIn(cp, section, "lastStateSize", lastState_size);
---
> paramIn(cp, "lastStateSize", lastState_size);
1347,1348c1342,1343
< paramIn(cp, section, csprintf("lastState%d.smi", x), smi);
< paramIn(cp, section, csprintf("lastState%d.sti", x), sti);
---
> paramIn(cp, csprintf("lastState%d.smi", x), smi);
> paramIn(cp, csprintf("lastState%d.sti", x), sti);
1356,1358c1351,1353
< paramIn(cp, section, csprintf("smMap%d.sys", x), smMap[x].first);
< paramIn(cp, section, csprintf("smMap%d.smname", x), smMap[x].second.first);
< paramIn(cp, section, csprintf("smMap%d.id", x), smMap[x].second.second);
---
> paramIn(cp, csprintf("smMap%d.sys", x), smMap[x].first);
> paramIn(cp, csprintf("smMap%d.smname", x), smMap[x].second.first);
> paramIn(cp, csprintf("smMap%d.id", x), smMap[x].second.second);
1364,1366c1359,1361
< paramIn(cp, section, csprintf("qMap%d.sys", x), qMap[x].first);
< paramIn(cp, section, csprintf("qMap%d.qname", x), qMap[x].second.first);
< paramIn(cp, section, csprintf("qMap%d.id", x), qMap[x].second.second);
---
> paramIn(cp, csprintf("qMap%d.sys", x), qMap[x].first);
> paramIn(cp, csprintf("qMap%d.qname", x), qMap[x].second.first);
> paramIn(cp, csprintf("qMap%d.id", x), qMap[x].second.second);
1377c1372
< a->unserialize(cp, csprintf("%s.Q%d_%d", section, x, y));
---
> a->unserializeSection(cp, csprintf("Q%d_%d", x, y));
1385c1380
< CPA::AnnotateData::serialize(std::ostream &os)
---
> CPA::AnnotateData::serialize(CheckpointOut &cp) const
1397c1392
< CPA::AnnotateData::unserialize(Checkpoint *cp, const std::string &section)
---
> CPA::AnnotateData::unserialize(CheckpointIn &cp)