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
An empty strbuff should really be empty.
[simgrid.git]
/
src
/
xbt
/
xbt_queue.c
diff --git
a/src/xbt/xbt_queue.c
b/src/xbt/xbt_queue.c
index
b3829bd
..
7a38199
100644
(file)
--- a/
src/xbt/xbt_queue.c
+++ b/
src/xbt/xbt_queue.c
@@
-33,7
+33,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
+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);
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
+80,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 exceded (=%d). Waiting", queue,
+
XBT_DEBUG
("Capacity of %p exceded (=%d). Waiting", queue,
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
@@
-100,7
+101,7
@@
void xbt_queue_pop(xbt_queue_t queue, void *const dst)
{
xbt_mutex_acquire(queue->mutex);
while (xbt_dynar_length(queue->data) == 0) {
{
xbt_mutex_acquire(queue->mutex);
while (xbt_dynar_length(queue->data) == 0) {
-
DEBUG1
("Queue %p empty. Waiting", queue);
+
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
+120,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 exceded (=%d). Waiting", queue,
+
XBT_DEBUG
("Capacity of %p exceded (=%d). Waiting", queue,
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
queue->capacity);
xbt_cond_wait(queue->not_full, queue->mutex);
}
@@
-140,7
+141,7
@@
void xbt_queue_shift(xbt_queue_t queue, void *const dst)
{
xbt_mutex_acquire(queue->mutex);
while (xbt_dynar_length(queue->data) == 0) {
{
xbt_mutex_acquire(queue->mutex);
while (xbt_dynar_length(queue->data) == 0) {
-
DEBUG1
("Queue %p empty. Waiting", queue);
+
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
+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();
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,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);
queue->capacity == xbt_dynar_length(queue->data)) {
xbt_mutex_release(queue->mutex);
- THROW
2
(timeout_error, 0,
+ THROW
F
(timeout_error, 0,
"Capacity of %p exceded (=%d), and delay = 0", queue,
queue->capacity);
}
"Capacity of %p exceded (=%d), and delay = 0", queue,
queue->capacity);
}
@@
-176,13
+176,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 exceded (=%d). Waiting", queue,
+
XBT_DEBUG
("Capacity of %p exceded (=%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
+203,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) {
if (xbt_dynar_length(queue->data) == 0) {
xbt_mutex_release(queue->mutex);
xbt_mutex_acquire(queue->mutex);
if (delay == 0) {
if (xbt_dynar_length(queue->data) == 0) {
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 {
while ((xbt_dynar_length(queue->data) == 0) &&
(delay < 0 || (xbt_time() - begin) <= delay)) {
}
} else {
while ((xbt_dynar_length(queue->data) == 0) &&
(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
+239,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,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);
queue->capacity == xbt_dynar_length(queue->data)) {
xbt_mutex_release(queue->mutex);
- THROW
2
(timeout_error, 0,
+ THROW
F
(timeout_error, 0,
"Capacity of %p exceded (=%d), and delay = 0", queue,
queue->capacity);
}
"Capacity of %p exceded (=%d), and delay = 0", queue,
queue->capacity);
}
@@
-258,13
+256,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 exceded (=%d). Waiting", queue,
+
XBT_DEBUG
("Capacity of %p exceded (=%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,24
+284,23
@@
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) {
if (xbt_dynar_length(queue->data) == 0) {
xbt_mutex_release(queue->mutex);
xbt_mutex_acquire(queue->mutex);
if (delay == 0) {
if (xbt_dynar_length(queue->data) == 0) {
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 {
while ((xbt_dynar_length(queue->data) == 0) &&
(delay < 0 || (xbt_time() - begin) <= delay)) {
}
} else {
while ((xbt_dynar_length(queue->data) == 0) &&
(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;
}
@@
-312,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);
if (xbt_dynar_length(queue->data) == 0) {
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);
}