X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/d56734d6ddba14d7f8c5034c2545535c5cefbf76..8c689f969db3e81b23ad1bdace924f6f28afa7e0:/src/ircd.c diff --git a/src/ircd.c b/src/ircd.c index ff675e7c..1eee2ad3 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -28,13 +28,11 @@ #include "setup.h" #include "config.h" -#include "tools.h" #include "ircd.h" #include "channel.h" #include "class.h" #include "client.h" #include "common.h" -#include "event.h" #include "hash.h" #include "irc_string.h" #include "ircd_signal.h" @@ -47,9 +45,8 @@ #include "res.h" #include "restart.h" #include "s_auth.h" -#include "commio.h" #include "s_conf.h" -#include "s_log.h" +#include "logger.h" #include "s_serv.h" /* try_connections */ #include "s_user.h" #include "s_stats.h" @@ -58,18 +55,14 @@ #include "supported.h" #include "whowas.h" #include "modules.h" -#include "memory.h" #include "hook.h" #include "ircd_getopt.h" -#include "balloc.h" #include "newconf.h" -#include "patricia.h" #include "reject.h" #include "s_conf.h" #include "s_newconf.h" #include "cache.h" #include "monitor.h" -#include "libcharybdis.h" #include "patchlevel.h" #include "serno.h" @@ -85,6 +78,8 @@ extern int ServerRunning; extern struct LocalUser meLocalUser; extern char **myargv; +int maxconnections; /* XXX */ + /* * print_startup - print startup information */ @@ -116,7 +111,7 @@ ircd_log_cb(const char *str) static void ircd_restart_cb(const char *str) { - ilog(L_MAIN, "%s", str); + restart(str); } /* @@ -159,6 +154,8 @@ init_sys(void) exit(EXIT_FAILURE); } } + + maxconnections = limit.rlim_cur; #endif /* RLIMIT_NOFILE */ } @@ -230,32 +227,6 @@ struct lgetopt myopts[] = { {NULL, NULL, STRING, NULL}, }; -void -set_time(void) -{ - struct timeval newtime; - newtime.tv_sec = 0; - newtime.tv_usec = 0; -#ifdef HAVE_GETTIMEOFDAY - if(gettimeofday(&newtime, NULL) == -1) - { - ilog(L_MAIN, "Clock Failure (%d)", errno); - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "Clock Failure (%d), TS can be corrupted", errno); - - restart("Clock Failure"); - } -#else - newtime.tv_sec = time(NULL); - -#endif - if(newtime.tv_sec < CurrentTime) - set_back_events(CurrentTime - newtime.tv_sec); - - SystemTime.tv_sec = newtime.tv_sec; - SystemTime.tv_usec = newtime.tv_usec; -} - static void check_rehash(void *unused) { @@ -284,26 +255,6 @@ check_rehash(void *unused) } } -void -charybdis_io_loop(void) -{ - time_t delay; - - while (ServerRunning) - { - /* Run pending events, then get the number of seconds to the next - * event - */ - - delay = eventNextTime(); - if(delay <= CurrentTime) - eventRun(); - - - comm_select(250); - } -} - /* * initalialize_global_set_options * @@ -382,7 +333,7 @@ write_pidfile(const char *filename) { unsigned int pid = (unsigned int) getpid(); - ircsnprintf(buff, sizeof(buff), "%u\n", pid); + rb_snprintf(buff, sizeof(buff), "%u\n", pid); if((fputs(buff, fb) == -1)) { ilog(L_MAIN, "Error writing %u to pid file %s (%s)", @@ -452,6 +403,8 @@ setup_corefile(void) #endif } +struct ev_entry *check_splitmode_ev = NULL; + /* * main * @@ -473,10 +426,6 @@ main(int argc, char *argv[]) return -1; } - /* - * save server boot time right away, so getrusage works correctly - */ - set_time(); /* * Setup corefile size immediately after boot -kre */ @@ -497,7 +446,7 @@ main(int argc, char *argv[]) memset(&local_oper_list, 0, sizeof(local_oper_list)); memset(&oper_list, 0, sizeof(oper_list)); - dlinkAddTail(&me, &me.node, &global_client_list); + rb_dlinkAddTail(&me, &me.node, &global_client_list); memset((void *) &Count, 0, sizeof(Count)); memset((void *) &ServerInfo, 0, sizeof(ServerInfo)); @@ -561,17 +510,10 @@ main(int argc, char *argv[]) /* Init the event subsystem */ init_sys(); - libcharybdis_init(ircd_log_cb, restart, ircd_die_cb); - rb_lib_init(ircd_log_cb, restart, ircd_die_cb); - - fdlist_init(); - if(!server_state_foreground) - { - comm_close_all(); - } + rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE); + rb_linebuf_init(LINEBUF_HEAP_SIZE); init_main_logfile(); - init_patricia(); newconf_init(); init_s_conf(); init_s_newconf(); @@ -644,12 +586,12 @@ main(int argc, char *argv[]) me.servptr = &me; SetMe(&me); make_server(&me); - startup_time = CurrentTime; + startup_time = rb_current_time(); add_to_client_hash(me.name, &me); add_to_id_hash(me.id, &me); me.serv->nameinfo = scache_connect(me.name, me.info, 0); - dlinkAddAlloc(&me, &global_serv_list); + rb_dlinkAddAlloc(&me, &global_serv_list); construct_umodebuf(); @@ -660,31 +602,31 @@ main(int argc, char *argv[]) ilog(L_MAIN, "Server Ready"); - eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME); + rb_event_addish("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME); /* We want try_connections to be called as soon as possible now! -- adrian */ /* No, 'cause after a restart it would cause all sorts of nick collides */ /* um. by waiting even longer, that just means we have even *more* * nick collisions. what a stupid idea. set an event for the IO loop --fl */ - eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME); - eventAddOnce("try_connections_startup", try_connections, NULL, 0); + rb_event_addish("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME); + rb_event_addonce("try_connections_startup", try_connections, NULL, 0); - eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME); + rb_event_addish("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME); /* Setup the timeout check. I'll shift it later :) -- adrian */ - eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1); + rb_event_addish("rb_checktimeouts", rb_checktimeouts, NULL, 1); - eventAdd("check_rehash", check_rehash, NULL, 1); + rb_event_add("check_rehash", check_rehash, NULL, 1); if(splitmode) - eventAdd("check_splitmode", check_splitmode, NULL, 2); + check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 2); ServerRunning = 1; print_startup(getpid()); - charybdis_io_loop(); + rb_lib_loop(250); return 0; }