Skip to content

Commit 3bbb4d6

Browse files
committed
Merge branch 'master' into dev-io-thread
2 parents 4b8e4b9 + e7f62f5 commit 3bbb4d6

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:paths ["src/main/clojure"]
22
:deps
3-
{org.clojure/tools.analyzer.jvm {:mvn/version "1.3.1"}}
3+
{org.clojure/tools.analyzer.jvm {:mvn/version "1.3.2"}}
44
:aliases
55
{:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.132"}}
66
:extra-paths ["src/main/clojure/cljs" "src/test/cljs"]}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.clojure</groupId>
4646
<artifactId>tools.analyzer.jvm</artifactId>
47-
<version>1.3.1</version>
47+
<version>1.3.2</version>
4848
</dependency>
4949
</dependencies>
5050

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:url "http://www.eclipse.org/legal/epl-v10.html"}
66
:parent [org.clojure/pom.contrib "1.2.0"]
77
:dependencies [[org.clojure/clojure "1.11.4"]
8-
[org.clojure/tools.analyzer.jvm "1.3.1"]
8+
[org.clojure/tools.analyzer.jvm "1.3.2"]
99
[org.clojure/clojurescript "1.11.132" :scope "provided"]]
1010
:global-vars {*warn-on-reflection* true}
1111
:source-paths ["src/main/clojure"]

src/main/clojure/clojure/core/async/flow.clj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@
133133
[g pid cmd-id more-kvs] (g/command-proc g pid cmd-id more-kvs))
134134

135135
(defn inject
136-
"synchronously puts the messages on the channel corresponding to the
137-
input or output of the process"
136+
"asynchronously puts the messages on the channel corresponding to the
137+
input or output of the process, returning a future that will
138+
complete when done."
138139
[g [pid io-id :as coord] msgs] (g/inject g coord msgs))
139140

140141
(defn process

src/main/clojure/clojure/core/async/flow/impl.clj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
(let [{:keys [control]} (running-chans)]
8080
(async/>!! control #::flow{:command command :to to})))]
8181
(reify
82-
clojure.core.async.flow.impl.graph.Graph
82+
clojure.core.async.flow.impl.graph.Graph
8383
(start [_]
8484
(.lock lock)
8585
(try
@@ -170,8 +170,9 @@
170170
(inject [_ coord msgs]
171171
(let [{:keys [resolver]} (running-chans)
172172
chan (spi/get-write-chan resolver coord)]
173-
(doseq [m msgs]
174-
(async/>!! chan m)))))))
173+
((futurize #(doseq [m msgs]
174+
(async/>!! chan m))
175+
{:exec :io})))))))
175176

176177
(defn handle-command
177178
[pid pong status cmd]

0 commit comments

Comments
 (0)