Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ test/rust_suite/Cargo.lock
testfixture
libsql
src/rust/libsql-shell/target/
src/rust/wasmtime-bindings/Cargo.lock
1 change: 1 addition & 0 deletions ext/udf/wasm_bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ void libsql_free_wasm_module(void *module);
** Creates a new wasm engine
*/
libsql_wasm_engine_t *libsql_wasm_engine_new();
void libsql_wasm_engine_free(libsql_wasm_engine_t *);

#endif //LIBSQL_WASM_BINDINGS_H
#endif //LIBSQL_ENABLE_WASM_RUNTIME
3 changes: 3 additions & 0 deletions ext/udf/wasmedge_bindings.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ libsql_wasm_engine_t *libsql_wasm_engine_new() {
return NULL;
}

void libsql_wasm_engine_free(libsql_wasm_engine_t *eng) {
}

libsql_wasm_module_t *libsql_compile_wasm_module(libsql_wasm_engine_t* engine, const char *pSrcBody, int nBody,
void *(*alloc_err_buf)(unsigned long long), char **err_msg_buf) {

Expand Down
5 changes: 5 additions & 0 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1266,6 +1266,11 @@ static int sqlite3Close(sqlite3 *db, int forceZombie){
/* Convert the connection into a zombie and then close it.
*/
db->eOpenState = SQLITE_STATE_ZOMBIE;
#ifdef LIBSQL_ENABLE_WASM_RUNTIME
if (db->wasm.engine) {
libsql_wasm_engine_free(db->wasm.engine);
}
#endif
sqlite3LeaveMutexAndCloseZombie(db);
return SQLITE_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion src/rust/wasmtime-bindings/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libsql-wasmtime-bindings"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
license = "Apache-2.0"
description = "Wasmtime bindings for libSQL user-defined functions"
Expand Down
10 changes: 6 additions & 4 deletions src/rust/wasmtime-bindings/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,12 @@ pub fn libsql_wasm_engine_new() -> *const c_void {
Err(_) => return std::ptr::null() as *const c_void,
};

let engine = Box::new(engine);
let engine_ptr = &*engine as *const Engine as *const c_void;
std::mem::forget(engine);
engine_ptr
Box::into_raw(Box::new(engine)) as *const c_void
}

#[no_mangle]
pub fn libsql_wasm_engine_free(engine: *mut c_void) {
unsafe { Box::from_raw(engine as *mut Engine) };
}

#[repr(C)]
Expand Down