X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e16e02338a20ee10478d01659df54ed60dea1101..64e6fb4f866f22aed3dfb2282129a500b82c42c2:/include/smpi/smpi_helpers.h

diff --git a/include/smpi/smpi_helpers.h b/include/smpi/smpi_helpers.h
index 543f702a53..3e94332278 100644
--- a/include/smpi/smpi_helpers.h
+++ b/include/smpi/smpi_helpers.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2021. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -15,8 +15,8 @@
 #define sleep(x) smpi_sleep(x)
 #define usleep(x) smpi_usleep(x)
 #else
-#define sleep(x) { smpi_trace_set_call_location(__FILE__,__LINE__); smpi_sleep(x); }
-#define usleep(x) { smpi_trace_set_call_location(__FILE__,__LINE__); smpi_usleep(x); }
+#define sleep(x) (smpi_trace_set_call_location(__FILE__, __LINE__), smpi_sleep(x))
+#define usleep(x) (smpi_trace_set_call_location(__FILE__, __LINE__), smpi_usleep(x))
 #endif
 
 #define gettimeofday(x, y) smpi_gettimeofday((x), 0)
@@ -24,7 +24,7 @@
 #ifndef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
 #define nanosleep(x, y) smpi_nanosleep((x), (y))
 #else
-#define nanosleep(x) { smpi_trace_set_call_location(__FILE__,__LINE__); smpi_nanosleep(x); }
+#define nanosleep(x) (smpi_trace_set_call_location(__FILE__, __LINE__), smpi_nanosleep(x))
 #endif
 #define clock_gettime(x, y) smpi_clock_gettime((x), (y))
 #endif
@@ -32,9 +32,26 @@
 #define getopt(x, y, z) smpi_getopt((x), (y), (z))
 #define getopt_long(x, y, z, a, b) smpi_getopt_long((x), (y), (z), (a), (b))
 #define getopt_long_only(x, y, z, a, b) smpi_getopt_long_only((x), (y), (z), (a), (b))
-#ifndef SAMPI_OVERRIDEN_MALLOC
-#define malloc(x) smpi_shared_malloc_intercept(x, __FILE__, __LINE__)
-#define calloc(x,y) smpi_shared_calloc_intercept(x,y, __FILE__, __LINE__)
+#ifndef SMPI_NO_OVERRIDE_MALLOC
+#ifdef __cplusplus
+namespace std {
+    extern "C" void* smpi_shared_malloc_intercept(size_t size, const char* file, int line);
+    extern "C" void* smpi_shared_calloc_intercept(size_t num_elm, size_t elem_size, const char* file, int line);
+    extern "C" void* smpi_shared_realloc_intercept(void* data, size_t size, const char* file, int line);
+    extern "C" void smpi_shared_free(void* ptr);
+}
+#endif
+#define malloc(x) smpi_shared_malloc_intercept((x), __FILE__, __LINE__)
+#define calloc(x, y) smpi_shared_calloc_intercept((x), (y), __FILE__, __LINE__)
+#define realloc(x, y) smpi_shared_realloc_intercept((x), (y), __FILE__, __LINE__)
 #define free(x) smpi_shared_free(x)
 #endif
+
+#ifdef __cplusplus
+namespace std {
+  extern "C" __attribute__((noreturn)) void smpi_exit(int status);
+}
+#endif
+#define exit(x) smpi_exit(x)
+
 #endif