Skip to content

Update STL checkpoint name encoding so _ becomes __, while all other punctuation characters become _. #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hchen99 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update STL checkpoint name encoding so _ becomes __, while all other punctuation characters become _. #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02dbdee
Update STL checkpoint temporary name encoding so _ becomes __, while …
hchen99 Sep 3, 2026
c7d1f20
clang-format
hchen99 Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions include/trick/checkpoint_map.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ int checkpoint_map_ik_id(STL & in_map , std::string object_name , std::string va
typename STL::key_type * keys = nullptr ;
typename STL::mapped_type * items = nullptr ;

cont_size = in_map.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = in_map.size();

if ( cont_size > 0 ) {
std::string type_string ;
Expand Down Expand Up @@ -130,8 +129,7 @@ int checkpoint_map_ik_sd(STL & in_map , std::string object_name , std::string va
typename STL::key_type * keys = nullptr ;
std::string * items = nullptr ;

cont_size = in_map.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = in_map.size();

if ( cont_size > 0 ) {
std::string type_string ;
Expand Down Expand Up @@ -211,8 +209,7 @@ int checkpoint_map_sk_id(STL & in_map , std::string object_name , std::string va
std::string * keys = nullptr ;
typename STL::mapped_type * items = nullptr ;

cont_size = in_map.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = in_map.size();

if ( cont_size > 0 ) {
var_declare << "std::string "
Expand Down Expand Up @@ -291,8 +288,7 @@ int checkpoint_map_stl_sk_sd(STL & in_map , std::string object_name , std::strin
std::string * keys = nullptr ;
std::string * items = nullptr ;

cont_size = in_map.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = in_map.size();

if ( cont_size > 0 ) {
var_declare << "std::string "
Expand Down Expand Up @@ -355,8 +351,8 @@ int checkpoint_stl(std::multimap<KEY,DATA,_Compare,_Alloc> & in_map , std::strin
/* =================================================================================================*/

template <class STL>
int delete_map_allocs(STL & in_map __attribute__ ((unused)), std::string object_name , std::string var_name ) {
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
int delete_map_allocs(STL& in_map __attribute__((unused)), std::string object_name, std::string var_name)
{
REF2 * items_ref ;
std::string temp_str;
temp_str = object_name + std::string("_") + var_name + std::string("_keys");
Expand Down Expand Up @@ -404,7 +400,6 @@ int restore_map_ik_id(STL & in_map , std::string object_name , std::string var_n

//message_publish(1, "in regular map template restore\n") ;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
temp_str = object_name + "_" + var_name + "_keys";
keys_ref = ref_attributes(temp_str.c_str()) ;
temp_str = object_name + "_" + var_name + "_data";
Expand Down Expand Up @@ -453,8 +448,6 @@ int restore_map_ik_sd(STL & in_map , std::string object_name , std::string var_n

//message_publish(1, "in regular map template restore\n") ;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');

temp_str = object_name + "_" + var_name + "_keys";
keys_ref = ref_attributes(temp_str.c_str()) ;
temp_str = object_name + "_" + var_name + "_data";
Expand Down Expand Up @@ -507,8 +500,6 @@ int restore_map_sk_id(STL & in_map , std::string object_name , std::string var_n

//message_publish(1, "in regular map template restore\n") ;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');

temp_str = object_name + "_" + var_name + "_keys";
keys_ref = ref_attributes(temp_str.c_str()) ;
temp_str = object_name + "_" + var_name + "_data";
Expand Down Expand Up @@ -561,8 +552,6 @@ int restore_map_sk_sd(STL & in_map , std::string object_name , std::string var_n

//message_publish(1, "in regular map template restore\n") ;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');

temp_str = object_name + "_" + var_name + "_keys";
keys_ref = ref_attributes((char *)temp_str.c_str()) ;
temp_str = object_name + "_" + var_name + "_data";
Expand Down
23 changes: 7 additions & 16 deletions include/trick/checkpoint_pair.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ int checkpoint_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name
std::string temp_str;

FIRST * first = nullptr ;
SECOND * second = nullptr ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
SECOND* second = nullptr;

std::string type_string ;
try {
Expand Down Expand Up @@ -83,8 +82,7 @@ int checkpoint_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name

std::string temp_str;
FIRST * first = nullptr ;
std::string * second = nullptr ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string* second = nullptr;
std::string type_string;
try {
type_string = stl_type_name_convert(abi::__cxa_demangle(typeid(*first).name(), 0, 0, &status )) ;
Expand Down Expand Up @@ -129,8 +127,7 @@ int checkpoint_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name
std::string temp_str ;

std::string * first = nullptr ;
SECOND * second = nullptr ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
SECOND* second = nullptr;

var_declare << "std::string "
<< object_name << "_" << var_name << "_first[1]" ;
Expand Down Expand Up @@ -173,8 +170,6 @@ int checkpoint_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name

std::string temp_str;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');

var_declare << "std::string "
<< object_name << "_" << var_name << "_first[1]" ;
temp_str = var_declare.str();
Expand All @@ -201,8 +196,8 @@ int checkpoint_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name
/* =================================================================================================*/

template <class FIRST, class SECOND>
int delete_stl(std::pair<FIRST, SECOND> & in_stl __attribute__ ((unused)) , std::string object_name , std::string var_name ) {
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
int delete_stl(std::pair<FIRST, SECOND>& in_stl __attribute__((unused)), std::string object_name, std::string var_name)
{
REF2 * items_ref ;
std::string temp_str = object_name + "_" + var_name + "_first";
items_ref = ref_attributes(temp_str.c_str()) ;
Expand All @@ -229,8 +224,7 @@ int restore_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name ,
FIRST * first ;
SECOND * second ;

std::string temp_str;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string temp_str;
//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + "_" + var_name + "_first";
first_ref = ref_attributes((char *)temp_str.c_str()) ;
Expand Down Expand Up @@ -263,7 +257,6 @@ int restore_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name ,

std::string temp_str;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + "_" + var_name + "_first";
first_ref = ref_attributes((char *)temp_str.c_str()) ;
Expand Down Expand Up @@ -294,8 +287,7 @@ int restore_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name ,
std::string * first_inner ;
SECOND * second ;

std::string temp_str;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string temp_str;
//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + "_" + var_name + "_first";
first_ref = ref_attributes((char *)temp_str.c_str()) ;
Expand Down Expand Up @@ -327,7 +319,6 @@ int restore_stl(std::pair<FIRST , SECOND> & in_pair , std::string object_name ,

std::string temp_str;

std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + "_" + var_name + "_first";
first_ref = ref_attributes((char *)temp_str.c_str()) ;
Expand Down
24 changes: 8 additions & 16 deletions include/trick/checkpoint_queue.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ int checkpoint_stl(std::queue<ITEM_TYPE,_Sequence> & in_stl , std::string object
ITEM_TYPE * items = nullptr ;
std::queue<ITEM_TYPE,_Sequence> temp_queue(in_stl) ;

cont_size = temp_queue.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = temp_queue.size();

if ( cont_size > 0 ) {
std::string type_string;
Expand Down Expand Up @@ -84,8 +83,7 @@ int checkpoint_stl(std::queue<ITEM_TYPE,_Sequence> & in_stl , std::string object
std::string * items = nullptr ;
std::queue<ITEM_TYPE,_Sequence> temp_queue(in_stl) ;

cont_size = temp_queue.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = temp_queue.size();

if ( cont_size > 0 ) {
var_declare << "std::string "
Expand Down Expand Up @@ -127,8 +125,7 @@ int checkpoint_stl(std::priority_queue<ITEM_TYPE, _Container, _Compare> & in_stl
ITEM_TYPE * items = nullptr ;
std::priority_queue<ITEM_TYPE,_Container,_Compare> temp_queue(in_stl) ;

cont_size = temp_queue.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = temp_queue.size();

if ( cont_size > 0 ) {
std::string type_string;
Expand Down Expand Up @@ -172,8 +169,7 @@ int checkpoint_stl(std::priority_queue<ITEM_TYPE, _Container, _Compare> & in_stl
std::string * items = nullptr ;
std::priority_queue<ITEM_TYPE,_Container,_Compare> temp_queue(in_stl) ;

cont_size = temp_queue.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = temp_queue.size();

if ( cont_size > 0 ) {
var_declare << "std::string "
Expand Down Expand Up @@ -234,8 +230,7 @@ int restore_stl(std::queue<ITEM_TYPE,_Sequence> & in_stl , std::string object_na
std::string temp_str ;

REF2 * items_ref ;
ITEM_TYPE * items ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
ITEM_TYPE* items;

//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + std::string("_") + var_name ;
Expand Down Expand Up @@ -268,8 +263,7 @@ int restore_stl(std::queue<ITEM_TYPE,_Sequence> & in_stl , std::string object_na
std::string temp_str ;

REF2 * items_ref ;
std::string * items ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string* items;

//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + "_" + var_name ;
Expand Down Expand Up @@ -307,8 +301,7 @@ int restore_stl(std::priority_queue<ITEM_TYPE,_Container,_Compare> & in_stl ,
std::string temp_str ;

REF2 * items_ref ;
ITEM_TYPE * items ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
ITEM_TYPE* items;

//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + std::string("_") + var_name ;
Expand Down Expand Up @@ -342,8 +335,7 @@ int restore_stl(std::priority_queue<ITEM_TYPE,_Container,_Compare> & in_stl ,
std::string temp_str ;

REF2 * items_ref ;
std::string * items ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string* items;

//message_publish(1, "RESTORE_STL_queue %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + "_" + var_name ;
Expand Down
23 changes: 8 additions & 15 deletions include/trick/checkpoint_sequence_stl.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ int checkpoint_sequence_i(STL & in_stl , std::string object_name , std::string v

//message_publish(1, "%s\n", __PRETTY_FUNCTION__) ;

cont_size = in_stl.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = in_stl.size();

if ( cont_size > 0 ) {
std::string type_string;
Expand Down Expand Up @@ -86,9 +85,7 @@ int checkpoint_sequence_s(STL & in_stl , std::string object_name , std::string v
typename STL::iterator it ;
typename STL::iterator end ;


cont_size = in_stl.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = in_stl.size();

//message_publish(1, "%s\n", __PRETTY_FUNCTION__) ;

Expand Down Expand Up @@ -220,8 +217,8 @@ int checkpoint_stl(std::multiset<ITEM_TYPE,_Alloc> & in_stl , std::string object
/* =================================================================================================*/

template <class STL>
int delete_sequence_alloc(STL & in_stl __attribute__ ((unused)), std::string object_name , std::string var_name ) {
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
int delete_sequence_alloc(STL& in_stl __attribute__((unused)), std::string object_name, std::string var_name)
{
REF2 * items_ref ;
std::string temp_str = object_name + std::string("_") + var_name ;
items_ref = ref_attributes((char *)temp_str.c_str()) ;
Expand Down Expand Up @@ -279,8 +276,7 @@ int restore_sequence_i(STL & in_stl , std::string object_name , std::string var_
std::string temp_str ;

REF2 * items_ref ;
typename STL::value_type * items ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
typename STL::value_type* items;

//message_publish(1, "RESTORE_SEQUENCE_STL %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + std::string("_") + var_name ;
Expand Down Expand Up @@ -308,8 +304,7 @@ int restore_sequence_s(STL & in_stl , std::string object_name , std::string var_

REF2 * items_ref ;
std::string * items ;
std::string temp_str ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string temp_str;

//message_publish(1, "%s\n", __PRETTY_FUNCTION__) ;
temp_str = object_name + "_" + var_name ;
Expand Down Expand Up @@ -345,8 +340,7 @@ int restore_stl(std::array<ITEM_TYPE,N> & in_stl , std::string object_name , std

REF2 * items_ref ;
std::string * items ;
std::string temp_str ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string temp_str;

//message_publish(1, "%s\n", __PRETTY_FUNCTION__) ;
temp_str = object_name + "_" + var_name ;
Expand Down Expand Up @@ -378,8 +372,7 @@ int restore_stl(std::array<ITEM_TYPE,N> & in_stl , std::string object_name , std
std::string temp_str ;

REF2 * items_ref ;
typename std::array<ITEM_TYPE,N>::value_type * items ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
typename std::array<ITEM_TYPE, N>::value_type* items;

//message_publish(1, "RESTORE_SEQUENCE_STL %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + std::string("_") + var_name ;
Expand Down
12 changes: 4 additions & 8 deletions include/trick/checkpoint_stack.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ int checkpoint_stl(std::stack<ITEM_TYPE,_Sequence> & in_stl , std::string object
ITEM_TYPE * items = nullptr ;
std::stack<ITEM_TYPE,_Sequence> temp_stack(in_stl) ;

cont_size = temp_stack.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = temp_stack.size();

if ( cont_size > 0 ) {
std::string type_string;
Expand Down Expand Up @@ -80,8 +79,7 @@ int checkpoint_stl(std::stack<ITEM_TYPE,_Sequence> & in_stl , std::string object
std::string * items = nullptr ;
std::stack<ITEM_TYPE,_Sequence> temp_stack(in_stl) ;

cont_size = temp_stack.size() ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
cont_size = temp_stack.size();

if ( cont_size > 0 ) {
var_declare << "std::string "
Expand Down Expand Up @@ -133,8 +131,7 @@ int restore_stl(std::stack<ITEM_TYPE,_Sequence> & in_stl , std::string object_na
std::string temp_str ;

REF2 * items_ref ;
ITEM_TYPE * items = nullptr ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
ITEM_TYPE* items = nullptr;

//message_publish(1, "RESTORE_STL_STACK %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + std::string("_") + var_name ;
Expand Down Expand Up @@ -165,8 +162,7 @@ int restore_stl(std::stack<ITEM_TYPE,_Sequence> & in_stl , std::string object_na
std::string temp_str ;

REF2 * items_ref ;
std::string * items = nullptr ;
std::replace_if(object_name.begin(), object_name.end(), static_cast<int (*)(int)>(std::ispunct), '_');
std::string* items = nullptr;

//message_publish(1, "RESTORE_STL_STACK %s_%s\n", object_name.c_str() , var_name.c_str()) ;
temp_str = object_name + std::string("_") + var_name ;
Expand Down
Loading