From 76bd24694f9ca0c00450419f237842f36fdde10a Mon Sep 17 00:00:00 2001
From: bcumming <bcumming@cscs.ch>
Date: Tue, 16 Aug 2016 10:31:02 +0200
Subject: [PATCH] fix invalid memory access
---
miniapp/miniapp.cpp | 8 +-------
src/model.hpp | 8 ++++++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/miniapp/miniapp.cpp b/miniapp/miniapp.cpp
index 36c85ba1..b6a6e42b 100644
--- a/miniapp/miniapp.cpp
+++ b/miniapp/miniapp.cpp
@@ -84,21 +84,15 @@ int main(int argc, char** argv) {
m.attach_sampler(probe.id, make_trace_sampler(traces.back().get(), sample_dt));
}
- m.print_spikes();
-
// dummy run of the model for one step to ensure that profiling is consistent
m.run(options.dt, options.dt);
// reset the model
m.reset();
- std::cout << "\n";
- m.print_spikes();
- // which requires resetting the sources
+ // rest the source spikes
for (auto source : local_sources) {
m.add_artificial_spike({source, 0});
}
- std::cout << "\n";
- m.print_spikes();
// run model
m.run(options.tfinal, options.dt);
diff --git a/src/model.hpp b/src/model.hpp
index 9ebd6429..35b70291 100644
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -83,8 +83,12 @@ public:
communicator_.reset();
- current_events().clear();
- future_events().clear();
+ for(auto& q : current_events()) {
+ q.clear();
+ }
+ for(auto& q : future_events()) {
+ q.clear();
+ }
current_spikes().clear();
previous_spikes().clear();
--
GitLab