change dht_collisions to dht_evictions + use option instead of set

This commit is contained in:
Max Lübke 2021-02-17 15:01:50 +01:00
parent a23356d749
commit 7fc3002b5d
2 changed files with 6 additions and 9 deletions

View File

@ -3,7 +3,7 @@ target_include_directories(DHT PUBLIC ${MPI_C_INCLUDE_DIRS})
target_link_libraries(DHT PRIVATE MPI::MPI_C) target_link_libraries(DHT PRIVATE MPI::MPI_C)
target_compile_definitions(DHT PUBLIC OMPI_SKIP_MPICXX) target_compile_definitions(DHT PUBLIC OMPI_SKIP_MPICXX)
set(DHT_Debug FALSE CACHE BOOL "Toggle output of stastic table for each iteration") option(DHT_Debug "Toggle output of stastic table for each iteration" OFF)
if (DHT_Debug) if (DHT_Debug)
target_compile_definitions(DHT PUBLIC DHT_STATISTICS) target_compile_definitions(DHT PUBLIC DHT_STATISTICS)

View File

@ -286,12 +286,9 @@ void ChemMaster::end() {
int dht_hits = 0; int dht_hits = 0;
int dht_miss = 0; int dht_miss = 0;
int dht_collision = 0; int dht_evictions = 0;
if (dht_enabled) { if (dht_enabled) {
dht_hits = 0;
dht_miss = 0;
dht_collision = 0;
dht_perfs = (int *)calloc(3, sizeof(int)); dht_perfs = (int *)calloc(3, sizeof(int));
} }
@ -324,7 +321,7 @@ void ChemMaster::end() {
MPI_STATUS_IGNORE); MPI_STATUS_IGNORE);
dht_hits += dht_perfs[0]; dht_hits += dht_perfs[0];
dht_miss += dht_perfs[1]; dht_miss += dht_perfs[1];
dht_collision += dht_perfs[2]; dht_evictions += dht_perfs[2];
} }
} }
@ -356,8 +353,8 @@ void ChemMaster::end() {
R.parseEvalQ("profiling$dht_hits <- dht_hits"); R.parseEvalQ("profiling$dht_hits <- dht_hits");
R["dht_miss"] = dht_miss; R["dht_miss"] = dht_miss;
R.parseEvalQ("profiling$dht_miss <- dht_miss"); R.parseEvalQ("profiling$dht_miss <- dht_miss");
R["dht_collision"] = dht_collision; R["dht_evictions"] = dht_evictions;
R.parseEvalQ("profiling$dht_collisions <- dht_collision"); R.parseEvalQ("profiling$dht_evictions <- dht_evictions");
R["dht_get_time"] = dht_get_time; R["dht_get_time"] = dht_get_time;
R.parseEvalQ("profiling$dht_get_time <- dht_get_time"); R.parseEvalQ("profiling$dht_get_time <- dht_get_time");
R["dht_fill_time"] = dht_fill_time; R["dht_fill_time"] = dht_fill_time;