#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");
typedef struct s_xbt_queue_ {
*
* This is blocking if the declared capacity is non-nul, and if this amount is reached.
*
- * @seealso #xbt_dynar_push
+ * @see #xbt_dynar_push
*/
void xbt_queue_push(xbt_queue_t queue, const void *src) {
xbt_mutex_lock(queue->mutex);
*
* This is blocking if the queue is empty.
*
- * @seealso #xbt_dynar_pop
+ * @see #xbt_dynar_pop
*
*/
void xbt_queue_pop(xbt_queue_t queue, void* const dst) {
*
* This is blocking if the declared capacity is non-nul, and if this amount is reached.
*
- * @seealso #xbt_dynar_unshift
+ * @see #xbt_dynar_unshift
*/
void xbt_queue_unshift(xbt_queue_t queue, const void *src) {
xbt_mutex_lock(queue->mutex);
*
* This is blocking if the queue is empty.
*
- * @seealso #xbt_dynar_shift
+ * @see #xbt_dynar_shift
*
*/
void xbt_queue_shift(xbt_queue_t queue, void* const dst) {
/** @brief Push something to the message exchange queue, with a timeout.
*
- * @seealso #xbt_queue_push
+ * @see #xbt_queue_push
*/
void xbt_queue_push_timed(xbt_queue_t queue, const void *src,double delay) {
+ double timeout = xbt_time() + delay;
xbt_mutex_lock(queue->mutex);
- if (queue->capacity != 0 && queue->capacity == xbt_dynar_length(queue->data)) {
- DEBUG2("Capacity of %p exceded (=%d). Waiting",queue,queue->capacity);
- xbt_cond_timedwait(queue->not_full,queue->mutex, delay);
- }
- /* check if a timeout occurs */
- if (queue->capacity != 0 && queue->capacity == xbt_dynar_length(queue->data)) {
- xbt_mutex_unlock(queue->mutex);
- THROW0(timeout_error,0,"Timeout");
- }
- else {
- xbt_dynar_push(queue->data,src);
- xbt_cond_signal(queue->not_empty);
- xbt_mutex_unlock(queue->mutex);
+ while ( (queue->capacity != 0) && (queue->capacity == xbt_dynar_length(queue->data)) && (xbt_time() < timeout) ) {
+ DEBUG2("Capacity of %p exceded (=%d). Waiting",queue,queue->capacity);
+ xbt_cond_timedwait(queue->not_full,queue->mutex, timeout - xbt_time());
}
+ xbt_dynar_push(queue->data,src);
+ xbt_cond_signal(queue->not_empty);
+ xbt_mutex_unlock(queue->mutex);
}
/** @brief Pop something from the message exchange queue, with a timeout.
*
- * @seealso #xbt_queue_pop
+ * @see #xbt_queue_pop
*
*/
void xbt_queue_pop_timed(xbt_queue_t queue, void* const dst,double delay) {
+ double timeout = xbt_time() + delay;
xbt_mutex_lock(queue->mutex);
- if (xbt_dynar_length(queue->data) == 0) {
+ while ( (xbt_dynar_length(queue->data) == 0) && (xbt_time() < timeout) ) {
DEBUG1("Queue %p empty. Waiting",queue);
- xbt_cond_timedwait(queue->not_empty,queue->mutex,delay);
+ xbt_cond_timedwait(queue->not_empty,queue->mutex, timeout - xbt_time());
}
- /* check if a timeout occurs */
- if (xbt_dynar_length(queue->data) == 0) {
- xbt_mutex_unlock(queue->mutex);
- THROW0(timeout_error,0,"Timeout");
- }
- else {
- xbt_dynar_pop(queue->data,dst);
- xbt_cond_signal(queue->not_full);
- xbt_mutex_unlock(queue->mutex);
- }
+ xbt_dynar_pop(queue->data,dst);
+ xbt_cond_signal(queue->not_full);
+ xbt_mutex_unlock(queue->mutex);
}
/** @brief Unshift something to the message exchange queue, with a timeout.
*
- * @seealso #xbt_queue_unshift
+ * @see #xbt_queue_unshift
*/
void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,double delay) {
+ double timeout = xbt_time() + delay;
xbt_mutex_lock(queue->mutex);
- if (queue->capacity != 0 && queue->capacity == xbt_dynar_length(queue->data)) {
+ while ( (queue->capacity != 0) && (queue->capacity == xbt_dynar_length(queue->data)) && (xbt_time() < timeout) ) {
DEBUG2("Capacity of %p exceded (=%d). Waiting",queue,queue->capacity);
- xbt_cond_timedwait(queue->not_full,queue->mutex,delay);
+ xbt_cond_timedwait(queue->not_full,queue->mutex, timeout - xbt_time());
}
- /* check if a timeout occurs */
-
- if (queue->capacity != 0 && queue->capacity == xbt_dynar_length(queue->data)) {
-
- xbt_mutex_unlock(queue->mutex);
- THROW0(timeout_error,0,"Timeout");
- }
- else {
- xbt_dynar_unshift(queue->data,src);
- xbt_cond_signal(queue->not_empty);
- xbt_mutex_unlock(queue->mutex);
- }
+ xbt_dynar_unshift(queue->data,src);
+ xbt_cond_signal(queue->not_empty);
+ xbt_mutex_unlock(queue->mutex);
}
/** @brief Shift something from the message exchange queue, with a timeout.
*
- * @seealso #xbt_queue_shift
+ * @see #xbt_queue_shift
*
*/
void xbt_queue_shift_timed(xbt_queue_t queue, void* const dst,double delay) {
+ double timeout = xbt_time() + delay;
xbt_mutex_lock(queue->mutex);
- if (xbt_dynar_length(queue->data) == 0) {
+ while ( (xbt_dynar_length(queue->data) == 0) && (xbt_time() < timeout) ) {
DEBUG1("Queue %p empty. Waiting",queue);
- xbt_cond_timedwait(queue->not_empty,queue->mutex,delay);
+ xbt_cond_timedwait(queue->not_empty,queue->mutex, timeout - xbt_time());
}
- /* check if a timeout occurs */
- if (xbt_dynar_length(queue->data) == 0) {
- xbt_mutex_unlock(queue->mutex);
- THROW0(timeout_error,0,"Timeout");
- }
- else {
- xbt_dynar_shift(queue->data,dst);
- xbt_cond_signal(queue->not_full);
- xbt_mutex_unlock(queue->mutex);
- }
+ xbt_dynar_shift(queue->data,dst);
+ xbt_cond_signal(queue->not_full);
+ xbt_mutex_unlock(queue->mutex);
}