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

move locking to SCI (#1765)

Browse source
This commit is contained in:
Michiel Borkent 2024-11-24 11:58:27 +01:00 committed by GitHub
parent f0943d8a14
commit 3442f1e505
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
deps.edn
View file

@ -25,7 +25,6 @@
babashka/babashka.curl {:local/root "babashka.curl"} babashka/babashka.curl {:local/root "babashka.curl"}
babashka/fs {:local/root "fs"} babashka/fs {:local/root "fs"}
babashka/babashka.core {:local/root "babashka.core"} babashka/babashka.core {:local/root "babashka.core"}
borkdude/graal.locking {:mvn/version "0.0.2"},
org.clojure/core.async {:mvn/version "1.6.673"}, org.clojure/core.async {:mvn/version "1.6.673"},
org.clojure/tools.cli {:mvn/version "1.0.214"}, org.clojure/tools.cli {:mvn/version "1.0.214"},
org.clojure/data.csv {:mvn/version "1.0.0"}, org.clojure/data.csv {:mvn/version "1.0.0"},

4
project.clj
View file

@ -23,7 +23,6 @@
:jvm-opts ["--enable-preview"] :jvm-opts ["--enable-preview"]
:dependencies [[org.clojure/clojure "1.12.0"] :dependencies [[org.clojure/clojure "1.12.0"]
[borkdude/edamame "1.4.27"] [borkdude/edamame "1.4.27"]
[borkdude/graal.locking "0.0.2"]
[org.clojure/tools.cli "1.0.214"] [org.clojure/tools.cli "1.0.214"]
[cheshire "5.13.0"] [cheshire "5.13.0"]
[nrepl/bencode "1.2.0"] [nrepl/bencode "1.2.0"]
@ -37,7 +36,8 @@
[insn/insn "0.5.2"] [insn/insn "0.5.2"]
[org.babashka/cli "0.8.61"] [org.babashka/cli "0.8.61"]
[org.babashka/http-client "0.4.22"] [org.babashka/http-client "0.4.22"]
[org.jsoup/jsoup "1.18.1"]] [org.jsoup/jsoup "1.18.1"]
[borkdude/graal.locking "0.0.2"]]
:plugins [[org.kipz/lein-meta-bom "0.1.1"]] :plugins [[org.kipz/lein-meta-bom "0.1.1"]]
:metabom {:jar-name "metabom.jar"} :metabom {:jar-name "metabom.jar"}
:profiles {:feature/xml {:source-paths ["feature-xml"] :profiles {:feature/xml {:source-paths ["feature-xml"]

1
resources/META-INF/babashka/deps.edn
View file

@ -25,7 +25,6 @@
babashka/babashka.curl {:local/root "babashka.curl"} babashka/babashka.curl {:local/root "babashka.curl"}
babashka/fs {:local/root "fs"} babashka/fs {:local/root "fs"}
babashka/babashka.core {:local/root "babashka.core"} babashka/babashka.core {:local/root "babashka.core"}
borkdude/graal.locking {:mvn/version "0.0.2"},
org.clojure/core.async {:mvn/version "1.6.673"}, org.clojure/core.async {:mvn/version "1.6.673"},
org.clojure/tools.cli {:mvn/version "1.0.214"}, org.clojure/tools.cli {:mvn/version "1.0.214"},
org.clojure/data.csv {:mvn/version "1.0.0"}, org.clojure/data.csv {:mvn/version "1.0.0"},

2
sci

@ -1 +1 @@
Subproject commit a8ee100a5508aaecf39b945d813430266e4419b8 Subproject commit 5ae0ddedd740e0c245ed4be257c2c3724bc7e0b0

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

@ -3,7 +3,6 @@
(: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 sync into-array]) send-via send send-off sync into-array])
(:require [babashka.impl.common :as common] (:require [babashka.impl.common :as common]
[borkdude.graal.locking :as locking]
[clojure.core :as c] [clojure.core :as c]
[clojure.string :as str] [clojure.string :as str]
[sci.core :as sci] [sci.core :as sci]
@ -12,9 +11,6 @@
[sci.impl.utils :refer [clojure-core-ns]] [sci.impl.utils :refer [clojure-core-ns]]
[sci.impl.vars :as vars])) [sci.impl.vars :as vars]))
(defn locking* [form bindings v f & args]
(apply @#'locking/locking form bindings v f args))
(defn core-dynamic-var (defn core-dynamic-var
([sym] (core-dynamic-var sym nil)) ([sym] (core-dynamic-var sym nil))
([sym init-val] (sci/new-dynamic-var sym init-val {:ns clojure-core-ns}))) ([sym init-val] (sci/new-dynamic-var sym init-val {:ns clojure-core-ns})))
@ -148,7 +144,6 @@
'file-seq (copy-core-var file-seq) 'file-seq (copy-core-var file-seq)
'promise (copy-core-var promise) 'promise (copy-core-var promise)
'deliver (copy-core-var deliver) 'deliver (copy-core-var deliver)
'locking (macrofy 'locking locking*)
'shutdown-agents (copy-core-var shutdown-agents) 'shutdown-agents (copy-core-var shutdown-agents)
'slurp (copy-core-var slurp) 'slurp (copy-core-var slurp)
'spit (copy-core-var spit) 'spit (copy-core-var spit)