A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new entry in Release_Notes.
[simgrid.git]
/
include
/
smpi
/
sampi.h
diff --git
a/include/smpi/sampi.h
b/include/smpi/sampi.h
index
33246d5
..
984c437
100644
(file)
--- a/
include/smpi/sampi.h
+++ b/
include/smpi/sampi.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
23
. 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. */
/* 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. */
@@
-6,22
+6,27
@@
#ifndef SAMPI_H_
#define SAMPI_H_
#ifndef SAMPI_H_
#define SAMPI_H_
+#define SMPI_NO_OVERRIDE_MALLOC
#include <stdlib.h>
#include <smpi/smpi.h>
#define AMPI_CALL(type, name, args) \
#include <stdlib.h>
#include <smpi/smpi.h>
#define AMPI_CALL(type, name, args) \
- type
A##name args __attribute__((weak));
\
- type
AP##name
args;
+ type
_XBT_CONCAT(A, name) args __attribute__((weak));
\
+ type
_XBT_CONCAT(AP, name)
args;
#ifndef HAVE_SMPI
#ifndef HAVE_SMPI
+#undef malloc
+#undef calloc
+#undef realloc
+#undef free
// Internally disable these overrides (HAVE_SMPI is only defined when building the library)
#define malloc(nbytes) _sampi_malloc(nbytes)
// Internally disable these overrides (HAVE_SMPI is only defined when building the library)
#define malloc(nbytes) _sampi_malloc(nbytes)
-#define calloc(n_elm,
elm_size) _sampi_calloc(n_elm,elm_size
)
-#define realloc(ptr,
nbytes) _sampi_realloc(ptr,nbytes
)
+#define calloc(n_elm,
elm_size) _sampi_calloc((n_elm), (elm_size)
)
+#define realloc(ptr,
nbytes) _sampi_realloc((ptr), (nbytes)
)
#define free(ptr) _sampi_free(ptr)
#endif
#define free(ptr) _sampi_free(ptr)
#endif
-SG_BEGIN_DECL
()
+SG_BEGIN_DECL
XBT_PUBLIC void* _sampi_malloc(size_t size);
XBT_PUBLIC void* _sampi_calloc(size_t n_elm, size_t elm_size);
XBT_PUBLIC void* _sampi_malloc(size_t size);
XBT_PUBLIC void* _sampi_calloc(size_t n_elm, size_t elm_size);
@@
-32,6
+37,6
@@
AMPI_CALL(XBT_PUBLIC int, MPI_Iteration_in, (MPI_Comm comm))
AMPI_CALL(XBT_PUBLIC int, MPI_Iteration_out, (MPI_Comm comm))
AMPI_CALL(XBT_PUBLIC void, MPI_Migrate, (MPI_Comm comm))
AMPI_CALL(XBT_PUBLIC int, MPI_Iteration_out, (MPI_Comm comm))
AMPI_CALL(XBT_PUBLIC void, MPI_Migrate, (MPI_Comm comm))
-SG_END_DECL
()
+SG_END_DECL
#endif
#endif