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
Some more debug output
[simgrid.git]
/
src
/
xbt
/
mallocator.c
diff --git
a/src/xbt/mallocator.c
b/src/xbt/mallocator.c
index
fcf4bc2
..
9fb74e2
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
@@
-39,6
+41,7
@@
xbt_mallocator_t xbt_mallocator_new(int size,
xbt_assert0(new_f != NULL && free_f != NULL && reset_f != NULL,"invalid parameter");
m = xbt_new0(s_xbt_mallocator_t, 1);
xbt_assert0(new_f != NULL && free_f != NULL && reset_f != NULL,"invalid parameter");
m = xbt_new0(s_xbt_mallocator_t, 1);
+ DEBUG1("Create mallocator %p",m);
m->objects = xbt_new0(void*, size);
m->max_size = size;
m->objects = xbt_new0(void*, size);
m->max_size = size;
@@
-63,7
+66,7
@@
void xbt_mallocator_free(xbt_mallocator_t m) {
int i;
xbt_assert0(m != NULL, "Invalid parameter");
int i;
xbt_assert0(m != NULL, "Invalid parameter");
-
+ DEBUG3("Frees mallocator %p (size:%d/%d)",m,m->current_size,m->max_size);
for (i = 0; i < m->current_size; i++) {
(*(m->free_f))(m->objects[i]);
}
for (i = 0; i < m->current_size; i++) {
(*(m->free_f))(m->objects[i]);
}
@@
-91,13
+94,14
@@
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];
}
else {
/* otherwise we must allocate a new object */
object = m->objects[--m->current_size];
}
else {
/* otherwise we must allocate a new object */
+ 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);
object = (*(m->new_f))();
}
(*(m->reset_f))(object);
@@
-122,10
+126,12
@@
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 */
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;
}
else {
/* otherwise we don't have a choice, we must free the object */
m->objects[m->current_size++] = object;
}
else {
/* otherwise we don't have a choice, we must free the object */
+ DEBUG3("Free deleted object: mallocator %p is full (size:%d/%d)",m,m->current_size,m->max_size);
(*(m->free_f))(object);
}
}
(*(m->free_f))(object);
}
}