X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=8sync%2Frepl.scm;h=46f7cfd78012988685742fc40cdbf6b3a7977a23;hp=bc68138eb3b5c353d9fe0e9d8e50dc130c27d93a;hb=8dba3c377b12744afbc563894da2a69e828a2ef2;hpb=9bb036f18457a6c2d24343e21e6950f9df5043e7

diff --git a/8sync/repl.scm b/8sync/repl.scm
index bc68138..46f7cfd 100644
--- a/8sync/repl.scm
+++ b/8sync/repl.scm
@@ -1,5 +1,5 @@
 ;;; 8sync --- Asynchronous programming for Guile
-;;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2015, 2016, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -17,23 +17,65 @@
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (8sync repl)
-  #:use-module (ice-9 q)
-  #:use-module (8sync agenda)
+  #:use-module (oop goops)
+  #:use-module (8sync)
+  #:use-module (8sync daydream)
+  #:use-module (srfi srfi-1)
+  #:use-module (system repl server)
   #:use-module (system repl coop-server)
-  #:export (make-coop-server-handler
-            spawn-and-queue-repl-server!))
+  #:export (<repl-manager>))
 
-(define (make-coop-server-handler coop-server)
-  (define (run-self)
-    (poll-coop-repl-server coop-server)
-    ;; queue ourselves again
-    (run-delay (run-self) (/ 1 30)))
-  run-self)
+(define-actor <repl-manager> (<actor>)
+  ((add-subscriber repl-manager-add-subscriber)
+   (remove-subscriber repl-manager-remove-subscriber)
+   (main-loop repl-manager-main-loop))
+  (path #:init-keyword #:path
+        #:init-value "/tmp/8sync-socket"
+        #:getter .path)
+  (socket #:init-value #f
+          #:accessor .socket)
+  (poll-every #:init-keyword #:poll-every
+              #:init-value (/ 1 30)
+              #:getter .poll-every)
+  (subscribers #:init-keyword #:subscribers
+               #:init-value '()
+               #:accessor .subscribers))
 
-(define* (spawn-and-queue-repl-server! agenda #:optional port)
-  (let ((coop-server
-         (if port
-             (spawn-coop-repl-server port)
-             (spawn-coop-repl-server))))
-    (enq! (agenda-queue agenda)
-          (make-coop-server-handler coop-server))))
+(define-method (actor-cleanup! (repl-manager <repl-manager>))
+  ;; Close the socket, if open
+  (and=> (.socket repl-manager)
+         close)
+  ;; Delete the file, if it exists
+  (when (file-exists? (.path repl-manager))
+    (delete-file (.path repl-manager))))
+
+(define-method (actor-init! (repl-manager <repl-manager>))
+  (<- (actor-id repl-manager) 'main-loop))
+
+(define-method (repl-manager-main-loop repl-manager message)
+  (define socket
+    (make-unix-domain-server-socket #:path (.path repl-manager)))
+  (define server
+    (spawn-coop-repl-server socket))
+  (define (inform-subscribers)
+    (for-each
+     (lambda (subscriber)
+       (<- subscriber 'repl-update))
+     (.subscribers repl-manager)))
+  (set! (.socket repl-manager) socket)
+  (while (actor-alive? repl-manager)
+    (daydream (.poll-every repl-manager))
+    (poll-coop-repl-server server)
+    (inform-subscribers)))
+
+(define (repl-manager-add-subscriber repl-manager message)
+  (define from (message-from message))
+  (unless (member from (.subscribers repl-manager))
+    (set! (.subscribers repl-manager)
+          (cons from (.subscribers repl-manager)))))
+
+(define (repl-manager-remove-subscriber repl-manager message)
+  (define from (message-from message))
+  (set! (.subscribers repl-manager)
+        (remove (lambda (x) (equal? x (message-from message)))
+                (.subscribers repl-manager))))