luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more agent vars (#857)

Browse source
This commit is contained in:
Michiel Borkent 2021-05-19 14:00:48 +02:00 committed by GitHub
parent 7e3b1f58d5
commit a942befc65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/babashka/impl/clojure/core.clj
View file

@ -1,11 +1,14 @@
(ns babashka.impl.clojure.core
{:no-doc true}
(:refer-clojure :exclude [future read+string clojure-version with-precision])
(:refer-clojure :exclude [future read+string clojure-version with-precision
send-via send send-off])
(:require [babashka.impl.common :as common]
[borkdude.graal.locking :as locking]
[clojure.core :as c]
[clojure.string :as str]
[sci.core :as sci]
[sci.impl.namespaces :refer [copy-core-var clojure-core-ns]]))
[sci.impl.namespaces :refer [copy-core-var clojure-core-ns]]
[sci.impl.vars :as vars]))
(defn locking* [form bindings v f & args]
(apply @#'locking/locking form bindings v f args))
@ -89,11 +92,54 @@
(binding [*math-context* math-context]
(body-fn)))
;;;; Agents
(defn send-via
"Dispatch an action to an agent. Returns the agent immediately.
Subsequently, in a thread supplied by executor, the state of the agent
will be set to the value of:
(apply action-fn state-of-agent args)"
[executor ^clojure.lang.Agent a f & args]
(apply c/send-via executor a (vars/binding-conveyor-fn f) args))
(defn send
"Dispatch an action to an agent. Returns the agent immediately.
Subsequently, in a thread from a thread pool, the state of the agent
will be set to the value of:
(apply action-fn state-of-agent args)"
[^clojure.lang.Agent a f & args]
(apply send-via clojure.lang.Agent/pooledExecutor a f args))
(defn send-off
"Dispatch a potentially blocking action to an agent. Returns the
agent immediately. Subsequently, in a separate thread, the state of
the agent will be set to the value of:
(apply action-fn state-of-agent args)"
[^clojure.lang.Agent a f & args]
(apply send-via clojure.lang.Agent/soloExecutor a f args))
;;;; End agents
(def core-extras
{'file-seq (copy-core-var file-seq)
{;; agents
'agent (copy-core-var agent)
'agent-error (copy-core-var agent-error)
'await (copy-core-var await)
'await-for (copy-core-var await-for)
'error-handler (copy-core-var error-handler)
'error-mode (copy-core-var error-mode)
'get-validator (copy-core-var get-validator)
'send (copy-core-var send)
'send-off (copy-core-var send-off)
'send-via (copy-core-var send-via)
'release-pending-sends (copy-core-var release-pending-sends)
'restart-agent (copy-core-var restart-agent)
'set-validator! (copy-core-var set-validator!)
'set-error-handler! (copy-core-var set-error-handler!)
'set-error-mode! (copy-core-var set-error-mode!)
;; end agents
'file-seq (copy-core-var file-seq)
'promise (copy-core-var promise)
'deliver (copy-core-var deliver)
'locking (with-meta locking* {:sci/macro true})

10
test/babashka/agent_test.clj Normal file
View file

@ -0,0 +1,10 @@
(ns babashka.agent-test
(:require
[babashka.test-utils :as test-utils]
[clojure.edn :as edn]
[clojure.test :as t :refer [deftest is]]))
(deftest agent-binding-conveyance-test
(let [prog
"(def ^:dynamic *foo* 1) (def a (agent nil)) (binding [*foo* 2] (send-off a (fn [_] *foo*))) (await a) @a"]
(is (= 2 (edn/read-string (test-utils/bb nil prog))))))