From 2dfae4217ef47d761adb367f1e2008823be6485b Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 23 Jan 2014 10:23:30 +0100 Subject: [PATCH] Free exception, and fix warnings about variables possibly clobbered by longjmp. --- src/smpi/colls/smpi_automatic_selector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/smpi/colls/smpi_automatic_selector.c b/src/smpi/colls/smpi_automatic_selector.c index 95a7ce470d..54bdcc1b13 100644 --- a/src/smpi/colls/smpi_automatic_selector.c +++ b/src/smpi/colls/smpi_automatic_selector.c @@ -24,8 +24,8 @@ ret smpi_coll_tuned_ ## cat ## _ ## automatic(COLL_UNPAREN args)\ {\ double time1, time2, time_min=DBL_MAX;\ - int min_coll=-1, global_coll=-1;\ - int i;\ + volatile int min_coll=-1, global_coll=-1;\ + volatile int i;\ xbt_ex_t ex;\ double buf_in, buf_out, max_min=DBL_MAX;\ for (i = 0; mpi_coll_##cat##_description[i].name; i++){\ @@ -39,6 +39,7 @@ mpi_coll_##cat##_description[i].coll) args2 ;\ }\ CATCH(ex) {\ + xbt_ex_free(ex);\ continue;\ }\ time2 = SIMIX_get_clock();\ -- 2.20.1