Skip to content
Snippets Groups Projects
Commit 86460d14 authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

fix inserted logic bug.

Former-commit-id: dde4d6fa8bf07c0be6ba80c5a4da77575a1dd877
parent 692bb903
No related branches found
No related tags found
No related merge requests found
...@@ -118,9 +118,9 @@ void queue_insert ( struct queue *q , struct task *t ) { ...@@ -118,9 +118,9 @@ void queue_insert ( struct queue *q , struct task *t ) {
} */ } */
/* Verify queue consistency. */ /* 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 ) 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. */ /* Unlock the queue. */
if ( lock_unlock( &q->lock ) != 0 ) if ( lock_unlock( &q->lock ) != 0 )
...@@ -269,9 +269,9 @@ struct task *queue_gettask ( struct queue *q , int qid , int blocking ) { ...@@ -269,9 +269,9 @@ struct task *queue_gettask ( struct queue *q , int qid , int blocking ) {
} */ } */
/* Verify queue consistency. */ /* 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 ) if ( q->tasks[ q->tid[(k-1)/2] ].weight < q->tasks[ q->tid[k] ].weight )
error( "Queue not heaped." ); */ error( "Queue not heaped." );
} }
else else
......
...@@ -563,7 +563,7 @@ void scheduler_start ( struct scheduler *s , unsigned int mask ) { ...@@ -563,7 +563,7 @@ void scheduler_start ( struct scheduler *s , unsigned int mask ) {
// #pragma omp parallel for schedule(static) private(t,j) // #pragma omp parallel for schedule(static) private(t,j)
for ( k = s->nr_tasks-1 ; k >= 0 ; k-- ) { for ( k = s->nr_tasks-1 ; k >= 0 ; k-- ) {
t = &tasks[ tid[k] ]; t = &tasks[ tid[k] ];
if ( !( (1 << t->type) & mask ) || !t->skip ) if ( !( (1 << t->type) & mask ) || t->skip )
continue; continue;
for ( j = 0 ; j < t->nr_unlock_tasks ; j++ ) for ( j = 0 ; j < t->nr_unlock_tasks ; j++ )
atomic_inc( &t->unlock_tasks[j]->wait ); atomic_inc( &t->unlock_tasks[j]->wait );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment