1998-02-05
1998-02-05 02:01:02 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
34fbbc47fd61bff9e047e1bacac911f727375bb3
(19 lines)
(+10/-9)
[
Show
| Annotate
]
Branch: 5.2
Now works without threads again.
Rev: server/base_server/roxen.pike:1.165
1:
- constant cvs_version = "$Id: roxen.pike,v 1.164 1998/02/05 00:59:18 js Exp $";
+ constant cvs_version = "$Id: roxen.pike,v 1.165 1998/02/05 02:01:02 grubba Exp $";
#define IN_ROXEN
#include <roxen.h>
#include <config.h>
194:
f(@args);
}
+ function handle = unthreaded_handle;
+
+ #ifdef THREADS
+ #define THREAD_DEBUG
+
object do_thread_create(string id, function f, mixed ... args)
{
object t = thread_create(f, @args);
202:
return t;
}
- function handle = unthreaded_handle;
-
- #ifdef THREADS
- #define THREAD_DEBUG
-
+
object (Queue) handle_queue = Queue();
void handler_thread(int id)
2230: Inside #if defined(THREADS)
do_thread_create( "Shuffle thread ["+i+"]", shuffle_thread, i );
number_of_shuffler_threads = i;
}
- #endif /* THREADS */
+
#if efun(send_fd)
object shuffler;
2253: Inside #if efun(send_fd)
start_shuffler_threads();
}
}
- #endif /* send_fd */
+ #endif /* efun(send_fd) */
+ #endif /* THREADS */
static private int _recurse;
2399: Inside #if defined(THREADS) and #if efun(thread_set_concurrency)
#if efun(thread_set_concurrency)
thread_set_concurrency(QUERY(numthreads)+QUERY(numshufflethreads)+1);
#endif
- #endif /* THREADS */
+
#if efun(send_fd)
init_shuffler();
#endif
-
+ #endif /* THREADS */
// Signals which cause a restart (exitcode != 0)
foreach( ({ "SIGUSR1", "SIGUSR2", "SIGHUP", "SIGINT" }), string sig) {