cco/cl-scopes
3
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

csys:environ: send-message, send-connect: clean-up, improvments

Browse source
This commit is contained in:
Helmut Merz 2026-08-11 14:35:07 +02:00
parent 0bf199388a
commit 9dfb96d99c
3 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
csys/environ.lisp
View file

@ -102,9 +102,12 @@
;;;; public shortcuts ;;;; public shortcuts
(defun send-value (cat-loc val &key (domain csys:*domain*) (env *env*) delay) (defun send-message (head data &key (env *env*))
(actor:send env (message:create head :data data)))
(defun send-value (cat-loc val &key (domain csys:*domain*) (env *env*))
(let ((head (cons domain (cons :value cat-loc)))) (let ((head (cons domain (cons :value cat-loc))))
(actor:send env (message:create head :data `(:value ,val))))) (send-message head `(:value ,val) :env env)))
(defun send-connect (rcvr target &key (domain csys:*domain*) (env *env*) op) (defun send-connect (rcvr target &key (domain csys:*domain*) (env *env*) op)
(let* ((cat-loc (when (listp rcvr) rcvr)) (let* ((cat-loc (when (listp rcvr) rcvr))
@ -114,12 +117,7 @@
(when (and (listp target) (< (length target) 3)) (when (and (listp target) (< (length target) 3))
(setf target (cons domain target))) (setf target (cons domain target)))
(util:plist-add data :target target) (util:plist-add data :target target)
(util:lgi rcvr target cat-loc head data) (send-message head data :env env)))
(actor:send env (message:create head :data data))))
(defun x-send-connect (env &rest args &key (domain csys:*domain*) to target op)
(let ((head (list domain :connect)))
(actor:send env (message:create head :data args))))
;;;; internal helpers ;;;; internal helpers

12
csys/program/basic.lisp
View file

@ -54,12 +54,8 @@
(defun b1-next-one () (defun b1-next-one ()
(lambda (msg scope) (lambda (msg scope)
(let ((self actor:*self*) (let ((self actor:*self*)
(environ:*env* (csys:environ scope)) (environ:*env* (csys:environ scope)))
(env (csys:environ scope)))
(environ:send-connect self '(:e01 "1-0") :op (csys:multiply -1)) (environ:send-connect self '(:e01 "1-0") :op (csys:multiply -1))
;(environ:send-connect env :to self :target '(:csys :e01 "1-0")
; :op (csys:multiply -1))
;(environ:send-connect env :to self :target '(:csys :e01 "1-1"))
(environ:send-connect self '(:e01 "1-1")) (environ:send-connect self '(:e01 "1-1"))
;; switch :active ;; switch :active
nil))) nil)))
@ -90,14 +86,10 @@
(defun b2-next-one () (defun b2-next-one ()
(lambda (msg scope) (lambda (msg scope)
(let ((self actor:*self*) (let ((self actor:*self*)
(env (csys:environ scope)) (environ:*env* (csys:environ scope)))
(environ:*env* (csys:environ scope))
(zero '(:csys :c02 "0-0")))
(csys:send-create self :cat :s02 :loc "1-1" :connect :pred) (csys:send-create self :cat :s02 :loc "1-1" :connect :pred)
(csys:send-create self :cat :e02 :loc "2-1" :connect :succ) (csys:send-create self :cat :e02 :loc "2-1" :connect :succ)
(environ:send-connect self '(:c02 "0-0") :op (csys:multiply -1)) (environ:send-connect self '(:c02 "0-0") :op (csys:multiply -1))
(environ:send-connect '(:c02 "0-0") self :op (csys:multiply -1)) (environ:send-connect '(:c02 "0-0") self :op (csys:multiply -1))
;; switch :active ;; switch :active
nil))) nil)))

6
test/test-csys.lisp
View file

@ -89,10 +89,8 @@
(deftest test-basic-2 () (deftest test-basic-2 ()
(let ((environ:*env* (setup-test (basic:config-b2)))) (let ((environ:*env* (setup-test (basic:config-b2))))
(sleep 0.02) (sleep 0.02)
(environ:send-value '(:s02 "1-0") 1) (environ:send-value '(:s02 "1-0") 1) (sleep 0.0001)
(sleep 0.0001) (environ:send-value '(:s02 "1-1") 2) (sleep 0.0001) ;; 2 => loop
(environ:send-value '(:s02 "1-1") 2) ;; 2 => loop
(sleep 0.0001)
(environ:send-value '(:s02 "1-0") 2) ;; stop loop (environ:send-value '(:s02 "1-0") 2) ;; stop loop
(sleep 0.03) (sleep 0.03)
(core:shutdown))) (core:shutdown)))