From fd710adc44e642ad7b62cffbb7114c5b3f82bed4 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 30 Jan 2021 20:51:34 -0500 Subject: [PATCH] holy crap there is some old cruft in here I have to rewrite! --- citadel/modules/network/serv_network.c | 39 -------------------------- citadel/server.h | 1 - citadel/threads.c | 2 -- 3 files changed, 42 deletions(-) diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 6828b99b0..6ed123eb0 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -69,44 +69,6 @@ #include "netspool.h" #include "netmail.h" -/* comes from lookup3.c from libcitadel... */ -extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); - -/* - * network_do_queue() - * - * Run through the rooms doing various types of network stuff. - */ -void network_do_queue(void) { - static time_t last_run = 0L; - int full_processing = 1; - - /* - * Run the full set of processing tasks no more frequently - * than once every n seconds - */ - if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") ) { - full_processing = 0; - syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)); - } - - begin_critical_section(S_RPLIST); - end_critical_section(S_RPLIST); - - /* - * Go ahead and run the queue - */ - if (full_processing && !server_shutting_down) { - syslog(LOG_DEBUG, "network: loading outbound queue"); - //CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL); - // FIXME do the outbound crapola AJC 2021 - } - syslog(LOG_DEBUG, "network: queue run completed"); - - if (full_processing) { - last_run = time(NULL); - } -} /* @@ -116,7 +78,6 @@ CTDL_MODULE_INIT(network) { if (!threading) { - CtdlRegisterSessionHook(network_do_queue, EVT_TIMER, PRIO_QUEUE + 10); } return "network"; } diff --git a/citadel/server.h b/citadel/server.h index 9215d2e7e..ff5c3355e 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -149,7 +149,6 @@ enum { S_FLOORCACHE, S_ATBF, S_JOURNAL_QUEUE, - S_RPLIST, S_CHKPWD, S_LOG, S_NETSPOOL, diff --git a/citadel/threads.c b/citadel/threads.c index ab7157bd8..18641b545 100644 --- a/citadel/threads.c +++ b/citadel/threads.c @@ -53,7 +53,6 @@ int try_critical_section(int which_one) * transaction; this could lead to deadlock. */ if ( (which_one != S_FLOORCACHE) - && (which_one != S_RPLIST) ) { cdb_check_handles(); } @@ -71,7 +70,6 @@ void begin_critical_section(int which_one) * transaction; this could lead to deadlock. */ if ( (which_one != S_FLOORCACHE) - && (which_one != S_RPLIST) ) { cdb_check_handles(); } -- 2.30.2