X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base.lisp;h=59c6f05fafc47b2a09ecb0c6cd2ffccf3765b8ea;hb=ea50229269c428ed82edcda11fa056786469cac7;hp=649d82f254d23ad400c65f0aa455737016372763;hpb=fb31277c5dace4cc9cf731c42e5034ace9dc31f2;p=cl-modlisp.git diff --git a/base.lisp b/base.lisp index 649d82f..59c6f05 100644 --- a/base.lisp +++ b/base.lisp @@ -7,119 +7,86 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: base.lisp,v 1.4 2003/07/05 22:54:00 kevin Exp $ +;;;; $Id: base.lisp,v 1.11 2003/07/11 02:38: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) - ) +(defun modlisp-start (&key (port +default-modlisp-port+) + (processor 'demo-modlisp-command-processor) + (processor-args nil) + (catch-errors t) + timeout + number-fixed-workers) + (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 + :timeout timeout + :number-fixed-workers number-fixed-workers))) + (init/listener listener :start))) -(defun close-socket (sock) - (ignore-errors (close sock))) - -(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 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*) - (values nil nil)) - (:no-error (process socket) - (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*))) + (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 &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) - (apply processor-fun command args) - (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) + (finish-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*) - - (defun set-close-apache-socket (close?) - (setq *close-apache-socket* close?)) + (when *close-modlisp-socket* + (return))))) + (close-active-socket *modlisp-socket*))) - ) ;; 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=)))