From 52c74a1c33ce12b93ec5830f5a6348d9578c7c6e Mon Sep 17 00:00:00 2001
From: Sebastiano Tronto <sebastiano@tronto.net>
Date: Thu, 5 Jun 2025 08:37:34 +0200
Subject: Simplify callback business (web version)

---
 web/adapter.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'web/adapter.cpp')

diff --git a/web/adapter.cpp b/web/adapter.cpp
index 0022b0d..3df3a54 100644
--- a/web/adapter.cpp
+++ b/web/adapter.cpp
@@ -1,15 +1,10 @@
-extern "C" {
-	extern int addCallbackFunction(/* args intentionally unspecified */);
-	extern void callFunction(int, const char *);
-	extern int callFunctionInt(int);
-}
-
 #include "../cpp/nissy.h"
 #include "storage.h"
 #include "logging.h"
 
 #include <emscripten.h>
 #include <emscripten/bind.h>
+#include <functional>
 #include <map>
 #include <set>
 #include <string>
@@ -17,6 +12,8 @@ extern "C" {
 
 EM_ASYNC_JS(void, fake_async, (), {});
 
+std::map<std::string, nissy::solver> loaded_solvers;
+
 const std::set<std::string> available_solvers
 {
 	"h48h0k4",
@@ -27,8 +24,6 @@ const std::set<std::string> available_solvers
 	"h48h5k2",
 };
 
-std::map<std::string, nissy::solver> loaded_solvers;
-
 bool is_solver_available(const std::string& name)
 {
 	return available_solvers.contains(name);
@@ -153,16 +148,20 @@ bool init_solver_generate(const std::string& name)
 
 int poll_status(void *arg)
 {
-	if (arg == NULL || *(int *)arg == -1)
+	if (arg == nullptr)
 		return nissy::status::RUN.value;
 
-	return callFunctionInt(*(int *)arg);
+	std::function<int(void)> poll((int (*)(void))arg);
+	return poll();
 }
 
+// The parameter js_poll_status is of type int here, but actually it is a
+// pointer to a JS function. The type will have to be changed to a 64-bit
+// integer when we move to WASM64.
 nissy::solver::solve_result solve(std::string name,
     nissy::cube cube, nissy::nissflag nissflag, unsigned minmoves,
     unsigned maxmoves, unsigned maxsols, unsigned optimal, unsigned threads,
-    int poll_status_id)
+    int js_poll_status)
 {
 	// Here we use a dirty trick to make this function always return the
 	// same kind of JavaScript object. If we did not do this, the returned
@@ -178,8 +177,11 @@ nissy::solver::solve_result solve(std::string name,
 		    {.err = nissy::error::INVALID_SOLVER};
 	}
 
+	// TODO: when running multiple solvers at the same time, we could use
+	// poll_status_id as intended (i.e. an id of some sort)
 	return loaded_solvers.at(name).solve(cube, nissflag, minmoves,
-	    maxmoves, maxsols, optimal, threads, poll_status, &poll_status_id);
+	    maxmoves, maxsols, optimal, threads,
+	    poll_status, &js_poll_status);
 }
 
 EMSCRIPTEN_BINDINGS(Nissy)
@@ -244,5 +246,4 @@ EMSCRIPTEN_BINDINGS(Nissy)
 	    emscripten::return_value_policy::take_ownership());
 	emscripten::function("setLogger", &set_logger,
 	    emscripten::allow_raw_pointers());
-	emscripten::function("addCallbackFunction", &addCallbackFunction);
 }
-- 
cgit v1.3