timer: clean up hook allocator API

[ccan] / ccan / timer / benchmarks / expected-usage.c

diff --git a/ccan/timer/benchmarks/expected-usage.c b/ccan/timer/benchmarks/expected-usage.c
index 9777856550ec2eb2bdec25bc63567bfcb6d77513..e0fed2ecc4de9a706e826f35f71e0c53a489fe0e 100644 (file)
--- a/ccan/timer/benchmarks/expected-usage.c
+++ b/ccan/timer/benchmarks/expected-usage.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
        opt_parse(&argc, argv, opt_log_stderr_exit);
 
-       num = argv[1] ? atoi(argv[1]) : (check ? 10000 : 1000000);
+       num = argv[1] ? atoi(argv[1]) : (check ? 100000 : 100000000);
 
        list_head_init(&expired);
        curr = start = time_now();
@@ -34,10 +34,10 @@ int main(int argc, char *argv[])
                curr = time_add(curr, time_from_msec(1));
                if (check)
                        timers_check(&timers, NULL);
-               timers_expire(&timers, curr, &expired);
+               if (timers_expire(&timers, curr))
+                       abort();
                if (check)
                        timers_check(&timers, NULL);
-               assert(list_empty(&expired));
 
                if (i >= PER_CONN_TIME) {
                        timer_del(&timers, &t[i%PER_CONN_TIME]);