mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-09 23:49:53 +00:00
Code Issues Releases Wiki Activity

sag:: more mmap removal outside of Linux

Browse Source
This commit is contained in:
Zeno Rogue 2024-07-24 21:26:01 +02:00
parent 2362b4f1ce
commit 45538f6ce9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rogueviz/sag/cells.cpp
View File

@ -66,7 +66,7 @@ struct sagdist_t {
distance* begin() { return tab; } distance* begin() { return tab; }
distance* end() { return tab+N*N; } distance* end() { return tab+N*N; }
sagdist_t() { tab = nullptr; fd = 0; format = 2; } sagdist_t() { tab = nullptr; fd = 0; format = 1; }
distance* operator [] (int y) { return tab + N * y; } distance* operator [] (int y) { return tab + N * y; }
@ -109,11 +109,11 @@ struct sagdist_t {
void load(string fname) { void load(string fname) {
#ifdef LINUX #ifdef LINUX
if(format == 1) map(fname); if(format == 1) map(fname);
if(format == 2) load_old(fname); else if(format == 2) load_old(fname);
else throw hr_exception("sagdist format unknown");
#else #else
load_old(fname); load_old(fname);
#endif #endif
throw hr_exception("sagdist format unknown");
} }
vector<int> test() { vector<int> test() {
@ -139,8 +139,11 @@ struct sagdist_t {
} }
void clear() { void clear() {
#ifdef LINUX
if(fd) { munmap(tabmap, N*N*sizeof(distance)+8); ::close(fd); } if(fd) { munmap(tabmap, N*N*sizeof(distance)+8); ::close(fd); }
else delete[] tab; else
#endif
delete[] tab;
tab = nullptr; fd = 0; tab = nullptr; fd = 0;
} }
@ -217,7 +220,7 @@ void compute_dists() {
} }
if(distance_file != "") { if(distance_file != "") {
sagdist.map(distance_file); sagdist.load(distance_file);
} }
else if(gdist_prec && dijkstra_maxedge) { else if(gdist_prec && dijkstra_maxedge) {
sagdist.init(N, N); sagdist.init(N, N);
@ -498,7 +501,7 @@ void init_cells() {
if(cell_request) { if(cell_request) {
if(distance_file != "") { if(distance_file != "") {
println(hlog, "loading graph ", distance_file); println(hlog, "loading graph ", distance_file);
sagdist.map(distance_file); sagdist.load(distance_file);
if(distance_only) { if(distance_only) {
sagcells.resize(sagdist.N, subcell{nullptr, 0}); sagcells.resize(sagdist.N, subcell{nullptr, 0});
} }