2001-02-22
2001-02-22 17:56:33 by Martin Stjernholm <mast@lysator.liu.se>
-
3bc3a78d192c25ca33e1cd34c1b1981324faaac8
(28 lines)
(+22/-6)
[
Show
| Annotate
]
Branch: 5.2
Try to wait out the backend thread along with the handler threads, to
avoid that callouts are broken randomly (which e.g. could cause .new
config files to be left behind).
Rev: server/base_server/roxen.pike:1.631
4:
// Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.
// ABS and suicide systems contributed freely by Francesco Chemolli
- constant cvs_version="$Id: roxen.pike,v 1.630 2001/02/09 00:15:20 per Exp $";
+ constant cvs_version="$Id: roxen.pike,v 1.631 2001/02/22 17:56:33 mast Exp $";
- // Used when running threaded to find out which thread is the backend thread,
- // for debug purposes only.
+ // Used when running threaded to find out which thread is the backend thread.
Thread.Thread backend_thread;
// The argument cache. Used by the image cache.
489: Inside #if defined(THREADS)
h=0;
} else if(!h) {
// Roxen is shutting down.
- report_debug("Handle thread ["+id+"] stopped\n");
+ report_debug("Handle thread ["+id+"] stopped.\n");
thread_reap_cnt--;
#ifdef NSERIOUS
if(!thread_reap_cnt) report_debug("+++ATH\n");
545: Inside #if defined(THREADS)
handler_threads += new_threads;
}
+ static Thread.MutexKey backend_block_lock;
+
void stop_handler_threads()
- //! Stop all the handler threads, but give up if it takes too long.
+ //! Stop all the handler threads and the backend, but give up if it
+ //! takes too long.
{
int timeout=10;
#if constant(_reset_dmalloc)
560: Inside #if defined(THREADS)
thread_reap_cnt++;
}
handler_threads = ({});
+
+ if (this_thread() != backend_thread) {
+ thread_reap_cnt++;
+ Thread.Mutex mutex = Thread.Mutex();
+ backend_block_lock = mutex->lock();
+ call_out (lambda () {
+ thread_reap_cnt--;
+ report_debug("Backend thread stopped.\n");
+ mutex->lock();
+ error("Backend stop failed.\n");
+ }, 0);
+ }
+
while(thread_reap_cnt) {
sleep(0.1);
if(--timeout<=0) {
3101:
// FIXME: Ought to use the shutdown code.
void exit_when_done()
{
- report_debug("Interrupt request received. Exiting,\n");
+ report_debug("Interrupt request received.\n");
die_die_die=1;
if(++_recurse > 4)