* mallocators should be protected from concurrent accesses. */
static int initialization_done = 0;
-static XBT_INLINE void lock_create(xbt_mallocator_t m)
+static XBT_INLINE void lock_reset(xbt_mallocator_t m)
{
- m->mutex = initialization_done > 1 ? xbt_os_mutex_init() : NULL;
-}
-
-static XBT_INLINE void lock_destroy(xbt_mallocator_t m)
-{
- if (m->mutex)
- xbt_os_mutex_destroy(m->mutex);
+ m->lock = 0;
}
static XBT_INLINE void lock_acquire(xbt_mallocator_t m)
{
- if (m->mutex)
- xbt_os_mutex_acquire(m->mutex);
+ if (initialization_done > 1) {
+ int *lock = &m->lock;
+ while (__sync_lock_test_and_set(lock, 1))
+ /* nop */;
+ }
}
static XBT_INLINE void lock_release(xbt_mallocator_t m)
{
- if (m->mutex)
- xbt_os_mutex_release(m->mutex);
+ if (initialization_done > 1)
+ __sync_lock_release(&m->lock);
}
/**
m->free_f(m->objects[i]);
}
xbt_free(m->objects);
- lock_destroy(m);
xbt_free(m);
}
if (xbt_mallocator_is_active()) {
// We have to switch this mallocator from inactive to active (and then get an object)
m->objects = xbt_new0(void *, m->max_size);
- lock_create(m);
+ lock_reset(m);
return xbt_mallocator_get(m);
} else {
object = m->new_f();
if (xbt_mallocator_is_active()) {
// We have to switch this mallocator from inactive to active (and then store that object)
m->objects = xbt_new0(void *, m->max_size);
- lock_create(m);
+ lock_reset(m);
xbt_mallocator_release(m,object);
} else {
m->free_f(object);