From 9043e9c63c0d478e75129e378279d6a84a491d9a Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 22 Oct 2018 15:51:20 +0200 Subject: [PATCH 1/1] [examples] smpi-replay-mmd: (ugly) memory clean-up --- .../replay_multiple_manual.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp index 59aeb70f43..ae6b7f6e3a 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp @@ -65,12 +65,22 @@ static void smpi_replay_process(Job* job, simgrid::s4u::BarrierPtr barrier, int argv[3] = xbt_strdup(job->traces_filenames[rank].c_str()); // smpi trace file for this rank argv[4] = xbt_strdup("0"); // ? + // Ugly double storage used for memory deallocation, as SMPI changes argc/argv without cleaning memory. + char* to_free[2] = {argv[0], argv[1]}; // <-- This ugly array should disappear. + XBT_INFO("Replaying rank %d of job %d (smpi_app '%s')", rank, job->unique_job_number, job->smpi_app_name.c_str()); smpi_replay_run(&argc, &argv); XBT_INFO("Finished replaying rank %d of job %d (smpi_app '%s')", rank, job->unique_job_number, job->smpi_app_name.c_str()); barrier->wait(); + + // Memory clean-up + for (int i = 0; i < 2; ++i) // <-- This ugly loop should disappear. + xbt_free(to_free[i]); + for (int i = 0; i < argc; ++i) + xbt_free(argv[i]); + xbt_free(argv); } // Sleeps for a given amount of time -- 2.20.1