X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=demos%2Factors%2Fsimplest-possible.scm;h=1b649dcbef9bd192dee2a9efdea120d2d2e4cf2d;hb=57b7dfc7a351017e09bd158889ed45fa57e51289;hp=8496b92592d40adb2270dbc8f8b816cc6a95cd53;hpb=509e4af613c8a67d58f1cb2d2409c4db88f77fd2;p=8sync.git

diff --git a/demos/actors/simplest-possible.scm b/demos/actors/simplest-possible.scm
index 8496b92..1b649dc 100644
--- a/demos/actors/simplest-possible.scm
+++ b/demos/actors/simplest-possible.scm
@@ -1,5 +1,5 @@
 ;;; 8sync --- Asynchronous programming for Guile
-;;; Copyright (C) 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2016, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -16,24 +16,30 @@
 ;;; You should have received a copy of the GNU Lesser General Public
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
-(use-modules (8sync systems actors)
-             (oop goops))
+(use-modules (8sync actors)
+             (oop goops)
+             (fibers conditions))
 
-(define-simple-actor <emo>
-  (greet-proog
-   (lambda (actor message target)
-     (display "emo> What's next, Proog?\n")
-     (<- actor target 'greet-emo))))
+(define-actor <emo> (<actor>)
+  ((greet-proog
+    (lambda (actor message target)
+      (display "emo> What's next, Proog?\n")
+      (<- target 'greet-emo)))))
 
-(define-simple-actor <proog>
-  (greet-emo
-   (lambda (actor message)
-     (display "proog> Listen, Emo!  Listen to the sounds of the machine!\n"))))
+(define-actor <proog> (<actor>)
+  ((greet-emo
+    (lambda (actor message)
+      (display "proog> Listen, Emo!  Listen to the sounds of the machine!\n")
+      (signal-condition! (.done? actor)))))
+  (done? #:init-keyword #:done?
+         #:accessor .done?))
 
-(define hive (make-hive))
-(define our-emo (hive-create-actor hive <emo>))
-(define our-proog (hive-create-actor hive <proog>))
 (define (main . args)
-  (ez-run-hive hive
-               (list (bootstrap-message hive our-emo 'greet-proog
-                                        our-proog))))
+  (run-hive
+   (lambda (hive)
+     (define done? (make-condition))
+     (define our-emo (bootstrap-actor hive <emo>))
+     (define our-proog (bootstrap-actor hive <proog>
+                                        #:done? done?))
+     (<- our-emo 'greet-proog our-proog)
+     (wait done?))))