max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 12:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix freeing of DHT_Wrapper in Destructor if DHT is disabled

Browse Source
This commit is contained in:
Max Lübke 2021-01-21 14:07:35 +01:00
parent 24ae1486ad
commit 5b44d94730
No known key found for this signature in database
GPG Key ID: D3201E51647D1199
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/model/ChemWorker.cpp
View File

@ -1,5 +1,4 @@
#include <Rcpp.h> #include <Rcpp.h>
#include <mpi.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -62,7 +61,7 @@ ChemWorker::ChemWorker(t_simparams *params_, RRuntime &R_, Grid &grid_,
ChemWorker::~ChemWorker() { ChemWorker::~ChemWorker() {
free(mpi_buffer); free(mpi_buffer);
free(mpi_buffer_results); free(mpi_buffer_results);
delete dht; if (dht_enabled) delete dht;
} }
void ChemWorker::loop() { void ChemWorker::loop() {
@ -320,10 +319,8 @@ void ChemWorker::finishWork() {
int dht_perf[3]; int dht_perf[3];
dht_perf[0] = dht->getHits(); dht_perf[0] = dht->getHits();
dht_perf[1] = dht->getMisses(); dht_perf[1] = dht->getMisses();
cout << "Worker " << world_rank << " had " << dht_perf[1] << " misses" << endl;
dht_perf[2] = dht->getEvictions(); dht_perf[2] = dht->getEvictions();
MPI_Send(dht_perf, 3, MPI_INT, 0, TAG_DHT_PERF, MPI_Send(dht_perf, 3, MPI_INT, 0, TAG_DHT_PERF, MPI_COMM_WORLD);
MPI_COMM_WORLD);
} }
if (dht_enabled && dht_snaps > 0) writeFile(); if (dht_enabled && dht_snaps > 0) writeFile();