X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b86d2dae6ca1d3b4beed12f4dfc08611f7f1c4b..c86fbd9ddd59c63d254ddc5f9f661889419df5f9:/include/smpi/smpi_helpers.h

diff --git a/include/smpi/smpi_helpers.h b/include/smpi/smpi_helpers.h
index 6f279ceee4..3e693c00d5 100644
--- a/include/smpi/smpi_helpers.h
+++ b/include/smpi/smpi_helpers.h
@@ -1,16 +1,40 @@
-#include <sys/time.h> /* Load it before the define next line to not mess with the system headers */
+/* Copyright (c) 2018-2020. 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. */
+
+#ifndef SMPI_HELPERS_H
+#define SMPI_HELPERS_H
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <smpi/smpi_helpers_internal.h>
+#ifndef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
 #define sleep(x) smpi_sleep(x)
 #define usleep(x) smpi_usleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
+#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))
+#endif
+
+#define gettimeofday(x, y) smpi_gettimeofday((x), 0)
 #if _POSIX_TIMERS > 0
-#define nanosleep(x, y) smpi_nanosleep(x, y)
-#define clock_gettime(x, y) smpi_clock_gettime(x, y)
+#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))
 #endif
-#if SIMGRID_HAVE_MC
-#undef assert
-#define assert(x) MC_assert(x)
+#define clock_gettime(x, y) smpi_clock_gettime((x), (y))
 #endif
 
-#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(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 SMPI_NO_OVERRIDE_MALLOC
+#define malloc(x) smpi_shared_malloc_intercept((x), __FILE__, __LINE__)
+#define calloc(x, y) smpi_shared_calloc_intercept((x), (y), __FILE__, __LINE__)
+#define free(x) smpi_shared_free(x)
+#endif
+#endif