if (MALLOCATOR_IS_ENABLED) {
m->objects = xbt_new0(void *, size);
m->max_size = size;
+ m->mutex = xbt_os_mutex_init();
} else {
if (!MALLOCATOR_IS_WANTED) /* Warn to avoid to commit debugging settings */
XBT_WARN("Mallocator is disabled!");
m->objects = NULL;
m->max_size = 0;
+ m->mutex = NULL;
}
-
return m;
}
m->free_f(m->objects[i]);
}
xbt_free(m->objects);
+ xbt_os_mutex_destroy(m->mutex);
xbt_free(m);
}
void *object;
if (MALLOCATOR_IS_ENABLED) {
+ xbt_os_mutex_acquire(m->mutex);
if (m->current_size <= 0) {
/* No object is ready yet. Create a bunch of them to try to group the
* mallocs on the same memory pages (to help the cache lines) */
/* XBT_DEBUG("Reuse an old object for mallocator %p (size:%d/%d)", */
/* m, m->current_size, m->max_size); */
object = m->objects[--m->current_size];
+ xbt_os_mutex_release(m->mutex);
} else {
object = m->new_f();
}
*/
void xbt_mallocator_release(xbt_mallocator_t m, void *object)
{
- if (m->current_size < m->max_size) {
- /* there is enough place to push the object */
- /* XBT_DEBUG
- ("Store deleted object in mallocator %p for further use (size:%d/%d)",
+ if (MALLOCATOR_IS_ENABLED) {
+ xbt_os_mutex_acquire(m->mutex);
+ if (m->current_size < m->max_size) {
+ /* there is enough place to push the object */
+ /* XBT_DEBUG
+ ("Store deleted object in mallocator %p for further use (size:%d/%d)",
m, m->current_size, m->max_size); */
- m->objects[m->current_size++] = object;
+ m->objects[m->current_size++] = object;
+ xbt_os_mutex_release(m->mutex);
+ } else {
+ xbt_os_mutex_release(m->mutex);
+ /* otherwise we don't have a choice, we must free the object */
+ /* XBT_DEBUG("Free deleted object: mallocator %p is full (size:%d/%d)", m,
+ m->current_size, m->max_size); */
+ m->free_f(object);
+ }
} else {
- /* otherwise we don't have a choice, we must free the object */
- /* XBT_DEBUG("Free deleted object: mallocator %p is full (size:%d/%d)", m,
- m->current_size, m->max_size); */
m->free_f(object);
}
}