NotificationsYou must be signed in to change notification settings
Fork8
Star41

Commit5b7d095

zach

authored

fix: add calls toextism_function_free to cleanup HostFunctions (#14)

It looks like there isn't a good way to define a destructor in Java, sothis PR adds a `HostFunction.free` function that is automatically calledwhen a Plugin is freed, if a `HostFunction` is never registered with aplugin then it should be called manually.Fixes#13

1 parent1e1fd2c commit5b7d095Copy full SHA for 5b7d095

File tree

3 files changed

+25

-2

lines changed

src/main/java/org/extism/sdk

3 files changed

+25

-2

lines changed

`‎src/main/java/org/extism/sdk/HostFunction.java‎`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ public class HostFunction<T extends HostUserData> {`
`10`	`10`
`11`	`11`	`privatefinalLibExtism.InternalExtismFunctioncallback;`
`12`	`12`
	`13`	`+privatebooleanfreed;`
	`14`	`+`
`13`	`15`	`publicfinalPointerpointer;`
`14`	`16`
`15`	`17`	`publicfinalStringname;`
`@@ -21,7 +23,7 @@ public class HostFunction<T extends HostUserData> {`
`21`	`23`	`publicfinalOptional<T>userData;`
`22`	`24`
`23`	`25`	`publicHostFunction(Stringname,LibExtism.ExtismValType[]params,LibExtism.ExtismValType[]returns,ExtismFunctionf,Optional<T>userData) {`
`24`		`-`
	`26`	`+this.freed =false;`
`25`	`27`	`this.name =name;`
`26`	`28`	`this.params =params;`
`27`	`29`	`this.returns =returns;`
`@@ -85,8 +87,15 @@ public void setNamespace(String name) {`
`85`	`87`	`}`
`86`	`88`	`}`
`87`	`89`
`88`		`-HostFunctionwithNamespace(Stringname) {`
	`90`	`+publicHostFunctionwithNamespace(Stringname) {`
`89`	`91`	`this.setNamespace(name);`
`90`	`92`	`returnthis;`
`91`	`93`	`}`
	`94`	`+`
	`95`	`+publicvoidfree() {`
	`96`	`+if (!this.freed){`
	`97`	`+LibExtism.INSTANCE.extism_function_free(this.pointer);`
	`98`	`+this.freed =true;`
	`99`	`+ }`
	`100`	`+ }`
`92`	`101`	`}`

`‎src/main/java/org/extism/sdk/LibExtism.java‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ Pointer extism_function_new(String name,`
`62`	`62`	`PointeruserData,`
`63`	`63`	`PointerfreeUserData);`
`64`	`64`
	`65`	`+voidextism_function_free(Pointerfunction);`
	`66`	`+`
`65`	`67`	`/**`
`66`	`68`	`* Get the length of an allocated block`
`67`	`69`	`* NOTE: this should only be called from host functions.`

`‎src/main/java/org/extism/sdk/Plugin.java‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public class Plugin implements AutoCloseable {`
`17`	`17`	`*/`
`18`	`18`	`privatefinalPointerpluginPointer;`
`19`	`19`
	`20`	`+privatefinalHostFunction[]functions;`
	`21`	`+`
`20`	`22`	`/**`
`21`	`23`	`* @param manifestBytes The manifest for the plugin`
`22`	`24`	`* @param functions The Host functions for th eplugin`
`@@ -40,13 +42,18 @@ public Plugin(byte[] manifestBytes, boolean withWASI, HostFunction[] functions)`
`40`	`42`	`withWASI,`
`41`	`43`	`errormsg);`
`42`	`44`	`if (p ==null) {`
	`45`	`+if (functions !=null)`
	`46`	`+for (inti =0;i <functions.length;i++) {`
	`47`	`+LibExtism.INSTANCE.extism_function_free(functions[i].pointer);`
	`48`	`+ }`
`43`	`49`	`interrlen =LibExtism.INSTANCE.strlen(errormsg[0]);`
`44`	`50`	`byte[]msg =newbyte[errlen];`
`45`	`51`	`errormsg[0].read(0,msg,0,errlen);`
`46`	`52`	`LibExtism.INSTANCE.extism_plugin_new_error_free(errormsg[0]);`
`47`	`53`	`thrownewExtismException(newString(msg));`
`48`	`54`	`}`
`49`	`55`
	`56`	`+this.functions =functions;`
`50`	`57`	`this.pluginPointer =p;`
`51`	`58`	`}`
`52`	`59`
`@@ -114,6 +121,11 @@ protected String error() {`
`114`	`121`	`* Frees a plugin from memory`
`115`	`122`	`*/`
`116`	`123`	`publicvoidfree() {`
	`124`	`+if (this.functions !=null){`
	`125`	`+for (inti =0;i <this.functions.length;i++) {`
	`126`	`+this.functions[i].free();`
	`127`	`+ }`
	`128`	`+ }`
`117`	`129`	`LibExtism.INSTANCE.extism_plugin_free(this.pluginPointer);`
`118`	`130`	`}`
`119`	`131`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5b7d095

File tree

3 files changed

3 files changed

`‎src/main/java/org/extism/sdk/HostFunction.java‎`

`‎src/main/java/org/extism/sdk/LibExtism.java‎`

`‎src/main/java/org/extism/sdk/Plugin.java‎`

0 commit comments