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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
mallocator.c
diff --git
a/src/xbt/mallocator.c
b/src/xbt/mallocator.c
index
1088355
..
f355354
100644
(file)
--- a/
src/xbt/mallocator.c
+++ b/
src/xbt/mallocator.c
@@
-1,6
+1,6
@@
/* mallocator - recycle objects to avoid malloc() / free() */
/* mallocator - recycle objects to avoid malloc() / free() */
-/* Copyright (c) 2006-201
1
. The SimGrid Team.
+/* Copyright (c) 2006-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-42,12
+42,12
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
* mallocators should be protected from concurrent accesses. */
static int initialization_done = 0;
* mallocators should be protected from concurrent accesses. */
static int initialization_done = 0;
-static
XBT_INLINE
void lock_reset(xbt_mallocator_t m)
+static
inline
void lock_reset(xbt_mallocator_t m)
{
m->lock = 0;
}
{
m->lock = 0;
}
-static
XBT_INLINE
void lock_acquire(xbt_mallocator_t m)
+static
inline
void lock_acquire(xbt_mallocator_t m)
{
if (initialization_done > 1) {
int *lock = &m->lock;
{
if (initialization_done > 1) {
int *lock = &m->lock;
@@
-56,7
+56,7
@@
static XBT_INLINE void lock_acquire(xbt_mallocator_t m)
}
}
}
}
-static
XBT_INLINE
void lock_release(xbt_mallocator_t m)
+static
inline
void lock_release(xbt_mallocator_t m)
{
if (initialization_done > 1)
__sync_lock_release(&m->lock);
{
if (initialization_done > 1)
__sync_lock_release(&m->lock);
@@
-76,7
+76,7
@@
void xbt_mallocator_initialization_is_done(int protect)
}
/** used by the module to know if it's time to activate the mallocators yet */
}
/** used by the module to know if it's time to activate the mallocators yet */
-static
XBT_INLINE
int xbt_mallocator_is_active(void) {
+static
inline
int xbt_mallocator_is_active(void) {
#if MALLOCATOR_COMPILED_IN
return initialization_done && !MC_is_active();
#else
#if MALLOCATOR_COMPILED_IN
return initialization_done && !MC_is_active();
#else