From 4b7bc1d5b1548b111f69b07e89a4597ec7913328 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 21 Mar 2019 15:00:58 -0700
Subject: [PATCH] modules/vm: Rename/export core functions.

---
 ircd/m.cc     | 23 +++++++++--------------
 modules/vm.cc | 47 +++++++++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/ircd/m.cc b/ircd/m.cc
index f103ffc6d..1d5aec23a 100644
--- a/ircd/m.cc
+++ b/ircd/m.cc
@@ -1389,12 +1389,12 @@ ircd::m::vm::eval::operator()(const room &room,
 {
 	using prototype = fault (eval &, const m::room &, json::iov &, const json::iov &);
 
-	static mods::import<prototype> function
+	static mods::import<prototype> call
 	{
-		"vm", "eval__commit_room"
+		"vm", "ircd::m::vm::inject"
 	};
 
-	return function(*this, room, event, contents);
+	return call(*this, room, event, contents);
 }
 
 /// Inject a new event originating from this server.
@@ -1405,12 +1405,12 @@ ircd::m::vm::eval::operator()(json::iov &event,
 {
 	using prototype = fault (eval &, json::iov &, const json::iov &);
 
-	static mods::import<prototype> function
+	static mods::import<prototype> call
 	{
-		"vm", "eval__commit"
+		"vm", "ircd::m::vm::inject"
 	};
 
-	return function(*this, event, contents);
+	return call(*this, event, contents);
 }
 
 enum ircd::m::vm::fault
@@ -1418,17 +1418,12 @@ ircd::m::vm::eval::operator()(const event &event)
 {
 	using prototype = fault (eval &, const m::event &);
 
-	static mods::import<prototype> function
+	static mods::import<prototype> call
 	{
-		"vm", "eval__event"
+		"vm", "ircd::m::vm::execute"
 	};
 
-	const vm::fault ret
-	{
-		function(*this, event)
-	};
-
-	return ret;
+	return call(*this, event);
 }
 
 //
diff --git a/modules/vm.cc b/modules/vm.cc
index 8dd0de497..58743a3fc 100644
--- a/modules/vm.cc
+++ b/modules/vm.cc
@@ -13,15 +13,15 @@ namespace ircd::m::vm
 	static void write_commit(eval &);
 	static void write_append(eval &, const event &);
 	static void write_prepare(eval &, const event &);
-	static fault _eval_edu(eval &, const event &);
-	static fault _eval_pdu(eval &, const event &);
+	static fault execute_edu(eval &, const event &);
+	static fault execute_pdu(eval &, const event &);
 
 	template<class... args>
 	static fault handle_error(const opts &opts, const fault &code, const string_view &fmt, args&&... a);
 
-	extern "C" fault eval__event(eval &, const event &);
-	extern "C" fault eval__commit(eval &, json::iov &, const json::iov &);
-	extern "C" fault eval__commit_room(eval &, const room &, json::iov &, const json::iov &);
+	fault execute(eval &, const event &);
+	fault inject(eval &, json::iov &, const json::iov &);
+	fault inject(eval &, const room &, json::iov &, const json::iov &);
 
 	static void init();
 	static void fini();
@@ -190,10 +190,11 @@ ircd::m::vm::fini()
 //
 
 enum ircd::m::vm::fault
-ircd::m::vm::eval__commit_room(eval &eval,
-                               const room &room,
-                               json::iov &event,
-                               const json::iov &contents)
+IRCD_MODULE_EXPORT
+ircd::m::vm::inject(eval &eval,
+                    const room &room,
+                    json::iov &event,
+                    const json::iov &contents)
 {
 	// This eval entry point is only used for commits. We try to find the
 	// commit opts the user supplied directly to this eval or with the room.
@@ -325,13 +326,14 @@ ircd::m::vm::eval__commit_room(eval &eval,
 		}
 	};
 
-	return eval(event, contents);
+	return inject(eval, event, contents);
 }
 
 enum ircd::m::vm::fault
-ircd::m::vm::eval__commit(eval &eval,
-                          json::iov &event,
-                          const json::iov &contents)
+IRCD_MODULE_EXPORT
+ircd::m::vm::inject(eval &eval,
+                    json::iov &event,
+                    const json::iov &contents)
 {
 	// This eval entry point is only used for commits. If the user did not
 	// supply commit opts we supply the default ones here.
@@ -477,12 +479,13 @@ ircd::m::vm::eval__commit(eval &eval,
 		event, { "content", content },
 	};
 
-	return eval(event);
+	return execute(eval, event);
 }
 
 enum ircd::m::vm::fault
-ircd::m::vm::eval__event(eval &eval,
-                         const event &event)
+IRCD_MODULE_EXPORT
+ircd::m::vm::execute(eval &eval,
+                     const event &event)
 try
 {
 	// Set a member pointer to the event currently being evaluated. This
@@ -519,8 +522,8 @@ try
 	const fault ret
 	{
 		json::get<"event_id"_>(event)?
-			_eval_pdu(eval, event):
-			_eval_edu(eval, event)
+			execute_pdu(eval, event):
+			execute_edu(eval, event)
 	};
 
 	if(ret != fault::ACCEPT)
@@ -621,8 +624,8 @@ ircd::m::vm::handle_error(const vm::opts &opts,
 }
 
 enum ircd::m::vm::fault
-ircd::m::vm::_eval_edu(eval &eval,
-                       const event &event)
+ircd::m::vm::execute_edu(eval &eval,
+                          const event &event)
 {
 	if(eval.opts->eval)
 		eval_hook(event, eval);
@@ -631,8 +634,8 @@ ircd::m::vm::_eval_edu(eval &eval,
 }
 
 enum ircd::m::vm::fault
-ircd::m::vm::_eval_pdu(eval &eval,
-                       const event &event)
+ircd::m::vm::execute_pdu(eval &eval,
+                          const event &event)
 {
 	assert(eval.opts);
 	const auto &opts