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
Update copyright lines for 2022.
[simgrid.git]
/
src
/
xbt
/
mallocator.c
diff --git
a/src/xbt/mallocator.c
b/src/xbt/mallocator.c
index
041f82c
..
d4619b6
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-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-20
22
. 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. */
/* 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. */
@@
-46,13
+46,13
@@
static int initialization_done = 0;
static inline void lock_reset(xbt_mallocator_t m)
{
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) {
}
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 */;
}
}
/* nop */;
}
}
@@
-60,7
+60,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_clear(&m->lock, __ATOMIC_RELEASE
);
+
atomic_flag_clear(&m->lock
);
}
/**
}
/**
@@
-90,7
+90,7
@@
static inline int xbt_mallocator_is_active(void) {
* 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.
* 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 reinitiali
s
e an object of your datatype, called when you extract an object from the
+ * @param reset_f function to reinitiali
z
e 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.
* mallocator (can be NULL)
*
* Create and initialize a new mallocator for a given datatype.
@@
-125,11
+125,10
@@
xbt_mallocator_t xbt_mallocator_new(int size, pvoid_f_void_t new_f, void_f_pvoid
*/
void xbt_mallocator_free(xbt_mallocator_t m)
{
*/
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);
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 (i
nt i
= 0; i < m->current_size; i++) {
m->free_f(m->objects[i]);
}
xbt_free(m->objects);
m->free_f(m->objects[i]);
}
xbt_free(m->objects);
@@
-159,9
+158,8
@@
void *xbt_mallocator_get(xbt_mallocator_t m)
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) */
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);
int amount = MIN(m->max_size / 2, 1000);
- for (i = 0; i < amount; i++)
+ for (i
nt i
= 0; i < amount; i++)
m->objects[i] = m->new_f();
m->current_size = amount;
}
m->objects[i] = m->new_f();
m->current_size = amount;
}