diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-04-24 22:33:25 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-05-09 20:44:19 +0000 |
| commit | ffa2c8986d204f4a3e7204258fd6906af4a57c93 (patch) | |
| tree | 6242b8634bc2a264339a05dcfb20b94f63c252f4 /ldpd/adjacency.c | |
| parent | 7a78dea34d20e44539ccabb1b97e029003be4b40 (diff) | |
*: remove THREAD_ON macros, add nullity check
The way thread.c is written, a caller who wishes to be able to cancel a
thread or avoid scheduling it twice must keep a reference to the thread.
Typically this is done with a long lived pointer whose value is checked
for null in order to know if the thread is currently scheduled. The
check-and-schedule idiom is so common that several wrapper macros in
thread.h existed solely to provide it.
This patch removes those macros and adds a new parameter to all
thread_add_* functions which is a pointer to the struct thread * to
store the result of a scheduling call. If the value passed is non-null,
the thread will only be scheduled if the value is null. This helps with
consistency.
A Coccinelle spatch has been used to transform code of the form:
if (t == NULL)
t = thread_add_* (...)
to the form
thread_add_* (..., &t)
The THREAD_ON macros have also been transformed to the underlying
thread.c calls.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'ldpd/adjacency.c')
| -rw-r--r-- | ldpd/adjacency.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c index 3ec57f1589..e8bc58b7e8 100644 --- a/ldpd/adjacency.c +++ b/ldpd/adjacency.c @@ -207,7 +207,7 @@ adj_start_itimer(struct adj *adj) { THREAD_TIMER_OFF(adj->inactivity_timer); adj->inactivity_timer = thread_add_timer(master, adj_itimer, adj, - adj->holdtime); + adj->holdtime, NULL); } void @@ -367,7 +367,8 @@ tnbr_start_hello_timer(struct tnbr *tnbr) { THREAD_TIMER_OFF(tnbr->hello_timer); tnbr->hello_timer = thread_add_timer(master, tnbr_hello_timer, tnbr, - tnbr_get_hello_interval(tnbr)); + tnbr_get_hello_interval(tnbr), + NULL); } static void |