X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56136bb036c18df44cadd46cf5bd861c5bedcf0f..111463df0d9a94d78e136d3d81ff828ea96a2cac:/src/xbt/xbt_queue.c

diff --git a/src/xbt/xbt_queue.c b/src/xbt/xbt_queue.c
index 50a3d300bd..0c45196a7b 100644
--- a/src/xbt/xbt_queue.c
+++ b/src/xbt/xbt_queue.c
@@ -16,7 +16,7 @@
 
 #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_ {
@@ -145,21 +145,20 @@ void xbt_queue_shift(xbt_queue_t queue, void* const dst) {
  * @seealso #xbt_queue_push
  */
 void xbt_queue_push_timed(xbt_queue_t queue, const void *src,double delay) {
+	 double timeout = xbt_os_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 (xbt_os_time() >= timeout) {
+				xbt_mutex_unlock(queue->mutex);
+				THROW0(timeout_error,0,"Timeout");
+			}
 	 }
-		/* 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);
-	 }
+	 xbt_dynar_push(queue->data,src);
+	 xbt_cond_signal(queue->not_empty);
+	 xbt_mutex_unlock(queue->mutex);
 }
 
    
@@ -169,21 +168,20 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src,double delay) {
  * 
  */
 void xbt_queue_pop_timed(xbt_queue_t queue, void* const dst,double delay) {
+	 double timeout = xbt_os_time() + delay;
    xbt_mutex_lock(queue->mutex);
    if (xbt_dynar_length(queue->data) == 0) {
       DEBUG1("Queue %p empty. Waiting",queue);
       xbt_cond_timedwait(queue->not_empty,queue->mutex,delay);
+			/* check if a timeout occurs */
+			if (xbt_os_time() >= timeout) {
+				xbt_mutex_unlock(queue->mutex);
+				THROW0(timeout_error,0,"Timeout");
+			}
    }
-	 /* 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.
@@ -191,23 +189,20 @@ void xbt_queue_pop_timed(xbt_queue_t queue, void* const dst,double delay) {
  * @seealso #xbt_queue_unshift
  */
 void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,double delay) {
+	 double timeout = xbt_os_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 (xbt_os_time() >= timeout) {
+				xbt_mutex_unlock(queue->mutex);
+				THROW0(timeout_error,0,"Timeout");
+			}
    }
-	 /* 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);
 }
    
 
@@ -217,19 +212,18 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,double delay) {
  * 
  */
 void xbt_queue_shift_timed(xbt_queue_t queue, void* const dst,double delay) {
+	 double timeout = xbt_os_time() + delay;
    xbt_mutex_lock(queue->mutex);
-   if (xbt_dynar_length(queue->data) == 0) {
+   while (xbt_dynar_length(queue->data) == 0) {
       DEBUG1("Queue %p empty. Waiting",queue);
       xbt_cond_timedwait(queue->not_empty,queue->mutex,delay);
+			/* check if a timeout occurs */
+			if (xbt_os_time() >= timeout) {
+				xbt_mutex_unlock(queue->mutex);
+				THROW0(timeout_error,0,"Timeout");
+			}
    }
-	 /* 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);
 }