Skip to content

fixing errors loading checkpoint files due to mismatched field names #2688

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
shannong wants to merge 1 commit into
base: devel
Choose a base branch
from
+7 −7
Open

fixing errors loading checkpoint files due to mismatched field names #2688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/sst/elements/vanadis/os/include/process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <math.h>
#include <sys/mman.h>
//#include <iostream>
#include <iostream>
//#include <fstream>

#include <cstdint>
Expand Down Expand Up @@ -183,7 +183,7 @@ class ProcessInfo {
assert( 1 == fscanf(fp,"hw_thread_: %" SCNu32 "\n",&hw_thread_) );
output->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"hw_thread_: %" PRIu32 "\n",hw_thread_);

assert( 1 == fscanf(fp,"thread_id_address: %" SCNx64 "\n",&thread_id_address_) );
assert( 1 == fscanf(fp,"thread_id_address_: %" SCNx64 "\n",&thread_id_address_) );
output->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"thread_id_address: %#" PRIx64 "\n",thread_id_address_);

virtual_memory_map_ = new VirtMemMap(output,fp,phys_mem_mgr,elf_info);
Expand Down
2 changes: 1 addition & 1 deletion src/sst/elements/vanadis/os/include/virtMemMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ MemoryRegion::MemoryRegion( SST::Output* output, FILE* fp, PhysMemManager* mem_m

for ( auto i = 0; i < size; i++ ) {
int vpn,ppn,ref_cnt;
assert( 3 == fscanf(fp,"vpn: %d, ppn: %d, refCnt: %d\n", &vpn, &ppn, &ref_cnt ) );
assert( 3 == fscanf(fp,"vpn: %d, ppn: %d, ref_cnt: %d\n", &vpn, &ppn, &ref_cnt ) );
output->verbose(CALL_INFO, 0, VANADIS_DBG_SNAPSHOT,"vpn: %d, ppn: %d, refCnt: %d\n", vpn, ppn, ref_cnt );
virt_to_phys_page_map_[vpn] = new OS::Page( mem_manager, ppn, ref_cnt );
}
Expand Down
8 changes: 4 additions & 4 deletions src/sst/elements/vanadis/os/vnodeos.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include "utils.h"
#include "sst/elements/mmu/utils.h"

#include <iostream>

using namespace SST::Vanadis;

VanadisNodeOSComponent::VanadisNodeOSComponent(SST::ComponentId_t id, SST::Params& params)
Expand Down Expand Up @@ -343,7 +345,6 @@ int VanadisNodeOSComponent::checkpointLoad( std::string dir )
std::stringstream filename;
filename << checkpoint_dir_ << "/" << getName();
output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"Checkpoint component `%s` %s\n",getName().c_str(), filename.str().c_str());

auto fp = fopen(filename.str().c_str(),"r");
assert(fp);

Expand Down Expand Up @@ -409,13 +410,13 @@ int VanadisNodeOSComponent::checkpointLoad( std::string dir )
output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"core: %" PRIu32 "\n",core);
assert( core == i );

assert( 1 == fscanf(fp,"hw_thread_map_.size(): %zd\n",&size) );
assert( 1 == fscanf(fp,"m_hwThreadMap.size(): %zd\n",&size) );
output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"hw_thread_map_.size(): %zu\n",size);

for ( auto j = 0; j < size; j++ ) {
uint32_t hw_thread;
// hw_thread: 0
assert( 1 == fscanf(fp, "hw_thread: %" SCNu32 "\n",&hw_thread) );
assert( 1 == fscanf(fp, "hwThread: %" SCNu32 "\n",&hw_thread) );
output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"hw_thread: %" PRIu32 "\n",hw_thread);
assert( hw_thread == j );
uint32_t pid,tid;
Expand All @@ -433,7 +434,6 @@ int VanadisNodeOSComponent::checkpointLoad( std::string dir )
char str [80];
assert( 1 == fscanf(fp,"filename: %s\n",str));
output_->verbose(CALL_INFO, 0, VANADIS_DBG_CHECKPOINT,"filename: %s\n",str);

auto & page_map = elf_page_cache_[ elf_map_[str] ];

size_t size2;
Expand Down
Loading