From 31afd2aaaeb76a12e232eab0fb6a550b73948737 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Mon, 22 Jun 2020 10:50:15 +0200
Subject: Make struct cfg global and make the corresponding changes throughout

---
 announce.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'announce.c')

diff --git a/announce.c b/announce.c
index 9944851..1225868 100644
--- a/announce.c
+++ b/announce.c
@@ -18,12 +18,12 @@ struct announce {
 };
 
 static void
-announce_cb(struct cfg *cfg, struct uring_task *task, int res)
+announce_cb(struct uring_task *task, int res)
 {
 	struct announce *aev = container_of(task, struct announce, task);
 	struct server *server;
 
-	assert_return(cfg && task);
+	assert_return(task);
 	assert_task_alive(DBG_ANN, task);
 
 	if (res != sizeof(aev->value)) {
@@ -33,8 +33,8 @@ announce_cb(struct cfg *cfg, struct uring_task *task, int res)
 
 	debug(DBG_ANN, "timerfd value %" PRIu64, aev->value);
 	list_for_each_entry(server, &cfg->servers, list)
-		server_announce(cfg, server, aev->mcast_fd);
-	uring_read(cfg, &aev->task, &aev->value, sizeof(aev->value), announce_cb);
+		server_announce(server, aev->mcast_fd);
+	uring_read(&aev->task, &aev->value, sizeof(aev->value), announce_cb);
 }
 
 static void
@@ -50,25 +50,25 @@ announce_free(struct uring_task *task)
 }
 
 void
-announce_refdump(struct announce *aev)
+announce_refdump()
 {
-	assert_return_silent(aev);
+	assert_return_silent(cfg->aev);
 
-	uring_task_refdump(&aev->task);
+	uring_task_refdump(&cfg->aev->task);
 }
 
 void
-announce_delete(struct cfg *cfg)
+announce_delete()
 {
-	assert_return(cfg && cfg->aev);
+	assert_return(cfg->aev);
 
 	debug(DBG_ANN, "closing fd %i", cfg->aev->task.fd);
-	uring_task_destroy(cfg, &cfg->aev->task);
+	uring_task_destroy(&cfg->aev->task);
 	cfg->aev = NULL;
 }
 
 void
-announce_stop(struct announce *aev)
+announce_stop()
 {
 	struct itimerspec tspec = {
 		.it_interval = {
@@ -81,14 +81,14 @@ announce_stop(struct announce *aev)
 		}
 	};
 
-	assert_return(aev);
+	assert_return(cfg->aev);
 
-	if (timerfd_settime(aev->task.fd, 0, &tspec, NULL) != 0)
+	if (timerfd_settime(cfg->aev->task.fd, 0, &tspec, NULL) != 0)
 		error("timerfd_settime: %m");
 }
 
 void
-announce_start(struct announce *aev)
+announce_start()
 {
 	struct itimerspec tspec = {
 		.it_interval = {
@@ -101,20 +101,20 @@ announce_start(struct announce *aev)
 		}
 	};
 
-	assert_return(aev);
+	assert_return(cfg->aev);
 
-	if (timerfd_settime(aev->task.fd, 0, &tspec, NULL) != 0)
+	if (timerfd_settime(cfg->aev->task.fd, 0, &tspec, NULL) != 0)
 		error("timerfd_settime: %m");
 }
 
 void
-announce_init(struct cfg *cfg)
+announce_init()
 {
 	struct announce *aev;
 	int afd;
 	int sfd;
  
-	assert_return(cfg);
+	assert_return(!cfg->aev);
 
 	aev = zmalloc(sizeof(*aev));
 	if (!aev)
@@ -128,10 +128,10 @@ announce_init(struct cfg *cfg)
 	if (sfd < 0)
 		die("socket: %m");
 
-	uring_task_init(cfg, &aev->task, "announce", uring_parent(cfg), announce_free);
+	uring_task_init(&aev->task, "announce", uring_parent(), announce_free);
 	uring_task_set_fd(&aev->task, afd);
 	aev->mcast_fd = sfd;
 	cfg->aev = aev;
-	uring_read(cfg, &aev->task, &aev->value, sizeof(aev->value), announce_cb);
+	uring_read(&aev->task, &aev->value, sizeof(aev->value), announce_cb);
 }
 
-- 
cgit v1.2.3