X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=variables.lisp;h=fa2905048c9f4249c802a01765691be89d214532;hb=131b7fa77fb2a885efe336da1ae1f05753c0c313;hp=f107c38bb26f2f3823febe10739147b4f162688e;hpb=cb60460c044d8e4c1270b30acd43853ef4ef8f94;p=cl-modlisp.git

diff --git a/variables.lisp b/variables.lisp
index f107c38..fa29050 100644
--- a/variables.lisp
+++ b/variables.lisp
@@ -7,49 +7,36 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: variables.lisp,v 1.5 2003/07/08 06:40:00 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
-(defvar *listener-count* 0
-  "used to name listeners")
+(defconstant +default-modlisp-port+ 20123
+  "Default port for listen")
 
-(defvar *worker-count* 0
-  "used to name workers")
+(defvar *modlisp-socket* nil
+  "the socket stream to modlisp")
 
-(defconstant +default-apache-port+ 20123
-  "Default port for listen")
+(defvar *number-server-requests* 0
+  "number of requests for the server")
+
+(defvar *number-worker-requests* 0
+  "number of requests for this worker process")
+
+(defvar *close-modlisp-socket* t
+  "whether to close the modlisp socket at the end of this request")
 
-(defvar *apache-socket* nil
-  "the socket stream to apache")
-
-(defvar *number-server-requests* 0)
-(defvar *number-worker-requests* 0)
-(defvar *close-apache-socket* t)
-
-(defclass listener ()
-  ((port :initarg :port :accessor port) 
-   (function :initarg :function :accessor listener-function
-	     :initform nil)
-   (function-args :initarg :function-args :accessor function-args
-		  :initform nil)
-   (process :initarg :process :accessor process)
-   (socket :initarg :socket :accessor socket)
-   (workers :initform nil :accessor workers
-	    :documentation "list of worker threads")
-   (name :initform "" :accessor name :initarg :name)
-   (wait :initform nil :accessor wait :initarg :wait)
-   (format :initform :text :accessor listener-format :initarg :format)))
-
-(defvar *active-listeners* nil
-    "List of active listeners")
-
-(defclass worker ()
-  ((listener :initarg :listener :accessor listener :initform nil)
-   (connection :initarg :connection :accessor connection :initform nil)
-   (name :initarg :name :accessor name :initform nil)
-   (thread-fun :initarg :thread-fun :accessor thread-fun :initform nil)
-   (process :initarg :process :accessor process :initform nil)))
+
+(defvar *ml-server* nil "Current ml-server instance")
+
+(defclass ml-server ()
+  ((listener :initarg :listener :initform nil :accessor listener)
+   (port :initarg :port :initform nil :accessor port)
+   (processor :initarg :processor :initform nil :accessor processor)
+   (processor-args :initarg :processor-args :initform nil
+		   :accessor processor-args)))
+   
+