*
* This function is rather internal, mainly used for the
* privatization of global variables through coccinelle.
- *
- * Since its implementation relies on the on_exit() function that
- * is not implemented on Mac, this function is a no-op on that
- * architecture. But the only issue raised is that the memory is
- * not raised right before the process terminaison. This is only
- * important if you want to run valgrind on the code, or
- * equivalent.
*/
XBT_PUBLIC(void) smpi_register_static(void* arg);
+XBT_PUBLIC(void) smpi_free_static(void);
+
#define SMPI_VARINIT_STATIC(name,type) \
static type *name = NULL; \
if(!name) { \
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <stdlib.h>
+#include <xbt/dynar.h>
#include "private.h"
-static void smpi_free_static(int status, void* arg) {
- free(arg);
+static xbt_dynar_t registered_static_stack = NULL;
+
+void smpi_register_static(void* arg)
+{
+ if (!registered_static_stack)
+ registered_static_stack = xbt_dynar_new(sizeof(void*), NULL);
+ xbt_dynar_push_as(registered_static_stack, void*, arg);
}
-void smpi_register_static(void* arg) {
-#ifndef __APPLE__
- // on_exit is not implemented on Apple.
- // That's fine, the memory won't be released on UNIX process terminaison.
- // This means that valgrind will report it as leaked (but who cares?)
- on_exit(&smpi_free_static, arg);
-#endif
+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);
+ }
+ xbt_dynar_free(®istered_static_stack);
}