summaryrefslogtreecommitdiffstats
path: root/lib/qtimers.c
diff options
context:
space:
mode:
authorpaulo <paul@bayleaf.org.uk>2010-01-21 14:53:26 +0000
committerpaulo <paul@bayleaf.org.uk>2010-01-21 14:53:26 +0000
commit0543006c11cd6e092e390b203dac1dcc8b26fd06 (patch)
tree22b7ba595a1bc472775e032263529741986408d7 /lib/qtimers.c
parent305c1b3dd35748bc949a139ce8db03f7f5552cde (diff)
downloadquagga-0543006c11cd6e092e390b203dac1dcc8b26fd06.tar.bz2
quagga-0543006c11cd6e092e390b203dac1dcc8b26fd06.tar.xz
Fixes to get 3 threads working. Fixes to get threaded command working.
Removed some of the temporary debuggery in qtimers that only worked in 1 thread. Initialised the mqueue mutex. Stopped peer_index from zeroizing its mutex after it had been initialized.
Diffstat (limited to 'lib/qtimers.c')
-rw-r--r--lib/qtimers.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/qtimers.c b/lib/qtimers.c
index 6c6c1406..dcce24b9 100644
--- a/lib/qtimers.c
+++ b/lib/qtimers.c
@@ -87,9 +87,6 @@ qtimer_cmp(qtimer* a, qtimer* b) /* the heap discipline */
return 0 ;
} ;
-/* Kill this */
-qtimer_pile our_pile;
-
/*==============================================================================
* qtimer_pile handling
*/
@@ -116,9 +113,6 @@ qtimer_pile_init_new(qtimer_pile qtp)
heap_init_new_backlinked(&qtp->timers, 0, (heap_cmp*)qtimer_cmp,
offsetof(qtimer_t, backlink)) ;
-
- /* TODO: kill this */
- our_pile = qtp;
return qtp ;
} ;
@@ -322,7 +316,6 @@ qtimer_set(qtimer qtr, qtime_mono_t when, qtimer_action* action)
qtp = qtr->pile ;
dassert(qtp != NULL) ;
- assert(qtp == our_pile);
qtimer_pile_verify(qtp) ; /* TODO: remove after debuggery */
qtr->time = when ;
@@ -356,7 +349,6 @@ qtimer_unset(qtimer qtr)
qtimer_pile qtp = qtr->pile ;
dassert(qtp != NULL) ;
- assert(qtp == our_pile);
qtimer_pile_verify(qtp) ; /* TODO: remove after debuggery */
heap_delete_item(&qtp->timers, qtr) ;