-/* main.c - NeonServ v5.2
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* main.c - NeonServ v5.3
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "DBHelper.h"
#include "commands.h"
#include "ConfigParser.h"
+#include "ssl.h"
time_t start_time;
-static int running;
+static int running, hard_restart;
static int statistics_requested_lusers = 0;
int statistics_enabled;
TIMEQ_CALLBACK(main_statistics);
return 1;
}
-int main(void) {
+#ifdef HAVE_THREADS
+void * thread_main(void *arg) {
+ time_t socket_wait;
+ while(running) {
+ socket_wait = time(0) + SOCKET_SELECT_TIME;
+ do {
+ socket_loop(SOCKET_SELECT_TIME);
+ } while(time(0) < socket_wait);
+ timeq_tick();
+ loop_bots();
+ clearTempUsers();
+ destroyEvents();
+ queue_loop();
+ }
+ return NULL;
+}
+#endif
+
+int main(int argc, char *argv[]) {
main:
start_time = time(0);
statistics_enabled = get_int_field("statistics.enable");
queue_init();
+ init_timeq();
init_lang();
+ ssl_init();
init_parser();
init_UserNode();
init_ChanNode();
init_DBHelper();
load_languages();
- timeq_add(10, main_statistics, NULL);
+ int update_minutes = get_int_field("statistics.frequency");
+ if(!update_minutes) update_minutes = 2;
+ timeq_add(update_minutes * 60 + 10, main_statistics, NULL);
+
+ int worker_threads = get_int_field("General.worker_threads");
+ if(!worker_threads) worker_threads = 1;
- time_t socket_wait;
running = 1;
+ #ifdef HAVE_THREADS
+ pthread_t tid[worker_threads];
+ int tid_id = 0;
+ for(tid_id = 0; tid_id < worker_threads; tid_id++) {
+ pthread_create(&tid[tid_id], NULL, thread_main, NULL);
+ }
+ for(tid_id = 0; tid_id < worker_threads; tid_id++) {
+ pthread_join(tid[tid_id], NULL);
+ }
+ #else
+ time_t socket_wait;
while(running) {
socket_wait = time(0) + SOCKET_SELECT_TIME;
do {
destroyEvents();
queue_loop();
}
+ #endif
cleanup();
+ if(hard_restart) {
+ /* Append a NULL to the end of argv[]. */
+ char **restart_argv = (char **)alloca((argc + 1) * sizeof(char *));
+ memcpy(restart_argv, argv, argc * sizeof(char *));
+ restart_argv[argc] = NULL;
+
+ #ifdef WIN32
+ execv(argv[0], (const char * const*)restart_argv);
+ #else
+ execv(argv[0], restart_argv);
+ #endif
+ }
goto main;
}
return c1 - c2;
}
-void restart_bot(int hard_restart) {
+void restart_bot(int do_hard_restart) {
+ hard_restart = do_hard_restart;
running = 0;
}
void statistics_update() {
if(get_int_field("statistics.enable") && statistics_requested_lusers && get_string_field("statistics.execute")) {
statistics_requested_lusers = 0;
- int update_minutes = get_int_field("statistics.frequency");
- if(!update_minutes) update_minutes = 2;
char command[MAXLEN];
/* parameters:
- visible users
- network users
- network channels
*/
- sprintf(command, "%s %d %d %d %.2f %.2f %d %d", get_string_field("statistics.execute"), getUserCount(), getChanUserCount(), getChannelCount(), ((float) statistics_privmsg / update_minutes), ((float) statistics_commands / update_minutes), statistics_network_users, statistics_network_channels);
+ sprintf(command, "%s %d %d %d %d %d %d %d", get_string_field("statistics.execute"), getUserCount(), getChanUserCount(), getChannelCount(), statistics_privmsg, statistics_commands, statistics_network_users, statistics_network_channels);
statistics_privmsg = 0;
statistics_commands = 0;
system(command);