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
conditions are not semaphores. signals can get lost if delivered before you are waiti...
[simgrid.git]
/
src
/
xbt
/
mallocator.c
diff --git
a/src/xbt/mallocator.c
b/src/xbt/mallocator.c
index
fcf4bc2
..
460dda8
100644
(file)
--- a/
src/xbt/mallocator.c
+++ b/
src/xbt/mallocator.c
@@
-10,6
+10,8
@@
#include "xbt/sysdep.h"
#include "mallocator_private.h"
#include "xbt/sysdep.h"
#include "mallocator_private.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
+
/**
* \brief Constructor
* \param size size of the internal stack: number of objects the mallocator
/**
* \brief Constructor
* \param size size of the internal stack: number of objects the mallocator
@@
-20,7
+22,7
@@
* 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
* 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 mallocator
+ * when you extract an object from the mallocator
*
* Create and initialize a new mallocator for a given datatype.
*
*
* Create and initialize a new mallocator for a given datatype.
*
@@
-28,19
+30,24
@@
* \see xbt_mallocator_free()
*/
xbt_mallocator_t xbt_mallocator_new(int size,
* \see xbt_mallocator_free()
*/
xbt_mallocator_t xbt_mallocator_new(int size,
- pvoid_f_void_t new_f,
- void_f_pvoid_t free_f,
- void_f_pvoid_t reset_f) {
+ pvoid_f_void_t new_f,
+ void_f_pvoid_t free_f,
+ void_f_pvoid_t reset_f)
+{
xbt_mallocator_t m;
xbt_assert0(size > 0, "size must be positive");
xbt_mallocator_t m;
xbt_assert0(size > 0, "size must be positive");
- xbt_assert0(new_f != NULL && free_f != NULL && reset_f != NULL,"invalid parameter");
+ xbt_assert0(new_f != NULL && free_f != NULL
+ && reset_f != NULL, "invalid parameter");
m = xbt_new0(s_xbt_mallocator_t, 1);
m = xbt_new0(s_xbt_mallocator_t, 1);
+ VERB1("Create mallocator %p", m);
+ if (XBT_LOG_ISENABLED(xbt_mallocator, xbt_log_priority_verbose))
+ xbt_backtrace_display_current();
- m->objects = xbt_new0(void*, size);
+ m->objects = xbt_new0(void
*, size);
m->max_size = size;
m->current_size = 0;
m->new_f = new_f;
m->max_size = size;
m->current_size = 0;
m->new_f = new_f;
@@
-58,14
+65,15
@@
xbt_mallocator_t xbt_mallocator_new(int size,
*
* \see xbt_mallocator_new()
*/
*
* \see xbt_mallocator_new()
*/
-void xbt_mallocator_free(xbt_mallocator_t m) {
+void xbt_mallocator_free(xbt_mallocator_t m)
+{
int i;
xbt_assert0(m != NULL, "Invalid parameter");
int i;
xbt_assert0(m != NULL, "Invalid parameter");
-
+ VERB3("Frees mallocator %p (size:%d/%d)", m, m->current_size, m->max_size);
for (i = 0; i < m->current_size; i++) {
for (i = 0; i < m->current_size; i++) {
- (*(m->free_f))(m->objects[i]);
+ (*(m->free_f))
(m->objects[i]);
}
xbt_free(m->objects);
xbt_free(m);
}
xbt_free(m->objects);
xbt_free(m);
@@
-79,28
+87,31
@@
void xbt_mallocator_free(xbt_mallocator_t m) {
* This function is designed to be used instead of malloc().
* If the mallocator is not empty, an object is
* extracted from the mallocator and no malloc is done.
* This function is designed to be used instead of malloc().
* If the mallocator is not empty, an object is
* extracted from the mallocator and no malloc is done.
- *
+ *
* If the mallocator is empty, a new object is created,
* by calling the function new_f().
* If the mallocator is empty, a new object is created,
* by calling the function new_f().
- *
+ *
* In both cases, the function reset_f() is called on the object.
*
* \see xbt_mallocator_release()
*/
* In both cases, the function reset_f() is called on the object.
*
* \see xbt_mallocator_release()
*/
-void *xbt_mallocator_get(xbt_mallocator_t m) {
+void *xbt_mallocator_get(xbt_mallocator_t m)
+{
void *object;
xbt_assert0(m != NULL, "Invalid parameter");
void *object;
xbt_assert0(m != NULL, "Invalid parameter");
-
if (m->current_size > 0) {
/* there is at least an available object */
if (m->current_size > 0) {
/* there is at least an available object */
+ DEBUG3("Reuse an old object for mallocator %p (size:%d/%d)", m,
+ m->current_size, m->max_size);
object = m->objects[--m->current_size];
object = m->objects[--m->current_size];
- }
- else {
+ } else {
/* otherwise we must allocate a new object */
/* otherwise we must allocate a new object */
- object = (*(m->new_f))();
+ DEBUG3("Create a new object for mallocator %p (size:%d/%d)", m,
+ m->current_size, m->max_size);
+ object = (*(m->new_f)) ();
}
}
- (*(m->reset_f))(object);
+ (*(m->reset_f))
(object);
return object;
}
return object;
}
@@
-117,15
+128,20
@@
void *xbt_mallocator_get(xbt_mallocator_t m) {
*
* \see xbt_mallocator_get()
*/
*
* \see xbt_mallocator_get()
*/
-void xbt_mallocator_release(xbt_mallocator_t m, void *object) {
+void xbt_mallocator_release(xbt_mallocator_t m, void *object)
+{
xbt_assert0(m != NULL && object != NULL, "Invalid parameter");
if (m->current_size < m->max_size) {
/* there is enough place to push the object */
xbt_assert0(m != NULL && object != NULL, "Invalid parameter");
if (m->current_size < m->max_size) {
/* there is enough place to push the object */
+ DEBUG3
+ ("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;
- }
- else {
+ } else {
/* otherwise we don't have a choice, we must free the object */
/* otherwise we don't have a choice, we must free the object */
- (*(m->free_f))(object);
+ DEBUG3("Free deleted object: mallocator %p is full (size:%d/%d)", m,
+ m->current_size, m->max_size);
+ (*(m->free_f)) (object);
}
}
}
}