X-Git-Url: http://git.pond.sub.org/?p=eow;a=blobdiff_plain;f=empire.lisp;h=c32696c3504258bd0f4bf78d61806f3b419c11c0;hp=14ee352df7d5b295363e310342e580b0d902199c;hb=fc5e0903e87b50a4931b66a039f75feb95b78602;hpb=314f63c596d5ed625b969a92de5112069d14a8f2

diff --git a/empire.lisp b/empire.lisp
index 14ee352..c32696c 100644
--- a/empire.lisp
+++ b/empire.lisp
@@ -44,7 +44,11 @@
    (session
     :accessor session
     :initarg :session
-    :documentation "web session to which this connection belongs")))
+    :documentation "web session to which this connection belongs")
+   (send-queue
+    :accessor send-queue
+    :initform (locked-queue:create)
+    :documentation "lines outstanding to be sent at next prompt")))
 
 (defun make-connection (&key (user nil)
 			(password nil)
@@ -87,9 +91,13 @@
 (defgeneric quit (connection))
 (defgeneric handle-connection (connection))
 (defgeneric read-message (connection))
-(defgeneric send-message (connection message))
+(defgeneric send-message (connection message &key next-mode))
+(defgeneric connected-p (connection))
 (defgeneric reconnect (conncetion))
 
+(defmethod connected-p ((c connection))
+  (sb-thread:thread-alive-p (connection-handler c)))
+
 (defmethod reconnect ((c connection))
   (with-slots (server-name server-port user password socket stream connection-handler) c
       (let* ((sock (usocket:socket-connect server-name server-port))
@@ -168,7 +176,17 @@
 
 (defmethod handle-flush ((m play-mode) message)
   (let* ((c (connection m)))
-    (empire-web:prompt (session c) message)))
+    (empire-web:prompt (session c) message)
+    (send-next-line c)))
+
+(defmethod send-next-line ((c connection))
+  (let ((next-event (locked-queue:dequeue (send-queue c))))
+    (etypecase next-event
+      (string (send-message-one c next-event))
+      (cons (let ((message (car next-event))
+		  (mode (cdr next-event)))
+	      (send-message-one c message)
+	      (set-new-mode c mode))))))
 
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))
@@ -176,7 +194,8 @@
       (let* ((minutes (read s)) ;;FIXME DANGEROUS
 	     (btus (read s)))
 	(empire-web:prompt (session c)
-			   (format nil "[~a,~a]: " minutes btus))))))
+			   (format nil "[~a,~a]: " minutes btus))))
+    (send-next-line c)))
 
 (defmethod handle-ignore ((m init-mode) message)
   (declare (ignorable message))
@@ -243,27 +262,18 @@
   (let ((s (network-stream c)))
     (raw-send-message s message)))
 
-(defmethod send-message ((c connection) message)
-  (let ((sent-p nil)
-	(tries 3))
-    (loop
-       while (and (not sent-p)
-		  (> tries 0))
-       do (handler-case
-	      (progn
-		(send-message-one c message)
-		(setf sent-p t))
-	    (sb-int:closed-stream-error ()
-	      (progn
-		(decf tries)
-		(empire-log:info "~a: Connection close - retrying (~a tries left)" c tries)
-		(reconnect c))))))
-  message)
+(defmethod send-message ((c connection) message &key next-mode)
+  (if (not (connected-p c))
+      (reconnect c))
+  (if next-mode
+      (locked-queue:enqueue (send-queue c) (cons message next-mode))
+      (locked-queue:enqueue (send-queue c) message)))
 
 (defparameter +special-command-char+ #\;)
 
 (defun special-command-p (line)
-  (char= +special-command-char+ (aref line 0)))
+  (and (> (length line) 0)
+       (char= +special-command-char+ (aref line 0))))
 
 (defmethod special-xup ((c connection))
   t)