This structure was not necessary

[simgrid.git] / src / xbt / xbt_queue.c

diff --git a/src/xbt/xbt_queue.c b/src/xbt/xbt_queue.c
index ba6315e..7a38199 100644 (file)
--- a/src/xbt/xbt_queue.c
+++ b/src/xbt/xbt_queue.c
@@ -55,7 +55,7 @@ void xbt_queue_free(xbt_queue_t * queue)
   xbt_mutex_destroy((*queue)->mutex);
   xbt_cond_destroy((*queue)->not_full);
   xbt_cond_destroy((*queue)->not_empty);
-  free((*queue));
+  free(*queue);
   *queue = NULL;
 }
 
@@ -159,7 +159,6 @@ void xbt_queue_shift(xbt_queue_t queue, void *const dst)
 void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
 {
   double begin = xbt_time();
-  xbt_ex_t e;
 
   xbt_mutex_acquire(queue->mutex);
 
@@ -168,7 +167,7 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
         queue->capacity == xbt_dynar_length(queue->data)) {
 
       xbt_mutex_release(queue->mutex);
-      THROW2(timeout_error, 0,
+      THROWF(timeout_error, 0,
              "Capacity of %p exceded (=%d), and delay = 0", queue,
              queue->capacity);
     }
@@ -183,7 +182,7 @@ void xbt_queue_push_timed(xbt_queue_t queue, const void *src, double delay)
         xbt_cond_timedwait(queue->not_full, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
-      CATCH(e) {
+      CATCH_ANONYMOUS {
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
@@ -204,14 +203,13 @@ 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 begin = xbt_time();
-  xbt_ex_t e;
 
   xbt_mutex_acquire(queue->mutex);
 
   if (delay == 0) {
     if (xbt_dynar_length(queue->data) == 0) {
       xbt_mutex_release(queue->mutex);
-      THROW0(timeout_error, 0, "Delay = 0, and queue is empty");
+      THROWF(timeout_error, 0, "Delay = 0, and queue is empty");
     }
   } else {
     while ((xbt_dynar_length(queue->data) == 0) &&
@@ -221,7 +219,7 @@ void xbt_queue_pop_timed(xbt_queue_t queue, void *const dst, double delay)
         xbt_cond_timedwait(queue->not_empty, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
-      CATCH(e) {
+      CATCH_ANONYMOUS {
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
@@ -241,7 +239,6 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
                              double delay)
 {
   double begin = xbt_time();
-  xbt_ex_t e;
 
   xbt_mutex_acquire(queue->mutex);
 
@@ -250,7 +247,7 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
         queue->capacity == xbt_dynar_length(queue->data)) {
 
       xbt_mutex_release(queue->mutex);
-      THROW2(timeout_error, 0,
+      THROWF(timeout_error, 0,
              "Capacity of %p exceded (=%d), and delay = 0", queue,
              queue->capacity);
     }
@@ -265,7 +262,7 @@ void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
         xbt_cond_timedwait(queue->not_full, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
-      CATCH(e) {
+      CATCH_ANONYMOUS {
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
@@ -287,14 +284,13 @@ void xbt_queue_shift_timed(xbt_queue_t queue, void *const dst,
                            double delay)
 {
   double begin = xbt_time();
-  xbt_ex_t e;
 
   xbt_mutex_acquire(queue->mutex);
 
   if (delay == 0) {
     if (xbt_dynar_length(queue->data) == 0) {
       xbt_mutex_release(queue->mutex);
-      THROW0(timeout_error, 0, "Delay = 0, and queue is empty");
+      THROWF(timeout_error, 0, "Delay = 0, and queue is empty");
     }
   } else {
     while ((xbt_dynar_length(queue->data) == 0) &&
@@ -304,7 +300,7 @@ void xbt_queue_shift_timed(xbt_queue_t queue, void *const dst,
         xbt_cond_timedwait(queue->not_empty, queue->mutex,
                            delay < 0 ? -1 : delay - (xbt_time() - begin));
       }
-      CATCH(e) {
+      CATCH_ANONYMOUS {
         xbt_mutex_release(queue->mutex);
         RETHROW;
       }
@@ -313,7 +309,7 @@ void xbt_queue_shift_timed(xbt_queue_t queue, void *const dst,
 
   if (xbt_dynar_length(queue->data) == 0) {
     xbt_mutex_release(queue->mutex);
-    THROW1(timeout_error, 0, "Timeout (%f) elapsed, but queue still empty",
+    THROWF(timeout_error, 0, "Timeout (%f) elapsed, but queue still empty",
            delay);
   }