X-Git-Url: http://git.kpe.io/?p=cl-modlisp.git;a=blobdiff_plain;f=base.lisp;h=b50a088867a8f6865923fdf69839e98fab86364a;hp=6b63c4d06e1a24330cc690b311677130deb6ac27;hb=fa641fe08adb5cede535a6dd79a79047c78ecf8a;hpb=315ebc6354619483aa1be1124eb3736cee6f7ab7

diff --git a/base.lisp b/base.lisp
index 6b63c4d..b50a088 100644
--- a/base.lisp
+++ b/base.lisp
@@ -7,112 +7,82 @@
 ;;;; 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.10 2003/07/10 18:58:29 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
+(defun modlisp-start (&key (port +default-modlisp-port+)
+			   (processor 'demo-modlisp-command-processor)
+			   (processor-args nil)
+			   (catch-errors t))
+  (let ((listener (make-instance 'listener :port port
+				 :base-name "modlisp"			 
+				 :function 'modlisp-command-issuer
+				 :function-args (cons processor processor-args)
+				 :format :text
+				 :wait nil
+				 :catch-errors catch-errors)))
+    (init/listener listener :start)))
 
-(let ((*listener-socket* nil)
-      (*listener-process* nil))
 
-  (defun modlisp-start (&key (port +default-apache-port+)
-			     (function 'demo-apache-command-processor))
-    (handler-case
-	(make-socket-server (next-server-name) function port
-			    :format :text :wait nil)
-      (error (e)
-	(format t "~&Error while trying to start modlisp server~&  ~A" e)
-	(decf *listener-count*)
-	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
-    
-(defun next-server-name ()
-  (format nil "modlisp-socket-server-~d" (incf *listener-count*))) 
+(defun modlisp-stop (listener)
+  (init/listener listener :stop))
 
-(defun next-worker-name ()
-  (format nil "modlisp-worker-~d" (incf *worker-count*)))
+(defun modlisp-stop-all ()
+  (stop-all/listener))
 
-(let ((*number-server-requests* 0)
-      (*number-worker-requests* 0)
-      (*close-apache-socket* t))
-  
-  (defun apache-command-issuer (*apache-socket* processor-fun)
-    "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)
-	     (force-output *apache-socket*)
+;; Internal functions
+
+(defun modlisp-command-issuer (*modlisp-socket* processor &rest args)
+  "generates commands from modlisp, issues commands to processor-fun"
+  (unwind-protect
+       (progn
+	 (let ((*number-worker-requests* 0)
+	       (*close-modlisp-socket* t))
+	   (do ((command (read-modlisp-command) (read-modlisp-command)))
+	       ((null command))
+	     (apply processor command args)
+	     (force-output *modlisp-socket*)
 	     (incf *number-worker-requests*)
 	     (incf *number-server-requests*)
-	     (when *close-apache-socket*
-	       (return))))
-      (close *apache-socket*)))
-
-  (defun get-number-worker-requests ()
-    *number-worker-requests*)
-
-  (defun get-number-server-requests ()
-    *number-server-requests*)
+	     (when *close-modlisp-socket*
+	       (return)))))
+    (close-active-socket *modlisp-socket*)))
   
-  (defun set-close-apache-socket (close?)
-    (setq *close-apache-socket* close?))
-  
-  ) ;; closure
+(defun header-value (header key)
+  "Returns the value of a modlisp header"
+  (cdr (assoc key header :test #'string=)))
 
-(defun read-apache-command ()
+(defun read-modlisp-command ()
   (ignore-errors
-    (let* ((header (read-apache-header))
-	  (content-length (cdr (assoc "content-length" header :test #'equal)))
-	  (content (when content-length 
-		     (make-string
-		      (parse-integer content-length :junk-allowed t)))))
+    (let* ((header (read-modlisp-header))
+	   (content-length (header-value header "content-length"))
+	   (content (when content-length 
+		      (make-string
+		       (parse-integer content-length :junk-allowed t)))))
      (when content
-       (read-sequence content *apache-socket*)
+       (read-sequence content *modlisp-socket*)
        (push (cons "posted-content" content) header))
      header)))
 
-(defun read-apache-header ()
-  (loop for key = (read-line *apache-socket* nil nil)
-			while (and key
-				   (string-not-equal key "end")
-				   (> (length key) 1))
-		      for value = (read-line *apache-socket* nil nil)
-		      collect (cons key value)))
+(defun read-modlisp-line ()
+  (kmrcl:string-right-trim-one-char
+   #\return
+   (read-line *modlisp-socket* nil nil)))
+
+(defun read-modlisp-header ()
+  (loop for key = (read-modlisp-line)
+      while (and key
+		 (string-not-equal key "end")
+		 (> (length key) 1))
+      for value = (read-modlisp-line)
+      collect (cons key value)))
 
 (defun write-header-line (key value)
-  (write-string key *apache-socket*)
-  (write-char #\NewLine *apache-socket*)
-  (write-string value *apache-socket*)
-  (write-char #\NewLine *apache-socket*))
+  (write-string key *modlisp-socket*)
+  (write-char #\NewLine *modlisp-socket*)
+  (write-string value *modlisp-socket*)
+  (write-char #\NewLine *modlisp-socket*))
 
-(defun header-value (command key)
-  (cdr (assoc key command :test #'string=)))