;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Dec 2002
;;;;
-;;;; $Id: base.lisp,v 1.1 2003/07/04 19:52:32 kevin Exp $
+;;;; $Id: base.lisp,v 1.6 2003/07/08 06:40:00 kevin Exp $
;;;; *************************************************************************
(in-package #:modlisp)
-
-(let ((*listener-socket* nil)
- (*listener-process* nil))
-
- (defun modlisp-start (&key (port +default-apache-port+)
- (function 'sample-process-apache-command))
+(defun modlisp-start (&key (port +default-apache-port+)
+ (processor 'demo-apache-command-processor)
+ (processor-args nil))
+ (let ((listener (make-instance 'listener :port port
+ :name (next-server-name)
+ :function 'apache-command-issuer
+ :function-args (cons processor processor-args)
+ :format :text
+ :wait nil)))
(handler-case
- (make-socket-server (next-server-name) function port :format :text
- :wait nil)
+ (make-socket-server listener)
(error (e)
- (format t "Error ~A" e)
+ (format t "~&Error while trying to start modlisp server~& ~A" e)
(decf *listener-count*)
- nil)
- (:no-error (proc socket)
- (setq *listener-socket* socket)
- (setq *listener-proc* proc)
- proc)))
-
- (defun modlisp-stop ()
- (when *listener-proc*
- (format t "~&; killing ~d~%" *listener-proc*)
- #+sbcl (sb-unix:unix-kill *listener-proc* :sigalrm)
- #+allegro (mp:process-kill *listener-proc*)
- #+allegro (mp:process-allow-schedule)
- )
- (setq *listener-proc* nil)
- (when *listener-socket*
- (ignore-errors (close *listener-socket*))
- (setq *listener-socket* nil)))
-
- )
+ (values nil nil))
+ (:no-error (res)
+ (declare (ignore res))
+ (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-active-socket (connection worker))
+ (destroy-process (process worker)))
+ (setf (workers listener) nil)
+ (with-slots (process socket) listener
+ (errorset (close-passive-socket socket) t)
+ (errorset (destroy-process process) t))
+ (setq *active-listeners* (remove listener *active-listeners*)))
+
+(defun modlisp-stop-all ()
+ (dolist (listener *active-listeners*)
+ (ignore-errors
+ (progn
+ (modlisp-stop listener)
+ (setq *active-listeners* (remove listener *active-listeners*))))))
+
(defun next-server-name ()
(format nil "modlisp-socket-server-~d" (incf *listener-count*)))
(defun next-worker-name ()
(format nil "modlisp-worker-~d" (incf *worker-count*)))
-
-(defun apache-command-issuer (*apache-socket*
- &optional
- (processor-fun 'demo-apache-command-processor))
- "generates commands from apache, issues commands to processor-fun"
- (let ((*close-apache-socket* t))
+(let ((*number-server-requests* 0)
+ (*number-worker-requests* 0)
+ (*close-apache-socket* t))
+
+ (defun apache-command-issuer (*apache-socket* processor &rest args)
+ "generates commands from apache, issues commands to processor-fun"
(unwind-protect
- (loop for *apache-nb-use-socket* from 0
- for command = (get-apache-command)
- while command
- do (funcall processor-fun command)
- (force-output *apache-socket*)
- until *close-apache-socket*)
- (close *apache-socket*))))
+ (progn
+ (setq *number-worker-requests* 0)
+ (do ((command (read-apache-command) (read-apache-command)))
+ ((null command))
+ (apply processor command args)
+ (force-output *apache-socket*)
+ (incf *number-worker-requests*)
+ (incf *number-server-requests*)
+ (when *close-apache-socket*
+ (return))))
+ (close-active-socket *apache-socket*)))
+
+
+ (defun get-number-worker-requests ()
+ *number-worker-requests*)
-(defun get-apache-command ()
+ (defun get-number-server-requests ()
+ *number-server-requests*)
+
+ (defun set-close-apache-socket (close?)
+ (setq *close-apache-socket* close?))
+
+ ) ;; closure
+
+(defun header-value (header key)
+ (cdr (assoc key header :test #'string=)))
+
+(defun read-apache-command ()
(ignore-errors
- (let* ((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)))
- (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-apache-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*)
(push (cons "posted-content" content) header))
header)))
+(defun read-apache-line ()
+ (kmrcl:string-left-trim-one-char #\return
+ (read-line *apache-socket* nil nil)))
+
+(defun read-apache-header ()
+ (loop for key = (read-apache-line)
+ while (and key
+ (string-not-equal key "end")
+ (> (length key) 1))
+ for value = (read-apache-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*))
-(defun header-value (command key)
- (cdr (assoc key command :test #'string=)))
-
-
-;;; Default (demo) processor
-
-(defun demo-apache-command-processor (command)
- "Sample function to process an apache command"
- (if (equal (header-value command "url") "/asp/fixed")
- (fixed-request)
- (debug-request command)))
-
-(defun fixed-request ()
- (let ((html (fixed-html)))
- (write-header-line "Status" "200 OK")
- (write-header-line "Content-Type" "text/html")
- (write-header-line "Content-Length" (format nil "~d" (length html)))
- (write-header-line "Keep-Socket" "1")
- (write-string "end" *apache-socket*)
- (write-char #\NewLine *apache-socket*)
- (write-string html *apache-socket*)
- (setq *close-apache-socket* nil)) )
-
-(defun debug-request (command)
- (let ((html (debug-table command)))
- (write-header-line "Status" "200 OK")
- (write-header-line "Content-Type" "text/html")
- (write-header-line "Keep-Socket" "0")
- (write-string "end" *apache-socket*)
- (write-char #\NewLine *apache-socket*)
- (write-string html *apache-socket*)
- (setq *close-apache-socket* t)) )
-
-(defun debug-table (command)
- (with-output-to-string (s)
- (write-string "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">
-<HTML><HEAD></HEAD><BODY><TABLE bgcolor=\"#c0c0c0\">
-<TR bgcolor=\"yellow\"><TH COLSPAN=2>ACL 6.2 + mod_lisp 2.0 + apache + Linux</TH></TR>
-<TR bgcolor=\"yellow\"><TH>Key</TH><TH>Value</TH></TR>" s)
- (format s "<TR bgcolor=\"#F0F0c0\"><TD>apache-nb-use-socket</TD><TD>~a</TD></TR>" *apache-nb-use-socket*)
- (loop for (key . value) in command do
- (format s "<TR bgcolor=\"#F0F0c0\"><TD>~a</TD><TD>~a</TD></TR>" key value))
- (write-string "</TABLE></BODY></HTML>" s)))
-(defun fixed-html ()
- "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">
-<HTML><HEAD></HEAD><BODY><H1>mod_lisp 2.0</H1><P>This is a constant
- html string sent by mod_lisp</P></BODY></HTML>")
projects / cl-modlisp.git / blobdiff