Fixed.

[riece] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 9002676..99a1a07 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -105,6 +105,31 @@ the `riece-server-keyword-map' variable."
 (put 'riece-with-server-buffer 'lisp-indent-function 1)
 (put 'riece-with-server-buffer 'edebug-form-spec '(form body))
 
+(defun riece-make-queue ()
+  "Make a queue object."
+  (vector nil nil))
+
+(defun riece-queue-enqueue (queue object)
+  "Add OBJECT to the end of QUEUE."
+  (if (aref queue 1)
+      (let ((last (list object)))
+       (nconc (aref queue 1) last)
+       (aset queue 1 last))
+    (aset queue 0 (list object))
+    (aset queue 1 (aref queue 0))))
+
+(defun riece-queue-dequeue (queue)
+  "Remove an object from the beginning of QUEUE."
+  (unless (aref queue 0)
+    (error "Empty queue"))
+  (prog1 (car (aref queue 0))
+    (unless (aset queue 0 (cdr (aref queue 0)))
+      (aset queue 1 nil))))
+
+(defun riece-queue-empty (queue)
+  "Return t if QUEUE is empty."
+  (null (aref queue 0)))
+
 ;; stolen (and renamed) from time-date.el.
 (defun riece-seconds-to-time (seconds)
   "Convert SECONDS (a floating point number) to a time value."
@@ -112,23 +137,22 @@ the `riece-server-keyword-map' variable."
        (floor (mod seconds 65536))
        (floor (* (- seconds (ffloor seconds)) 1000000))))
 
+;; stolen (and renamed) from time-date.el.
+(defun riece-time-less-p (t1 t2)
+  "Say whether time value T1 is less than time value T2."
+  (or (< (car t1) (car t2))
+      (and (= (car t1) (car t2))
+          (< (nth 1 t1) (nth 1 t2)))))
+
 ;; stolen (and renamed) from time-date.el.
 (defun riece-time-since (time)
-  "Return the time elapsed since TIME.
-TIME should be either a time value or a date-time string."
+  "Return the time elapsed since TIME."
   (let* ((current (current-time))
         (rest (when (< (nth 1 current) (nth 1 time))
                 (expt 2 16))))
     (list (- (+ (car current) (if rest -1 0)) (car time))
          (- (+ (or rest 0) (nth 1 current)) (nth 1 time)))))
 
-;; stolen (and renamed) from time-date.el.
-(defun riece-time-less-p (t1 t2)
-  "Say whether time value T1 is less than time value T2."
-  (or (< (car t1) (car t2))
-      (and (= (car t1) (car t2))
-          (< (nth 1 t1) (nth 1 t2)))))
-
 (defun riece-flush-send-queue (process)
   (with-current-buffer (process-buffer process)
     (let ((length 0)
@@ -136,31 +160,27 @@ TIME should be either a time value or a date-time string."
       (if (riece-time-less-p (riece-seconds-to-time riece-send-delay)
                             (riece-time-since riece-last-send-time))
          (setq riece-send-size 0))
-      (while (and riece-send-queue
-                 (< riece-send-size riece-max-send-size))
-       (setq string (riece-encode-coding-string (car riece-send-queue))
+      (while (and (not (riece-queue-empty riece-send-queue))
+                 (<= riece-send-size riece-max-send-size))
+       (setq string (riece-encode-coding-string
+                     (riece-queue-dequeue riece-send-queue))
              length (length string))
        (if (> length riece-max-send-size)
            (message "Long message (%d > %d)" length riece-max-send-size)
-         (process-send-string process string)
-         (setq riece-send-size (+ riece-send-size length)))
-       (setq riece-send-queue (cdr riece-send-queue)))
+         (setq riece-send-size (+ riece-send-size length))
+         (when (<= riece-send-size riece-max-send-size)
+           (process-send-string process string)
+           (setq riece-last-send-time (current-time)))))
       (if riece-send-queue
-         (progn
-           (if riece-debug
-               (message "%d bytes sent, %d bytes left"
-                        riece-send-size
-                        (apply #'+ (mapcar #'length riece-send-queue))))
-           ;; schedule next send after a second
-           (riece-run-at-time riece-send-delay nil
-                              #'riece-flush-send-queue process))
-       (if riece-debug
-           (message "%d bytes sent" riece-send-size)))
-      (setq riece-last-send-time (current-time)))))
+         (riece-run-at-time riece-send-delay nil
+                            (lambda (process)
+                              (if (process-live-p process)
+                                  (riece-flush-send-queue process)))
+                            process)))))
 
 (defun riece-process-send-string (process string)
   (with-current-buffer (process-buffer process)
-    (setq riece-send-queue (nconc riece-send-queue (list string))))
+    (riece-queue-enqueue riece-send-queue string))
   (riece-flush-send-queue process))
 
 (defun riece-current-server-name ()
@@ -232,12 +252,13 @@ TIME should be either a time value or a date-time string."
     (make-local-variable 'riece-channel-filter)
     (make-local-variable 'riece-server-name)
     (make-local-variable 'riece-read-point)
+    (setq riece-read-point (point-min))
     (make-local-variable 'riece-send-queue)
-    (make-local-variable 'riece-last-send-time)
-    (setq riece-last-send-time '(0 0 0))
+    (setq riece-send-queue (riece-make-queue))
     (make-local-variable 'riece-send-size)
     (setq riece-send-size 0)
-    (setq riece-read-point (point-min))
+    (make-local-variable 'riece-last-send-time)
+    (setq riece-last-send-time '(0 0 0))
     (make-local-variable 'riece-obarray)
     (setq riece-obarray (make-vector riece-obarray-size 0))
     (make-local-variable 'riece-coding-system)