diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-01-09 16:42:25 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-01-09 16:42:25 +0100 |
| commit | 77c32c24b781eafd518e2cbe9de46b348a26a201 (patch) | |
| tree | 817ead055668848866738e037ac3cb4c2a269bfd /src/ipcpd/timerwheel.c | |
| parent | f0167930862e57a2aa22520cd574f0368cb1032c (diff) | |
| parent | 6c1cfb990f56b2fa87500732cb4f0966616907c7 (diff) | |
| download | ouroboros-77c32c24b781eafd518e2cbe9de46b348a26a201.tar.gz ouroboros-77c32c24b781eafd518e2cbe9de46b348a26a201.zip | |
Merge remote-tracking branch 'upstream/be' into be-gam
Diffstat (limited to 'src/ipcpd/timerwheel.c')
| -rw-r--r-- | src/ipcpd/timerwheel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ipcpd/timerwheel.c b/src/ipcpd/timerwheel.c index 4ef7ce2f..bb61bd91 100644 --- a/src/ipcpd/timerwheel.c +++ b/src/ipcpd/timerwheel.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Timerwheel * @@ -232,7 +232,7 @@ struct timerwheel * timerwheel_create(unsigned int resolution, tw->intv.tv_sec = (tw->resolution / FRAC) / 1000; tw->intv.tv_nsec = ((tw->resolution / FRAC) % 1000) * MILLION; - INIT_LIST_HEAD(&tw->wq); + list_head_init(&tw->wq); if (pthread_mutex_init(&tw->lock, NULL)) { LOG_DBG("Could not init mutex."); @@ -265,7 +265,7 @@ struct timerwheel * timerwheel_create(unsigned int resolution, now.tv_nsec -= (now.tv_nsec % MILLION); for (i = 0; i < tw->elements; ++i) { - INIT_LIST_HEAD(&tw->wheel[i].funcs); + list_head_init(&tw->wheel[i].funcs); tw->wheel[i].expiry = now; ts_add(&now, &res_ts, &now); } |