From 86460d140f3f82f4f0106ef6a932c1d99d65e25d Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <pedro.gonnet@durham.ac.uk>
Date: Sun, 23 Jun 2013 18:09:25 +0000
Subject: [PATCH] fix inserted logic bug.
Former-commit-id: dde4d6fa8bf07c0be6ba80c5a4da77575a1dd877
---
src/queue.c | 8 ++++----
src/scheduler.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/queue.c b/src/queue.c
index 66429a4c56..105a396924 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -118,9 +118,9 @@ void queue_insert ( struct queue *q , struct task *t ) {
} */
/* Verify queue consistency. */
- /* for ( int k = 1 ; k < q->count ; k++ )
+ for ( int k = 1 ; k < q->count ; k++ )
if ( q->tasks[ q->tid[(k-1)/2] ].weight < q->tasks[ q->tid[k] ].weight )
- error( "Queue not heaped." ); */
+ error( "Queue not heaped." );
/* Unlock the queue. */
if ( lock_unlock( &q->lock ) != 0 )
@@ -269,9 +269,9 @@ struct task *queue_gettask ( struct queue *q , int qid , int blocking ) {
} */
/* Verify queue consistency. */
- /* for ( k = 1 ; k < q->count ; k++ )
+ for ( k = 1 ; k < q->count ; k++ )
if ( q->tasks[ q->tid[(k-1)/2] ].weight < q->tasks[ q->tid[k] ].weight )
- error( "Queue not heaped." ); */
+ error( "Queue not heaped." );
}
else
diff --git a/src/scheduler.c b/src/scheduler.c
index 468d4f75ad..66708fb14c 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -563,7 +563,7 @@ void scheduler_start ( struct scheduler *s , unsigned int mask ) {
// #pragma omp parallel for schedule(static) private(t,j)
for ( k = s->nr_tasks-1 ; k >= 0 ; k-- ) {
t = &tasks[ tid[k] ];
- if ( !( (1 << t->type) & mask ) || !t->skip )
+ if ( !( (1 << t->type) & mask ) || t->skip )
continue;
for ( j = 0 ; j < t->nr_unlock_tasks ; j++ )
atomic_inc( &t->unlock_tasks[j]->wait );
--
GitLab