aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Making timers independent of the lightningd_state

Browse Source 
The `dstate` reference was only an indirection to the `timers`
sub-structure anyway, so removing this indirection allows us to reuse
the timers in the subdaemon arch.
This commit is contained in:
Christian Decker
2017-02-04 15:32:02 +01:00
parent 597687d1f0
commit 1c4c874d3f
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/timeout.c
View File

@@ -3,7 +3,7 @@
#include "utils.h"
struct oneshot {
struct lightningd_state *dstate;
struct timers *timers;
struct timer timer;
void (*cb)(void *);
void *arg;
@@ -11,10 +11,10 @@ struct oneshot {
static void remove_timer(struct oneshot *t)
{
timer_del(&t->dstate->timers, &t->timer);
timer_del(t->timers, &t->timer);
}
struct oneshot *new_reltimer_(struct lightningd_state *dstate,
struct oneshot *new_reltimer_(struct timers *timers,
const tal_t *ctx,
struct timerel relexpiry,
void (*cb)(void *), void *arg)
@@ -23,18 +23,18 @@ struct oneshot *new_reltimer_(struct lightningd_state *dstate,
t->cb = cb;
t->arg = arg;
t->dstate = dstate;
t->timers = timers;
timer_init(&t->timer);
timer_addrel(&dstate->timers, &t->timer, relexpiry);
timer_addrel(timers, &t->timer, relexpiry);
tal_add_destructor(t, remove_timer);
return t;
}
void timer_expired(struct lightningd_state *dstate, struct timer *timer)
void timer_expired(tal_t *ctx, struct timer *timer)
{
struct oneshot *t = container_of(timer, struct oneshot, timer);
const tal_t *tmpctx = tal_tmpctx(dstate);
const tal_t *tmpctx = tal_tmpctx(ctx);
/* If it doesn't free itself, freeing tmpctx will do it */
tal_steal(tmpctx, t);