X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftimer%2Ftimer.c;h=2685d3efde96f780fbbc3dc946d6acc4b9def9e1;hp=607415620c6223d9620d70606d851c70da00af74;hb=fe328d06ed6df8d5a92eaab4be2d645affeeb99e;hpb=23e72d4194172b52d26fed9f36c7af9b893f4649;ds=sidebyside

diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c
index 60741562..2685d3ef 100644
--- a/ccan/timer/timer.c
+++ b/ccan/timer/timer.c
@@ -11,23 +11,21 @@ struct timer_level {
 	struct list_head list[PER_LEVEL];
 };
 
-static void *timer_default_alloc(size_t len, void *arg)
+static void *timer_default_alloc(struct timers *timers, size_t len)
 {
 	return malloc(len);
 }
 
-static void timer_default_free(const void *p, void *arg)
+static void timer_default_free(struct timers *timers, void *p)
 {
-	free((void *)p);
+	free(p);
 }
 
-static void *(*timer_alloc)(size_t, void *) = timer_default_alloc;
-static void (*timer_free)(const void *, void *) = timer_default_free;
-static void *timer_arg;
+static void *(*timer_alloc)(struct timers *, size_t) = timer_default_alloc;
+static void (*timer_free)(struct timers *, void *) = timer_default_free;
 
-void timers_set_allocator(void *(*alloc)(size_t len, void *arg),
-			  void (*free)(const void *p, void *arg),
-			  void *arg)
+void timers_set_allocator(void *(*alloc)(struct timers *, size_t len),
+			  void (*free)(struct timers *, void *p))
 {
 	if (!alloc)
 		alloc = timer_default_alloc;
@@ -35,7 +33,6 @@ void timers_set_allocator(void *(*alloc)(size_t len, void *arg),
 		free = timer_default_free;
 	timer_alloc = alloc;
 	timer_free = free;
-	timer_arg = arg;
 }
 
 static uint64_t time_to_grains(struct timemono t)
@@ -166,7 +163,7 @@ static void add_level(struct timers *timers, unsigned int level)
 	unsigned int i;
 	struct list_head from_far;
 
-	l = timer_alloc(sizeof(*l), timer_arg);
+	l = timer_alloc(timers, sizeof(*l));
 	if (!l)
 		return;
 
@@ -547,5 +544,5 @@ void timers_cleanup(struct timers *timers)
 	unsigned int l;
 
 	for (l = 0; l < ARRAY_SIZE(timers->level); l++)
-		timer_free(timers->level[l], timer_arg);
+		timer_free(timers, timers->level[l]);
 }