From 8fb1c09df1540aa3fca1148bed6a08ffc3090669 Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Tue, 27 Oct 2026 19:15:22 +0100 Subject: All OSes now do have a cheap monotonic clock, so no caching thread is needed. Also add some relative time helpers --- ot_accesslist.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ot_accesslist.c') diff --git a/ot_accesslist.c b/ot_accesslist.c index 4bf1701..e8e0476 100644 --- a/ot_accesslist.c +++ b/ot_accesslist.c @@ -93,7 +93,7 @@ static ot_accesslist *accesslist_make(ot_accesslist *next, size_t size) { This will never delete head, because that might still be in use. */ static void accesslist_clean(ot_accesslist *accesslist) { while (accesslist && accesslist->next) { - if (accesslist->next->base + 5 < g_now_minutes) + if (accesslist->next->base + 5 < time_now_minutes()) accesslist->next = accesslist_free(accesslist->next); accesslist = accesslist->next; } @@ -197,7 +197,7 @@ static void accesslist_readfile(void) { /* Mark old accesslist as "needs to live another five minutes" */ if (g_accesslist) - g_accesslist->base = g_now_minutes; + g_accesslist->base = time_now_minutes(); accesslist_new->next = g_accesslist; g_accesslist = accesslist_new; /* Only now set a new list */ @@ -205,11 +205,11 @@ static void accesslist_readfile(void) { /* If we have dynamic accesslists, reloading a new one will always void the add/delete lists. Insert empty ones at the list head */ if (g_accesslist_add && (accesslist_new = accesslist_make(g_accesslist_add, 0)) != NULL) { - g_accesslist_add->base = g_now_minutes; + g_accesslist_add->base = time_now_minutes(); g_accesslist_add = accesslist_new; } if (g_accesslist_delete && (accesslist_new = accesslist_make(g_accesslist_delete, 0)) != NULL) { - g_accesslist_delete->base = g_now_minutes; + g_accesslist_delete->base = time_now_minutes(); g_accesslist_delete = accesslist_new; } #endif @@ -326,7 +326,7 @@ static void *accesslist_adddel_worker(const char *fifoname, ot_accesslist *_ if (accesslist_new) { memcpy(accesslist_new->list, (*removing_from)->list, sizeof(ot_hash) * off); memcpy(accesslist_new->list + off, (*removing_from)->list + off + 1, sizeof(ot_hash) * ((*removing_from)->size - off - 1)); - (*removing_from)->base = g_now_minutes; + (*removing_from)->base = time_now_minutes(); *removing_from = accesslist_new; } } @@ -351,7 +351,7 @@ static void *accesslist_adddel_worker(const char *fifoname, ot_accesslist *_ memcpy(accesslist_new->list, (*adding_to)->list, sizeof(ot_hash) * off); memcpy(accesslist_new->list + off, info_hash, sizeof(info_hash)); memcpy(accesslist_new->list + off + 1, (*adding_to)->list + off, sizeof(ot_hash) * ((*adding_to)->size - off)); - (*adding_to)->base = g_now_minutes; + (*adding_to)->base = time_now_minutes(); *adding_to = accesslist_new; } } -- cgit v1.3