r5239: *** empty log message ***

[cl-modlisp.git] / base.lisp

diff --git a/base.lisp b/base.lisp
index 6b63c4d06e1a24330cc690b311677130deb6ac27..649d82f254d23ad400c65f0aa455737016372763 100644 (file)
--- a/base.lisp
+++ b/base.lisp
@@ -7,49 +7,56 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.3 2003/07/05 00:51:04 kevin Exp $
+;;;; $Id: base.lisp,v 1.4 2003/07/05 22:54:00 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
+(defun destroy-process (process)
+  #+sbcl (sb-thread:destroy-thread process)
+  #+cmucl (mp:destroy-process process)
+  #+allegro (mp:process-kill process)
+  #+lispworks (mp:process-kill process)
+  )
 
-(let ((*listener-socket* nil)
-      (*listener-process* nil))
+(defun close-socket (sock)
+  (ignore-errors (close sock)))
 
-  (defun modlisp-start (&key (port +default-apache-port+)
-                            (function 'demo-apache-command-processor))
+
+(defun modlisp-start (&key (port +default-apache-port+)
+                          (function 'demo-apache-command-processor)
+                          (function-args nil))
+  (let ((listener (make-instance 'listener)))
     (handler-case
-       (make-socket-server (next-server-name) function port
-                           :format :text :wait nil)
+       (make-socket-server (next-server-name) function port listener
+                           :format :text :wait nil
+                           :function-args function-args)
       (error (e)
        (format t "~&Error while trying to start modlisp server~&  ~A" e)
        (decf *listener-count*)
-       nil)
+       (values nil nil))
       (:no-error (process socket)
-       (setq *listener-socket* socket)
-       (setq *listener-process* process)
-       process)))
-  
-  (defun modlisp-stop ()
-    (when *listener-process*
-      (format t "~&; killing modlisp server process ~A~%" *listener-process*)
-      (handler-case
-         (progn
-           #+sbcl (sb-thread:destroy-thread *listener-process*)
-           #+cmucl (mp:destroy-process *listener-process*)
-           #+allegro (mp:process-kill *listener-process*)
-           #+allegro (mp:process-allow-schedule)
-           #+lispworks (mp:process-kill *listener-process*))
-       (error (e)
-         (format t "~&Error while trying to kill modlisp server~&  ~A" e))
-       (:no-error (res)
-         (declare (ignore res))
-         (setq *listener-process* nil))))
-    (when *listener-socket*
-      (ignore-errors (close *listener-socket*))
-      (setq *listener-socket* nil)))
-  
- ) ;; closure
+       (setf (process listener) process)
+       (setf (socket listener) socket)
+       (push listener *active-listeners*)
+       listener))))
+    
+(defun modlisp-stop (listener)
+  (unless listener
+    (cmsg "listener is NIL in modlisp-stop")
+    (return-from modlisp-stop))
+  (dolist (worker (workers listener))
+    (close-socket (socket worker))
+    (destroy-process (process worker)))
+  (setf (workers listener) nil)
+  (with-slots (process socket) listener
+    (handler-case
+         (destroy-process process)
+      (error (e)
+       (format t "~&Error while trying to kill modlisp server~&  ~A" e)))
+    (when socket
+      (ignore-errors (close-socket socket))))
+  (setq *active-listeners* (remove listener *active-listeners*)))
     
 (defun next-server-name ()
   (format nil "modlisp-socket-server-~d" (incf *listener-count*))) 
@@ -61,14 +68,14 @@
       (*number-worker-requests* 0)
       (*close-apache-socket* t))
   
-  (defun apache-command-issuer (*apache-socket* processor-fun)
+  (defun apache-command-issuer (*apache-socket* processor-fun &rest args)
     "generates commands from apache, issues commands to processor-fun"
     (unwind-protect
         (progn
           (setq *number-worker-requests* 0)
           (do ((command (read-apache-command) (read-apache-command)))
               ((null command) 'done)
-            (funcall processor-fun command)
+            (apply processor-fun command args)
             (force-output *apache-socket*)
             (incf *number-worker-requests*)
             (incf *number-server-requests*)