no dynamic configuration: remove use of ServerReload thread_state

diff --git a/src/knot/server/server.c b/src/knot/server/server.c
index 3ba66c18873156da7f215d47df071cf3db360281..223df03f6a36d29b4fab724d9347be6b10ce833c 100644 (file)
--- a/src/knot/server/server.c
+++ b/src/knot/server/server.c
@@ -375,7 +375,6 @@ static int configure_sockets(conf_t *conf, server_t *s)
        for (unsigned proto = IO_UDP; proto <= IO_TCP; ++proto) {
                dt_unit_t *tu = s->handlers[proto].handler.unit;
                for (unsigned i = 0; i < tu->size; ++i) {
-                       s->handlers[proto].handler.thread_state[i] |= ServerReload;
                        s->handlers[proto].handler.thread_id[i] = thread_count++;
                }
        }

diff --git a/src/knot/server/server.h b/src/knot/server/server.h
index b63c4eb16848cce643f12656e9e808fbf1f06fae..cad89aa84497f22301fb19b7d0a124a27365cacf 100644 (file)
--- a/src/knot/server/server.h
+++ b/src/knot/server/server.h
@@ -45,7 +45,6 @@ typedef struct iohandler {
 typedef enum {
        ServerIdle    = 0 << 0, /*!< Server is idle. */
        ServerRunning = 1 << 0, /*!< Server is running. */
-       ServerReload  = 1 << 1  /*!< Server reload requested. */
 } server_state;
 
 /*!

diff --git a/src/knot/server/tcp-handler.c b/src/knot/server/tcp-handler.c
index d4d27ee74e809dc9c6130c0318fe4ad811d7c3f6..c9965c6551fab3a240e1cd35cf901cd3bad11b8a 100644 (file)
--- a/src/knot/server/tcp-handler.c
+++ b/src/knot/server/tcp-handler.c
@@ -262,7 +262,6 @@ int tcp_master(dthread_t *thread)
        }
 
        iohandler_t *handler = (iohandler_t *)thread->data;
-       unsigned *iostate = &handler->thread_state[dt_get_id(thread)];
 
        int ret = KNOT_EOK;
 
@@ -296,15 +295,9 @@ int tcp_master(dthread_t *thread)
        update_sweep_timer(&next_sweep);
        update_tcp_conf(&tcp);
 
-/* XXX This should likely be removed. */
-       /* Check handler state. */
-       if (*iostate & ServerReload) {
-               *iostate &= ~ServerReload;
-               ref_release(ref);
-       }
-/* XXX */
-
-/* XXX The return value isn't checked. */
+        /* Set descriptors for the configured interfaces. */
+/* XXX The return value isn't used. */
+/* XXX Server_set_ifaces() needs to be cleaned and moved to this file. */
        server_set_ifaces(handler->server, &tcp.set, IO_TCP, tcp.thread_id);
        if (tcp.set.n == 0) {
                goto finish; /* Terminate on zero interfaces. */

diff --git a/src/knot/server/udp-handler.c b/src/knot/server/udp-handler.c
index df0f79ce74b9752b03e1db10a89801156afa7861..e6a88daa0873fe581fb0391d6ce5f538cadf0086 100644 (file)
--- a/src/knot/server/udp-handler.c
+++ b/src/knot/server/udp-handler.c
@@ -418,7 +418,6 @@ int udp_master(dthread_t *thread)
        /* Prepare structures for bound sockets. */
        unsigned thr_id = dt_get_id(thread);
        iohandler_t *handler = (iohandler_t *)thread->data;
-       unsigned *iostate = &handler->thread_state[thr_id];
        void *rq = _udp_init();
        ifacelist_t *ifaces = NULL;
 
@@ -437,13 +436,7 @@ int udp_master(dthread_t *thread)
        struct pollfd *fds = NULL;
        nfds_t nfds = 0;
 
-/* XXX This should likely be removed. */
-       /* Check handler state. */
-       if (*iostate & ServerReload) {
-               *iostate &= ~ServerReload;
-       }
 /* XXX */
-
        udp.thread_id = handler->thread_id[thr_id];
        rcu_read_lock();
        ifaces = handler->server->ifaces;