Merge pull request #244 from vizzuhq/chart_filter_add_deleter

Add deleter function to chartfilter

Author: schaumb

src/apps/weblib/cinterface.cpp

@@ -175,10 +175,13 @@ void chart_setValue(const char *path, const char *value)
 	Interface::instance.setChartValue(path, value);
 }
 
-void chart_setFilter(
-    managable_js_function_ptr<bool, const void *> filter)
+void chart_setFilter(bool (*filter)(const void *),
+    void (*deleter)(bool (*)(const void *)))
 {
-	Interface::instance.setChartFilter(filter);
+	if (filter)
+		Interface::instance.setChartFilter({{filter, deleter}});
+	else
+		Interface::instance.setChartFilter({});
 }
 
 const void *

src/apps/weblib/cinterface.h

@@ -4,9 +4,6 @@
 #include <cstdint>
 #include <typeinfo>
 
-template <class Return, class... Args>
-using managable_js_function_ptr = Return (*)(Args...);
-
 extern "C" {
 
 extern void vizzu_init();
@@ -45,8 +42,8 @@ extern const char *style_getValue(const char *path, bool computed);
 const char *chart_getList();
 const char *chart_getValue(const char *path);
 extern void chart_setValue(const char *path, const char *value);
-extern void chart_setFilter(
-    managable_js_function_ptr<bool, const void *> filter);
+extern void chart_setFilter(bool (*)(const void *),
+    void (*)(bool (*)(const void *)));
 extern void chart_animate(void (*callback)(bool));
 extern void
 chart_relToCanvasCoords(double rx, double ry, double *x, double *y);

src/apps/weblib/interface.js

@@ -1,7 +1,4 @@
 mergeInto(LibraryManager.library, {
-	removeJsFunction: function(ptr) {
-		Module.removeFunction(ptr);
-	},
 	jsconsolelog: function(str) {
 		console.log(new Date().toISOString() + ': ' + UTF8ToString(str));
 	},

src/apps/weblib/interfacejs.h

@@ -6,7 +6,6 @@ extern void jsconsolelog(const char *);
 extern void openUrl(const char *);
 extern void setCursor(const char *cursor);
 extern void event_invoked(int, const char *);
-extern void removeJsFunction(void (*)());
 }
 
 #endif

src/apps/weblib/js-api/data.js

@@ -261,10 +261,17 @@ export default class Data {
   setFilter(filter) {
     if (typeof filter === "function") {
       let callback = (ptr) => filter(new DataRecord(this.chart, ptr));
-      let callbackPtr = this.chart.module.addFunction(callback, "ii");
-      this.chart._call(this.chart.module._chart_setFilter)(callbackPtr);
+      let callbackPtrs = [this.chart.module.addFunction(callback, "ii")];
+      let deleter = (ptr) => {
+        if (ptr !== callbackPtrs[0])
+          console.warn("Wrong pointer passed to destructor");
+        this.chart.module.removeFunction(callbackPtrs[0]);
+        this.chart.module.removeFunction(callbackPtrs[1]);
+      };
+      callbackPtrs.push(this.chart.module.addFunction(deleter, "vi"));
+      this.chart._call(this.chart.module._chart_setFilter)(...callbackPtrs);
     } else if (filter === null) {
-      this.chart._call(this.chart.module._chart_setFilter)(0);
+      this.chart._call(this.chart.module._chart_setFilter)(0, 0);
     } else {
       throw new Error("data filter is not a function or null");
     }

src/apps/weblib/jsfunctionwrapper.h

@@ -11,18 +11,15 @@ namespace Vizzu
 template <class R, class... Ts> class JsFunctionWrapper
 {
 private:
-	using JsFun = R (*)(std::conditional_t<
+	using JsFun = R(std::conditional_t<
 	    std::is_const_v<std::remove_reference_t<Ts>>,
 	    const void *,
 	    void *>...);
 
 public:
-	constexpr JsFunctionWrapper(JsFun fun) : wrapper{fun, {}}
-	{
-		if (fun)
-			wrapper.releaser = {reinterpret_cast<void (*)()>(fun),
-			    removeJsFunction};
-	}
+	constexpr JsFunctionWrapper(std::shared_ptr<JsFun> &&fun = {}) :
+	    wrapper{std::move(fun)}
+	{}
 
 	operator std::function<R(Ts...)>() &&
 	{
@@ -34,15 +31,14 @@ template <class R, class... Ts> class JsFunctionWrapper
 
 	std::size_t hash() const noexcept
 	{
-		return std::hash<JsFun>{}(wrapper.fun);
+		return std::hash<std::shared_ptr<JsFun>>{}(wrapper.fun);
 	}
 
 private:
 	struct
 	{
-		JsFun fun;
-		std::shared_ptr<void()> releaser;
-		R operator()(Ts &&...ts) const { return fun(&ts...); }
+		std::shared_ptr<JsFun> fun;
+		R operator()(Ts &&...ts) const { return (*fun)(&ts...); }
 	} wrapper;
 };