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

Merge branch 'develop'

Browse source
This commit is contained in:
Joshua Suskalo 2021-10-14 13:19:20 -05:00
commit af5cb01924
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,6 +1,10 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
## [Unreleased]
### Fixed
- Incorrect inline expansion of `make-serde-wrapper` in cases where a function has no arguments
## [0.1.241] - 2021-10-14 ## [0.1.241] - 2021-10-14
### Performance ### Performance
- Added an `:inline` function to `make-serde-wrapper` to remove serialization overhead on primitives - Added an `:inline` function to `make-serde-wrapper` to remove serialization overhead on primitives
@ -55,6 +59,7 @@ All notable changes to this project will be documented in this file. This change
- Support for serializing and deserializing arbitrary Clojure functions - Support for serializing and deserializing arbitrary Clojure functions
- Support for serializing and deserializing arbitrary Clojure data structures - Support for serializing and deserializing arbitrary Clojure data structures
[Unreleased]: https://github.com/IGJoshua/coffi/compare/v0.1.241...HEAD
[0.1.241]: https://github.com/IGJoshua/coffi/compare/v0.1.220...v0.1.241 [0.1.241]: https://github.com/IGJoshua/coffi/compare/v0.1.220...v0.1.241
[0.1.220]: https://github.com/IGJoshua/coffi/compare/v0.1.205...v0.1.220 [0.1.220]: https://github.com/IGJoshua/coffi/compare/v0.1.205...v0.1.220
[0.1.205]: https://github.com/IGJoshua/coffi/compare/v0.1.192...v0.1.205 [0.1.205]: https://github.com/IGJoshua/coffi/compare/v0.1.192...v0.1.205

15
src/clj/coffi/ffi.clj
View file

@ -305,10 +305,12 @@
nil)) nil))
(list sym `(mem/serialize ~sym ~type ~scope)))) (list sym `(mem/serialize ~sym ~type ~scope))))
arg-syms arg-types) arg-syms arg-types)
wrap-serialize (fn [expr] wrap-scope (fn [expr]
`(with-open [~scope (mem/stack-scope)] `(with-open [~scope (mem/stack-scope)]
(let [~@(mapcat identity serialize-args)] ~expr))
~expr))) wrap-serialize (fn [expr]
`(let [~@(mapcat identity serialize-args)]
~expr))
native-fn (fn [expr] native-fn (fn [expr]
`(fn ~'native-fn [~@arg-syms] `(fn ~'native-fn [~@arg-syms]
~expr)) ~expr))
@ -321,6 +323,7 @@
primitive-ret? primitive-ret?
(-> (cons downcall-sym arg-syms) (-> (cons downcall-sym arg-syms)
wrap-serialize wrap-serialize
wrap-scope
native-fn) native-fn)
:else :else
@ -336,12 +339,12 @@
const-ret?) const-ret?)
(native-fn (if (mem/primitive-type ret-type) (native-fn (if (mem/primitive-type ret-type)
prim-call prim-call
non-prim-call)) (wrap-scope non-prim-call)))
none-to-serialize? none-to-serialize?
(if (mem/primitive-type ~ret) `(if (mem/primitive-type ~ret)
~(native-fn prim-call) ~(native-fn prim-call)
~(native-fn non-prim-call)) ~(native-fn (wrap-scope non-prim-call)))
const-ret? const-ret?
(native-fn (wrap-serialize (native-fn (wrap-serialize