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
rename the plugins from the command line, and document it
[simgrid.git]
/
src
/
xbt
/
mallocator.c
diff --git
a/src/xbt/mallocator.c
b/src/xbt/mallocator.c
index
f12abcd
..
9b7bd8e
100644
(file)
--- a/
src/xbt/mallocator.c
+++ b/
src/xbt/mallocator.c
@@
-13,6
+13,13
@@
#include "xbt/asserts.h"
#include "xbt/sysdep.h"
#include "xbt/asserts.h"
#include "xbt/sysdep.h"
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
/** Implementation note on the mallocators:
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
/** Implementation note on the mallocators:
@@
-40,13
+47,13
@@
static int initialization_done = 0;
static inline void lock_reset(xbt_mallocator_t m)
{
static inline void lock_reset(xbt_mallocator_t m)
{
-
atomic_flag_clear(&m->lock)
;
+
m->lock = 0
;
}
static inline void lock_acquire(xbt_mallocator_t m)
{
if (initialization_done > 1) {
}
static inline void lock_acquire(xbt_mallocator_t m)
{
if (initialization_done > 1) {
- while (
atomic_flag_test_and_set(&m->lock
))
+ while (
__atomic_test_and_set(&m->lock, __ATOMIC_ACQUIRE
))
/* nop */;
}
}
/* nop */;
}
}
@@
-54,7
+61,7
@@
static inline void lock_acquire(xbt_mallocator_t m)
static inline void lock_release(xbt_mallocator_t m)
{
if (initialization_done > 1)
static inline void lock_release(xbt_mallocator_t m)
{
if (initialization_done > 1)
-
atomic_flag_clear(&m->lock
);
+
__atomic_clear(&m->lock, __ATOMIC_RELEASE
);
}
/**
}
/**