More conversion to the new config system. WARNING BROKEN BUILD

[citadel.git] / citadel / threads.c

diff --git a/citadel/threads.c b/citadel/threads.c
index bea9665c3c5eba17ec14aa8af7fd6e16f59c431d..5cb70334c0b9fc13703045236de963ac55c899de 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -1,7 +1,7 @@
 /*
  * Thread handling stuff for Citadel server
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -12,48 +12,16 @@
  * GNU General Public License for more details.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
+#include <stdio.h>
 #include <syslog.h>
-
-#include "sysdep.h"
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYSCALL_H
-# include <syscall.h>
-#else 
-# if HAVE_SYS_SYSCALL_H
-#  include <sys/syscall.h>
-# endif
-#endif
-
 #include <libcitadel.h>
-
-#include "threads.h"
-#include "ctdl_module.h"
 #include "modules_init.h"
-#include "housekeeping.h"
+#include "serv_extensions.h"
+#include "ctdl_module.h"
 #include "config.h"
-#include "citserver.h"
-#include "sysdep_decls.h"
 #include "context.h"
-#include "event_client.h"
+#include "threads.h"
 
 
 int num_workers = 0;                           /* Current number of worker threads */
@@ -152,7 +120,7 @@ void *CTC_backend(void *supplied_start_routine)
 
        start_routine(NULL);
 
-       free(mytsd);
+//     free(mytsd);
        return(NULL);
 }
 
@@ -204,7 +172,7 @@ void go_threading(void)
         * they are all in use.
         */
        while (!server_shutting_down) {
-               if ((active_workers == num_workers) && (num_workers < config.c_max_workers)) {
+               if ((active_workers == num_workers) && (num_workers < CtdlGetConfigInt("c_max_workers"))) {
                        CtdlThreadCreate(worker_thread);
                }
                usleep(1000000);