X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69d6f53a266447b2e5162572dd920c9795cb9c4f..efb48157b629f9950a06c8987c9a41cd354bb979:/src/smpi/smpi_c99.c

diff --git a/src/smpi/smpi_c99.c b/src/smpi/smpi_c99.c
index 306478338a..32e0265104 100644
--- a/src/smpi/smpi_c99.c
+++ b/src/smpi/smpi_c99.c
@@ -4,21 +4,23 @@
 /* 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) {
+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);
+}
 
-#ifndef __APPLE__
-// FIXME
-// On Apple this error occurs:
-//	Undefined symbols for architecture x86_64:
-//	  "_on_exit", referenced from:
-//	      _smpi_register_static in smpi_c99.c.o
-   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(&registered_static_stack);
 }