From 71075f45220dbd5262b1ec24204ac9a1670ad0c9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 21 Feb 2013 14:41:07 +0100 Subject: [PATCH] Extend smpi_register_static to accept any free function. --- include/smpi/smpi_cocci.h | 6 +++--- src/smpi/smpi_c99.c | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/smpi/smpi_cocci.h b/include/smpi/smpi_cocci.h index ace208ff95..f0823557b8 100644 --- a/include/smpi/smpi_cocci.h +++ b/include/smpi/smpi_cocci.h @@ -48,7 +48,7 @@ void __attribute__((weak,destructor)) __postfini_##name(void) { \ * This function is rather internal, mainly used for the * privatization of global variables through coccinelle. */ -XBT_PUBLIC(void) smpi_register_static(void* arg); +XBT_PUBLIC(void) smpi_register_static(void* arg, void_f_pvoid_t free_fn); XBT_PUBLIC(void) smpi_free_static(void); @@ -56,7 +56,7 @@ XBT_PUBLIC(void) smpi_free_static(void); static type *name = NULL; \ if(!name) { \ name = (type*)malloc(smpi_global_size() * sizeof(type)); \ - smpi_register_static(name); \ + smpi_register_static(name, xbt_free); \ } #define SMPI_VARINIT_STATIC_AND_SET(name,type,expr) \ @@ -69,7 +69,7 @@ if(!name) { \ for(i = 0; i < size; i++) { \ name[i] = value; \ } \ - smpi_register_static(name); \ + smpi_register_static(name, xbt_free); \ } #define SMPI_VARGET_STATIC(name) name[smpi_process_index()] diff --git a/src/smpi/smpi_c99.c b/src/smpi/smpi_c99.c index 32e0265104..88f84675dd 100644 --- a/src/smpi/smpi_c99.c +++ b/src/smpi/smpi_c99.c @@ -7,20 +7,27 @@ #include #include "private.h" +typedef struct s_smpi_static { + void *ptr; + void_f_pvoid_t free_fn; +} s_smpi_static_t; + static xbt_dynar_t registered_static_stack = NULL; -void smpi_register_static(void* arg) +void smpi_register_static(void* arg, void_f_pvoid_t free_fn) { + s_smpi_static_t elm = { arg, free_fn }; if (!registered_static_stack) - registered_static_stack = xbt_dynar_new(sizeof(void*), NULL); - xbt_dynar_push_as(registered_static_stack, void*, arg); + registered_static_stack = xbt_dynar_new(sizeof(s_smpi_static_t), NULL); + xbt_dynar_push_as(registered_static_stack, s_smpi_static_t, elm); } void smpi_free_static(void) { while (!xbt_dynar_is_empty(registered_static_stack)) { - void *p = xbt_dynar_pop_as(registered_static_stack, void*); - free(p); + s_smpi_static_t elm = + xbt_dynar_pop_as(registered_static_stack, s_smpi_static_t); + elm.free_fn(elm.ptr); } xbt_dynar_free(®istered_static_stack); } -- 2.20.1