X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/997eaf52ad0ae1eb34820b135c7ba884b2a17f3c..3676269c65359df0174fd13b6c11687992437df8:/src/xbt/xbt_queue.c diff --git a/src/xbt/xbt_queue.c b/src/xbt/xbt_queue.c index 76a828c046..6dc3c95f80 100644 --- a/src/xbt/xbt_queue.c +++ b/src/xbt/xbt_queue.c @@ -12,9 +12,7 @@ #include "xbt/log.h" #include "xbt/dynar.h" -#include "xbt/synchro.h" #include "xbt/queue.h" /* this module */ -#include "gras/virtu.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_queue, xbt, "Message exchanging queue"); @@ -80,7 +78,7 @@ void xbt_queue_push(xbt_queue_t queue, const void *src) xbt_mutex_acquire(queue->mutex); while (queue->capacity != 0 && queue->capacity == xbt_dynar_length(queue->data)) { - XBT_DEBUG("Capacity of %p exceded (=%d). Waiting", queue, + XBT_DEBUG("Capacity of %p exceeded (=%d). Waiting", queue, queue->capacity); xbt_cond_wait(queue->not_full, queue->mutex); } @@ -120,7 +118,7 @@ void xbt_queue_unshift(xbt_queue_t queue, const void *src) xbt_mutex_acquire(queue->mutex); while (queue->capacity != 0 && queue->capacity == xbt_dynar_length(queue->data)) { - XBT_DEBUG("Capacity of %p exceded (=%d). Waiting", queue, + XBT_DEBUG("Capacity of %p exceeded (=%d). Waiting", queue, queue->capacity); xbt_cond_wait(queue->not_full, queue->mutex); } @@ -168,7 +166,7 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay) xbt_mutex_release(queue->mutex); THROWF(timeout_error, 0, - "Capacity of %p exceded (=%d), and delay = 0", queue, + "Capacity of %p exceeded (=%d), and delay = 0", queue, queue->capacity); } } else { @@ -176,7 +174,7 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay) queue->capacity == xbt_dynar_length(queue->data) && (delay < 0 || (xbt_time() - begin) <= delay)) { - XBT_DEBUG("Capacity of %p exceded (=%d). Waiting", queue, + XBT_DEBUG("Capacity of %p exceeded (=%d). Waiting", queue, queue->capacity); TRY { xbt_cond_timedwait(queue->not_full, queue->mutex, @@ -248,7 +246,7 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src, xbt_mutex_release(queue->mutex); THROWF(timeout_error, 0, - "Capacity of %p exceded (=%d), and delay = 0", queue, + "Capacity of %p exceeded (=%d), and delay = 0", queue, queue->capacity); } } else { @@ -256,7 +254,7 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src, queue->capacity == xbt_dynar_length(queue->data) && (delay < 0 || (xbt_time() - begin) <= delay)) { - XBT_DEBUG("Capacity of %p exceded (=%d). Waiting", queue, + XBT_DEBUG("Capacity of %p exceeded (=%d). Waiting", queue, queue->capacity); TRY { xbt_cond_timedwait(queue->not_full, queue->mutex,