From: Kevin M. Rosenberg Date: Fri, 31 Aug 2007 18:04:31 +0000 (+0000) Subject: r11859: Canonicalize whitespace X-Git-Tag: debian-0.6-2~1 X-Git-Url: http://git.kpe.io/?p=cl-modlisp.git;a=commitdiff_plain;h=a1111b5229af705a0ff69d5655b17429ef7dcf1b r11859: Canonicalize whitespace --- diff --git a/base.lisp b/base.lisp index e08c251..ef54314 100644 --- a/base.lisp +++ b/base.lisp @@ -13,26 +13,26 @@ (in-package #:modlisp) (defun modlisp-start (&key (port +default-modlisp-port+) - (processor 'demo-modlisp-command-processor) - (processor-args nil) - (catch-errors t) - timeout - number-fixed-workers - remote-host-checker) + (processor 'demo-modlisp-command-processor) + (processor-args nil) + (catch-errors t) + timeout + number-fixed-workers + remote-host-checker) (let* ((server (make-instance 'ml-server - :processor processor - :processor-args processor-args - :port port)) - (listener (make-instance 'listener :port port - :base-name "modlisp" - :function 'modlisp-command-issuer - :function-args (list server) - :format :text - :wait nil - :catch-errors catch-errors - :timeout timeout - :number-fixed-workers number-fixed-workers - :remote-host-checker remote-host-checker))) + :processor processor + :processor-args processor-args + :port port)) + (listener (make-instance 'listener :port port + :base-name "modlisp" + :function 'modlisp-command-issuer + :function-args (list server) + :format :text + :wait nil + :catch-errors catch-errors + :timeout timeout + :number-fixed-workers number-fixed-workers + :remote-host-checker remote-host-checker))) (setf (listener server) listener) (init/listener listener :start) (setf *ml-server* server) @@ -53,19 +53,19 @@ "generates commands from modlisp, issues commands to processor-fun" (unwind-protect (progn - (let ((*number-worker-requests* 0) - (*close-modlisp-socket* t) - (*ml-server* server)) - (do ((command (read-modlisp-command) (read-modlisp-command))) - ((null command)) - (apply (processor server) command (processor-args server)) - (finish-output *modlisp-socket*) - (incf *number-worker-requests*) - (incf *number-server-requests*) - (when *close-modlisp-socket* - (return))))) + (let ((*number-worker-requests* 0) + (*close-modlisp-socket* t) + (*ml-server* server)) + (do ((command (read-modlisp-command) (read-modlisp-command))) + ((null command)) + (apply (processor server) command (processor-args server)) + (finish-output *modlisp-socket*) + (incf *number-worker-requests*) + (incf *number-server-requests*) + (when *close-modlisp-socket* + (return))))) (close-active-socket *modlisp-socket*))) - + (defun header-value (header key) "Returns the value of a modlisp header" (cdr (assoc key header :test #'eq))) @@ -73,20 +73,20 @@ (defun read-modlisp-command () (ignore-errors (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 *modlisp-socket*) - (push (cons :posted-content content) header)) - 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 *modlisp-socket*) + (push (cons :posted-content content) header)) + header))) (defun read-modlisp-line () (kmrcl:string-right-trim-one-char #\return - (read-line *modlisp-socket* nil nil))) + (read-line *modlisp-socket* nil nil))) (defun read-modlisp-header () diff --git a/demo.lisp b/demo.lisp index f2f801a..d91d1e3 100644 --- a/demo.lisp +++ b/demo.lisp @@ -21,10 +21,10 @@ (output-html-page (fixed-html-string))) ((equal url "/precompute.lsp") (with-ml-page (:precompute t) - (write-precomputed-page))) + (write-precomputed-page))) (t (with-ml-page (:precompute nil) - (write-debug-table command)))))) + (write-debug-table command)))))) (defun write-debug-table (command) (write-string " @@ -36,7 +36,7 @@ KeyValue " *modlisp-socket*) (loop for (key . value) in command do - (format *modlisp-socket* "~a~a" key value)) + (format *modlisp-socket* "~a~a" key value)) (write-string "" *modlisp-socket*)) @@ -59,43 +59,43 @@ (defun write-request-counts (s) (format s "

Number of server requests: ~D

" - *number-server-requests*) + *number-server-requests*) (format s "

Number of worker requests for this socket: ~D

" - *number-worker-requests*)) + *number-worker-requests*)) - -;;; A small test bench used to test and time the client/server protocol + +;;; A small test bench used to test and time the client/server protocol ;;; From Marc Battyani (defun fetch-mod-lisp-url (server url &key (num-fetch 1) (port 20123) - close-socket) + close-socket) (loop with server-socket and reply - repeat num-fetch - do (unless server-socket - (setf server-socket (make-active-socket server port))) - (write-string "url" server-socket) + repeat num-fetch + do (unless server-socket + (setf server-socket (make-active-socket server port))) + (write-string "url" server-socket) + (write-char #\NewLine server-socket) + (write-string url server-socket) + (write-char #\NewLine server-socket) + (write-string "end" server-socket) (write-char #\NewLine server-socket) - (write-string url server-socket) - (write-char #\NewLine server-socket) - (write-string "end" server-socket) - (write-char #\NewLine server-socket) - (force-output server-socket) - (setf reply (read-reply server-socket)) - (when close-socket - (close server-socket) - (setf server-socket nil)) - finally - (unless close-socket (close server-socket)) - (return reply))) + (force-output server-socket) + (setf reply (read-reply server-socket)) + (when close-socket + (close server-socket) + (setf server-socket nil)) + finally + (unless close-socket (close server-socket)) + (return reply))) (defun read-reply (socket) (let* ((header (loop for key = (read-line socket nil nil) - while (and key (string-not-equal key "end")) - for value = (read-line socket nil nil) - collect (cons key value))) - (content-length (cdr (assoc "Content-Length" header :test #'string=))) - (content (when content-length (make-string (parse-integer content-length :junk-allowed t))))) + while (and key (string-not-equal key "end")) + for value = (read-line socket nil nil) + collect (cons key value))) + (content-length (cdr (assoc "Content-Length" header :test #'string=))) + (content (when content-length (make-string (parse-integer content-length :junk-allowed t))))) (when content (read-sequence content socket) (push (cons "reply-content" content) header)) diff --git a/package.lisp b/package.lisp index e4cf840..d5fc5be 100644 --- a/package.lisp +++ b/package.lisp @@ -23,7 +23,7 @@ #:*number-server-requests* #:*ml-server* #:*close-modlisp-socket* - + ;; base.lisp #:modlisp-start #:modlisp-stop @@ -31,7 +31,7 @@ #:header-value #:write-header-line #:set-close-modlisp-socket - + ;; utils.lisp #:output-ml-page #:output-html-page diff --git a/utils.lisp b/utils.lisp index d6ebf83..bab76c3 100644 --- a/utils.lisp +++ b/utils.lisp @@ -18,7 +18,7 @@ (:xml "text/xml") (:text "text/plain") (otherwise fmt))) - + (defun format-string (fmt headers) `(("Content-Type" . ,(format->string fmt)) @@ -42,7 +42,7 @@ ,result)))) (defmacro with-ml-page ((&key (format :html) (precompute t) headers) - &body body) + &body body) (if precompute `(output-ml-page ,format (with-output-to-string (*modlisp-socket*) ,@body) :headers ,headers) `(write-response (:headers (format-string ,format ,headers)) ,@body))) @@ -71,13 +71,13 @@ (when posted-string (let ((alist '())) (dolist (name=val (kmrcl:delimited-string-to-list posted-string #\&) - (nreverse alist)) - (let ((name-val-list (kmrcl:delimited-string-to-list name=val #\=))) - (if (= 2 (length name-val-list)) - (destructuring-bind (name val) name-val-list - (push (cons (if keyword - (kmrcl:ensure-keyword name) - name) - (kmrcl:decode-uri-query-string val)) - alist)) - (cmsg-c :debug "Invalid number of #\= in ~S" name-val-list))))))) + (nreverse alist)) + (let ((name-val-list (kmrcl:delimited-string-to-list name=val #\=))) + (if (= 2 (length name-val-list)) + (destructuring-bind (name val) name-val-list + (push (cons (if keyword + (kmrcl:ensure-keyword name) + name) + (kmrcl:decode-uri-query-string val)) + alist)) + (cmsg-c :debug "Invalid number of #\= in ~S" name-val-list))))))) diff --git a/variables.lisp b/variables.lisp index fa29050..761038d 100644 --- a/variables.lisp +++ b/variables.lisp @@ -35,8 +35,8 @@ (port :initarg :port :initform nil :accessor port) (processor :initarg :processor :initform nil :accessor processor) (processor-args :initarg :processor-args :initform nil - :accessor processor-args))) - - + :accessor processor-args))) + + + -