Add timeouts to the dc loop in util.scm.

[doldaconnect.git] / lib / guile / dolcon / util.scm

diff --git a/lib/guile/dolcon/util.scm b/lib/guile/dolcon/util.scm
index 5680338..bd09a23 100644 (file)
--- a/lib/guile/dolcon/util.scm
+++ b/lib/guile/dolcon/util.scm
@@ -21,6 +21,8 @@
 (define fnetnodes '())
 (define loop-procs '())
 (define fn-procs '())
+(define msg-procs '())
+(define timeouts '())
 
 (define-public dc-fn-update
   (lambda ()
@@ -71,7 +73,7 @@
     (set! fn-procs (cons (list event proc)
                         fn-procs))))
 
-(define-public dc-handle-fn
+(define dc-handle-fn
   (lambda ()
     (dc-fn-update)
     (let* ((notify (lambda (event data) (for-each (lambda (o) (if (eq? event (car o)) ((cadr o) data))) fn-procs)))
@@ -103,6 +105,33 @@
                                     (notify 'dstr (cdr nform))
                                     (set! fnetnodes (delq nform fnetnodes))))))))
 
+(define-public dc-msgproc-reg
+  (lambda (proc)
+    (set! msg-procs (cons proc msg-procs))))
+
+(define dc-handle-msg
+  (lambda ()
+    (dc-loop-reg ".notify" 640 (lambda (r er)
+                                (let ((sender (cadadr (assq 'resp er)))
+                                      (message (cddadr (assq 'resp er))))
+                                  (for-each (lambda (o) (o sender message))
+                                            msg-procs))))))
+
+(define-public dc-util-handle
+  (lambda what
+    (for-each (lambda (o)
+               (case o
+                 ((fn) (dc-handle-fn))
+                 ((msg) (dc-handle-msg))))
+             what)))
+
+(define-public dc-timeout
+  (lambda (rel timeout proc)
+    (let* ((tf (gettimeofday))
+          (t (+ (car tf) (/ (cdr tf) 1000000))))
+      (set! timeouts (merge timeouts (list (cons (if rel (+ timeout t) timeout) proc))
+                           (lambda (a b) (< (car a) (car b))))))))
+
 (define-public dc-loop-reg
   (lambda (cmd code proc)
     (set! loop-procs (cons (cons (cons cmd code) proc)
@@ -111,7 +140,12 @@
 (define-public dc-loop
   (lambda ()
     (while #t
-          (dc-select 10000)
+          (dc-select (if (eq? timeouts '())
+                         10000
+                         (let* ((tf (gettimeofday))
+                                (t (+ (car tf) (/ (cdr tf) 1000000)))
+                                (dt (- (caar timeouts) t)))
+                           (if (< dt 0) 0 (truncate (inexact->exact (* dt 1000)))))))
           (while (let ((resp (dc-getresp)))
                    (if resp
                        (let* ((er (dc-extract resp)) (code (cdr (assq 'code er))) (cmd (cdr (assq 'cmd er))))
@@ -123,6 +157,12 @@
                           loop-procs))
                        #f))
                  #f)
+          (while (and (not (eq? timeouts '()))
+                      (let* ((tf (gettimeofday))
+                            (t (+ (car tf) (/ (cdr tf) 1000000))))
+                        (>= t (caar timeouts))))
+                 ((cdar timeouts))
+                 (set! timeouts (cdr timeouts)))
           (for-each (lambda (o)
                       (if (equal? (caar o) ".periodic")
                           ((cdr o))))