A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Disable optimisation for xbt when using MC
[simgrid.git]
/
src
/
xbt
/
xbt_queue.c
diff --git
a/src/xbt/xbt_queue.c
b/src/xbt/xbt_queue.c
index
b3829bd
..
68be624
100644
(file)
--- a/
src/xbt/xbt_queue.c
+++ b/
src/xbt/xbt_queue.c
@@
-1,7
+1,7
@@
/* A (synchronized) message queue. */
/* Popping an empty queue is blocking, as well as pushing a full one */
/* A (synchronized) message queue. */
/* Popping an empty queue is blocking, as well as pushing a full one */
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,10
+11,9
@@
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
+#include "xbt/synchro_core.h"
-#include "xbt/synchro.h"
#include "xbt/queue.h" /* this module */
#include "xbt/queue.h" /* this module */
-#include "gras/virtu.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_queue, xbt,
"Message exchanging queue");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_queue, xbt,
"Message exchanging queue");
@@
-33,7
+32,8
@@
typedef struct s_xbt_queue_ {
xbt_queue_t xbt_queue_new(int capacity, unsigned long elm_size)
{
xbt_queue_t res = xbt_new0(s_xbt_queue_t, 1);
xbt_queue_t xbt_queue_new(int capacity, unsigned long elm_size)
{
xbt_queue_t res = xbt_new0(s_xbt_queue_t, 1);
- xbt_assert0(capacity >= 0, "Capacity cannot be negative");
+ if (capacity<0)
+ capacity=0;
res->capacity = capacity;
res->data = xbt_dynar_new(elm_size, NULL);
res->capacity = capacity;
res->data = xbt_dynar_new(elm_size, NULL);
@@
-54,7
+54,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);
xbt_mutex_destroy((*queue)->mutex);
xbt_cond_destroy((*queue)->not_full);
xbt_cond_destroy((*queue)->not_empty);
- free(
(*queue)
);
+ free(
*queue
);
*queue = NULL;
}
*queue = NULL;
}
@@
-79,7
+79,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_mutex_acquire(queue->mutex);
while (queue->capacity != 0
&& queue->capacity == xbt_dynar_length(queue->data)) {
-
DEBUG2("Capacity of %p exc
eded (=%d). Waiting", queue,
+
XBT_DEBUG("Capacity of %p exce
eded (=%d). Waiting", queue,
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
@@
-99,8
+99,8
@@
void xbt_queue_push(xbt_queue_t queue, const void *src)
void xbt_queue_pop(xbt_queue_t queue, void *const dst)
{
xbt_mutex_acquire(queue->mutex);
void xbt_queue_pop(xbt_queue_t queue, void *const dst)
{
xbt_mutex_acquire(queue->mutex);
- while (xbt_dynar_
length(queue->data) == 0
) {
-
DEBUG1
("Queue %p empty. Waiting", queue);
+ while (xbt_dynar_
is_empty(queue->data)
) {
+
XBT_DEBUG
("Queue %p empty. Waiting", queue);
xbt_cond_wait(queue->not_empty, queue->mutex);
}
xbt_dynar_pop(queue->data, dst);
xbt_cond_wait(queue->not_empty, queue->mutex);
}
xbt_dynar_pop(queue->data, dst);
@@
-119,7
+119,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_mutex_acquire(queue->mutex);
while (queue->capacity != 0
&& queue->capacity == xbt_dynar_length(queue->data)) {
-
DEBUG2("Capacity of %p exc
eded (=%d). Waiting", queue,
+
XBT_DEBUG("Capacity of %p exce
eded (=%d). Waiting", queue,
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
@@
-139,8
+139,8
@@
void xbt_queue_unshift(xbt_queue_t queue, const void *src)
void xbt_queue_shift(xbt_queue_t queue, void *const dst)
{
xbt_mutex_acquire(queue->mutex);
void xbt_queue_shift(xbt_queue_t queue, void *const dst)
{
xbt_mutex_acquire(queue->mutex);
- while (xbt_dynar_
length(queue->data) == 0
) {
-
DEBUG1
("Queue %p empty. Waiting", queue);
+ while (xbt_dynar_
is_empty(queue->data)
) {
+
XBT_DEBUG
("Queue %p empty. Waiting", queue);
xbt_cond_wait(queue->not_empty, queue->mutex);
}
xbt_dynar_shift(queue->data, dst);
xbt_cond_wait(queue->not_empty, queue->mutex);
}
xbt_dynar_shift(queue->data, dst);
@@
-158,7
+158,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();
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);
xbt_mutex_acquire(queue->mutex);
@@
-167,8
+166,8
@@
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);
queue->capacity == xbt_dynar_length(queue->data)) {
xbt_mutex_release(queue->mutex);
- THROW
2
(timeout_error, 0,
- "Capacity of %p exceded (=%d), and delay = 0", queue,
+ THROW
F
(timeout_error, 0,
+ "Capacity of %p exce
e
ded (=%d), and delay = 0", queue,
queue->capacity);
}
} else {
queue->capacity);
}
} else {
@@
-176,13
+175,13
@@
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)) {
queue->capacity == xbt_dynar_length(queue->data) &&
(delay < 0 || (xbt_time() - begin) <= delay)) {
-
DEBUG2("Capacity of %p exc
eded (=%d). Waiting", queue,
+
XBT_DEBUG("Capacity of %p exce
eded (=%d). Waiting", queue,
queue->capacity);
TRY {
xbt_cond_timedwait(queue->not_full, queue->mutex,
delay < 0 ? -1 : delay - (xbt_time() - begin));
}
queue->capacity);
TRY {
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;
}
xbt_mutex_release(queue->mutex);
RETHROW;
}
@@
-203,24
+202,23
@@
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();
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) {
xbt_mutex_acquire(queue->mutex);
if (delay == 0) {
- if (xbt_dynar_
length(queue->data) == 0
) {
+ if (xbt_dynar_
is_empty(queue->data)
) {
xbt_mutex_release(queue->mutex);
xbt_mutex_release(queue->mutex);
- THROW
0
(timeout_error, 0, "Delay = 0, and queue is empty");
+ THROW
F
(timeout_error, 0, "Delay = 0, and queue is empty");
}
} else {
}
} else {
- while ((xbt_dynar_
length(queue->data) == 0
) &&
+ while ((xbt_dynar_
is_empty(queue->data)
) &&
(delay < 0 || (xbt_time() - begin) <= delay)) {
(delay < 0 || (xbt_time() - begin) <= delay)) {
-
DEBUG1
("Queue %p empty. Waiting", queue);
+
XBT_DEBUG
("Queue %p empty. Waiting", queue);
TRY {
xbt_cond_timedwait(queue->not_empty, queue->mutex,
delay < 0 ? -1 : delay - (xbt_time() - begin));
}
TRY {
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;
}
xbt_mutex_release(queue->mutex);
RETHROW;
}
@@
-240,7
+238,6
@@
void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
double delay)
{
double begin = xbt_time();
double delay)
{
double begin = xbt_time();
- xbt_ex_t e;
xbt_mutex_acquire(queue->mutex);
xbt_mutex_acquire(queue->mutex);
@@
-249,8
+246,8
@@
void xbt_queue_unshift_timed(xbt_queue_t queue, const void *src,
queue->capacity == xbt_dynar_length(queue->data)) {
xbt_mutex_release(queue->mutex);
queue->capacity == xbt_dynar_length(queue->data)) {
xbt_mutex_release(queue->mutex);
- THROW
2
(timeout_error, 0,
- "Capacity of %p exceded (=%d), and delay = 0", queue,
+ THROW
F
(timeout_error, 0,
+ "Capacity of %p exce
e
ded (=%d), and delay = 0", queue,
queue->capacity);
}
} else {
queue->capacity);
}
} else {
@@
-258,13
+255,13
@@
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)) {
queue->capacity == xbt_dynar_length(queue->data) &&
(delay < 0 || (xbt_time() - begin) <= delay)) {
-
DEBUG2("Capacity of %p exc
eded (=%d). Waiting", queue,
+
XBT_DEBUG("Capacity of %p exce
eded (=%d). Waiting", queue,
queue->capacity);
TRY {
xbt_cond_timedwait(queue->not_full, queue->mutex,
delay < 0 ? -1 : delay - (xbt_time() - begin));
}
queue->capacity);
TRY {
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;
}
xbt_mutex_release(queue->mutex);
RETHROW;
}
@@
-286,33
+283,32
@@
void xbt_queue_shift_timed(xbt_queue_t queue, void *const dst,
double delay)
{
double begin = xbt_time();
double delay)
{
double begin = xbt_time();
- xbt_ex_t e;
xbt_mutex_acquire(queue->mutex);
if (delay == 0) {
xbt_mutex_acquire(queue->mutex);
if (delay == 0) {
- if (xbt_dynar_
length(queue->data) == 0
) {
+ if (xbt_dynar_
is_empty(queue->data)
) {
xbt_mutex_release(queue->mutex);
xbt_mutex_release(queue->mutex);
- THROW
0
(timeout_error, 0, "Delay = 0, and queue is empty");
+ THROW
F
(timeout_error, 0, "Delay = 0, and queue is empty");
}
} else {
}
} else {
- while ((xbt_dynar_
length(queue->data) == 0
) &&
+ while ((xbt_dynar_
is_empty(queue->data)
) &&
(delay < 0 || (xbt_time() - begin) <= delay)) {
(delay < 0 || (xbt_time() - begin) <= delay)) {
-
DEBUG1
("Queue %p empty. Waiting", queue);
+
XBT_DEBUG
("Queue %p empty. Waiting", queue);
TRY {
xbt_cond_timedwait(queue->not_empty, queue->mutex,
delay < 0 ? -1 : delay - (xbt_time() - begin));
}
TRY {
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;
}
}
}
xbt_mutex_release(queue->mutex);
RETHROW;
}
}
}
- if (xbt_dynar_
length(queue->data) == 0
) {
+ if (xbt_dynar_
is_empty(queue->data)
) {
xbt_mutex_release(queue->mutex);
xbt_mutex_release(queue->mutex);
- THROW
1
(timeout_error, 0, "Timeout (%f) elapsed, but queue still empty",
+ THROW
F
(timeout_error, 0, "Timeout (%f) elapsed, but queue still empty",
delay);
}
delay);
}