- 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);
- THROW1(timeout_error,0,"Timeout (delay was %f)",delay);
- }
- }
- xbt_dynar_unshift(queue->data,src);
- xbt_cond_signal(queue->not_empty);
- xbt_mutex_unlock(queue->mutex);
+ double timeout = xbt_time() + delay;
+ xbt_ex_t e;
+
+ xbt_mutex_lock(queue->mutex);
+
+ if (delay==0) {
+ if (queue->capacity != 0 &&
+ queue->capacity == xbt_dynar_length(queue->data)) {
+
+ xbt_mutex_unlock(queue->mutex);
+ THROW2(timeout_error,0,"Capacity of %p exceded (=%d), and delay = 0",
+ queue,queue->capacity);
+ }
+ } else {
+ while (queue->capacity != 0 &&
+ queue->capacity == xbt_dynar_length(queue->data) &&
+ (delay<0 || xbt_time() < timeout) ) {
+
+ DEBUG2("Capacity of %p exceded (=%d). Waiting",
+ queue,queue->capacity);
+ TRY {
+ xbt_cond_timedwait(queue->not_full,queue->mutex,
+ delay < 0 ? -1 : timeout - xbt_time());
+ } CATCH(e) {
+ xbt_mutex_unlock(queue->mutex);
+ RETHROW;
+ }
+ }
+ }
+
+ xbt_dynar_unshift(queue->data,src);
+ xbt_cond_signal(queue->not_empty);
+ xbt_mutex_unlock(queue->mutex);