From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 20 Jan 2022 20:50:36 +0000 (-0500)
Subject: skip work if we're already in the network thread
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5481c0ed55ce8bd11e981526fb142cf5e248df36;p=thirdparty%2Ffreeradius-server.git

skip work if we're already in the network thread
---

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index c83da6c35d..a8a222d107 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -112,6 +112,8 @@ typedef struct {
 struct fr_network_s {
 	char const		*name;			//!< Network ID for logging.
 
+	pthread_t		thread_id;		//!< for self
+
 	bool			started;		//!< Set to true when the first worker is added.
 	bool			suspended;		//!< whether or not we're suspended.
 
@@ -218,6 +220,13 @@ static inline fr_ring_buffer_t *fr_network_rb_init(void)
 	return rb;
 }
 
+static inline bool is_network_thread(fr_network_t const *nr)
+{
+	return (pthread_equal(pthread_self(), nr->thread_id) != 0);
+}
+
+static int fr_network_listen_add_self(fr_network_t *nr, fr_listen_t *listen);
+
 /** Add a fr_listen_t to a network
  *
  * @param nr		the network
@@ -227,6 +236,13 @@ int fr_network_listen_add(fr_network_t *nr, fr_listen_t *li)
 {
 	fr_ring_buffer_t *rb;
 
+	/*
+	 *	Skip a bunch of work if we're already in the network thread.
+	 */
+	if (is_network_thread(nr)) {
+		return fr_network_listen_add_self(nr, li);
+	}
+
 	rb = fr_network_rb_init();
 	if (!rb) return -1;
 
@@ -243,6 +259,8 @@ int fr_network_listen_delete(fr_network_t *nr, fr_listen_t *li)
 {
 	fr_network_socket_t *s;
 
+	fr_assert(is_network_thread(nr));
+
 	s = fr_rb_find(nr->sockets, &(fr_network_socket_t){ .listen = li });
 	if (!s) return -1;
 
@@ -1116,6 +1134,7 @@ static int _network_socket_free(fr_network_socket_t *s)
 	return 0;
 }
 
+
 /** Handle a network control message callback for a new listener
  *
  * @param[in] ctx the network
@@ -1126,20 +1145,29 @@ static int _network_socket_free(fr_network_socket_t *s)
 static void fr_network_listen_callback(void *ctx, void const *data, size_t data_size, UNUSED fr_time_t now)
 {
 	fr_network_t		*nr = ctx;
+	fr_listen_t		*listen;
+
+	fr_assert(data_size == sizeof(listen));
+
+	if (data_size != sizeof(listen)) return;
+
+	memcpy(&listen, data, sizeof(listen));
+
+	(void) fr_network_listen_add_self(nr, listen);
+}
+
+static int fr_network_listen_add_self(fr_network_t *nr, fr_listen_t *listen)
+{
 	fr_network_socket_t	*s;
 	fr_app_io_t const	*app_io;
 	size_t			size;
 	int			num_messages;
 
-	fr_assert(data_size == sizeof(s->listen));
-
-	if (data_size != sizeof(s->listen)) return;
-
 	s = talloc_zero(nr, fr_network_socket_t);
 	fr_assert(s != NULL);
 
 	s->nr = nr;
-	memcpy(&s->listen, data, sizeof(s->listen));
+	s->listen = listen;
 	s->number = nr->num_sockets++;
 
 	MEM(s->waiting = fr_heap_alloc(s, waiting_cmp, fr_channel_data_t, channel.heap_id, 0));
@@ -1167,7 +1195,7 @@ static void fr_network_listen_callback(void *ctx, void const *data, size_t data_
 	if (!s->ms) {
 		PERROR("Failed creating message buffers for network IO");
 		talloc_free(s);
-		return;
+		return -1;
 	}
 
 	app_io = s->listen->app_io;
@@ -1180,7 +1208,7 @@ static void fr_network_listen_callback(void *ctx, void const *data, size_t data_
 			       s) < 0) {
 		PERROR("Failed adding new socket to network event loop");
 		talloc_free(s);
-		return;
+		return -1;
 	}
 
 	/*
@@ -1207,6 +1235,8 @@ static void fr_network_listen_callback(void *ctx, void const *data, size_t data_
 	      s->listen->name, cf_section_name2(s->listen->server_cs));
 
 	DEBUG3("Using new socket %s with FD %d", s->listen->name, s->listen->fd);
+
+	return 0;
 }
 
 /** Handle a network control message callback for a new "watch directory"
@@ -1647,9 +1677,12 @@ fr_network_t *fr_network_create(TALLOC_CTX *ctx, fr_event_list_t *el, char const
 	talloc_set_destructor(nr, _fr_network_free);
 
 	nr->name = talloc_strdup(nr, name);
+
+	nr->thread_id = pthread_self();
 	nr->el = el;
 	nr->log = logger;
 	nr->lvl = lvl;
+
 	nr->max_workers = MAX_WORKERS;
 	nr->num_workers = 0;
 	nr->signal_pipe[0] = -1;