/* mallocator - recycle objects to avoid malloc() / free() */
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2023. 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. */
static inline void lock_reset(xbt_mallocator_t m)
{
- m->lock = 0;
+ atomic_flag_clear(&m->lock);
}
static inline void lock_acquire(xbt_mallocator_t m)
{
if (initialization_done > 1) {
- while (__atomic_test_and_set(&m->lock, __ATOMIC_ACQUIRE))
+ while (atomic_flag_test_and_set(&m->lock))
/* nop */;
}
}
static inline void lock_release(xbt_mallocator_t m)
{
if (initialization_done > 1)
- __atomic_clear(&m->lock, __ATOMIC_RELEASE);
+ atomic_flag_clear(&m->lock);
}
/**
- * This function must be called once the framework configuration is done. If not, mallocators will never get used.
- * Check the implementation notes in src/xbt/mallocator.c for the justification of this.
+ * This function must be called once the framework configuration is done. mallocators will not get used until it's
+ * called (check the implementation notes above for more info).
*
- * For example, surf_config uses this function to tell to the mallocators that the simgrid configuration is now
- * finished and that it can create them if not done yet */
-void xbt_mallocator_initialization_is_done(int protect)
+ * sg_config uses this function to inform the mallocators when simgrid is configured, and whether lock protection is
+ * needed.
+ */
+void xbt_mallocator_initialization_is_done(int need_protection)
{
- initialization_done = protect ? 2 : 1;
+ initialization_done = need_protection ? 2 : 1;
}
/** used by the module to know if it's time to activate the mallocators yet */
* mallocator is empty
* @param free_f function to free an object of your datatype, called in @a xbt_mallocator_release() when the stack is
* full, and when the mallocator is freed.
- * @param reset_f function to reinitialise an object of your datatype, called when you extract an object from the
+ * @param reset_f function to reinitialize an object of your datatype, called when you extract an object from the
* mallocator (can be NULL)
*
* Create and initialize a new mallocator for a given datatype.
*/
void xbt_mallocator_free(xbt_mallocator_t m)
{
- int i;
xbt_assert(m != NULL, "Invalid parameter");
XBT_VERB("Frees mallocator %p (size:%d/%d)", m, m->current_size, m->max_size);
- for (i = 0; i < m->current_size; i++) {
+ for (int i = 0; i < m->current_size; i++) {
m->free_f(m->objects[i]);
}
xbt_free(m->objects);
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) */
- int i;
int amount = MIN(m->max_size / 2, 1000);
- for (i = 0; i < amount; i++)
+ for (int i = 0; i < amount; i++)
m->objects[i] = m->new_f();
m->current_size = amount;
}