diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 14:22:37 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 14:22:37 +0100 |
| commit | 7e666be965b3ac61b05ccdeca2b61902bc26e172 (patch) | |
| tree | dc4c1b7985b1aa3dfd16b59c70567f62ab535fd6 /lib/thread.c | |
| parent | f9956b9524ddafdb9d0cec042213eaa8229aad8c (diff) | |
| parent | e20f7ccd9e110fcd5deb945f8d23922efd8b0822 (diff) | |
| download | quagga-ex16p.tar.bz2 quagga-ex16p.tar.xz | |
Merge branch 'master' of /git/quagga.euro-ix into pipeworkex16p
This ensures that the two branches are consistent after the merging
of the old-Quagga 0.99.18 changes.
Release: 0.99.18ex16p.
Eliminated some whitespace differences !
Collected RESTRICTED_NODE show_bgp_ipv6_safi_route_cmd and
show_bgp_ipv6_safi_prefix_cmd, and one HAVE_IPV6 skip. Also releasing
filename in closezlog().
Removed strlen() from lib/qfstring.c for async-signal-safe purposes.
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/thread.c b/lib/thread.c index 90aad4ba..b9fd603c 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -1280,13 +1280,13 @@ thread_fetch (struct thread_master *m, struct thread *fetch) /* Calculate select wait timer if nothing else to do */ if (m->ready.count == 0) { - quagga_get_relative (NULL); - timer_wait = thread_timer_wait (&m->timer, &timer_val); - timer_wait_bg = thread_timer_wait (&m->background, &timer_val_bg); + quagga_get_relative (NULL); + timer_wait = thread_timer_wait (&m->timer, &timer_val); + timer_wait_bg = thread_timer_wait (&m->background, &timer_val_bg); - if (timer_wait_bg && - (!timer_wait || (timeval_cmp (*timer_wait, *timer_wait_bg) > 0))) - timer_wait = timer_wait_bg; + if (timer_wait_bg && + (!timer_wait || (timeval_cmp (*timer_wait, *timer_wait_bg) > 0))) + timer_wait = timer_wait_bg; } else { |