From 306b0670916fee8d0316a69f161c7a9b14e9516d Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Mon, 26 Oct 2015 03:45:55 -0400
Subject: [PATCH] SAPI: Move core.get_us_time() to Util module

---
 doc/menu_lua_api.txt          |  2 ++
 src/script/lua_api/l_env.cpp  |  9 ---------
 src/script/lua_api/l_env.h    |  3 ---
 src/script/lua_api/l_util.cpp | 12 ++++++++++++
 src/script/lua_api/l_util.h   |  3 +++
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index d1e20918..c995b4c5 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -191,6 +191,8 @@ core.create_world(worldname, gameid)
 core.delete_world(index)
 
 Helpers:
+core.get_us_time()
+^ returns time with microsecond precision
 core.gettext(string) -> string
 ^ look up the translation of a string in the gettext message catalog
 fgettext_ne(string, ...)
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 2645c800..6ffca6f0 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -938,14 +938,6 @@ int ModApiEnvMod::l_forceload_free_block(lua_State *L)
 	return 0;
 }
 
-// get_us_time()
-int ModApiEnvMod::l_get_us_time(lua_State *L)
-{
-	NO_MAP_LOCK_REQUIRED;
-	lua_pushnumber(L, porting::getTimeUs());
-	return 1;
-}
-
 void ModApiEnvMod::Initialize(lua_State *L, int top)
 {
 	API_FCT(set_node);
@@ -987,5 +979,4 @@ void ModApiEnvMod::Initialize(lua_State *L, int top)
 	API_FCT(transforming_liquid_add);
 	API_FCT(forceload_block);
 	API_FCT(forceload_free_block);
-	API_FCT(get_us_time);
 }
diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h
index 4f204da8..8354379f 100644
--- a/src/script/lua_api/l_env.h
+++ b/src/script/lua_api/l_env.h
@@ -168,9 +168,6 @@ private:
 	// stops forceloading a position
 	static int l_forceload_free_block(lua_State *L);
 
-	// get us precision time
-	static int l_get_us_time(lua_State *L);
-
 public:
 	static void Initialize(lua_State *L, int top);
 };
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index d5adc7ab..3f7e15ac 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -65,6 +65,14 @@ int ModApiUtil::l_log(lua_State *L)
 	return 0;
 }
 
+// get_us_time()
+int ModApiUtil::l_get_us_time(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	lua_pushnumber(L, porting::getTimeUs());
+	return 1;
+}
+
 #define CHECK_SECURE_SETTING(L, name) \
 	if (name.compare(0, 7, "secure.") == 0) {\
 		lua_pushliteral(L, "Attempt to set secure setting.");\
@@ -368,6 +376,8 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 {
 	API_FCT(log);
 
+	API_FCT(get_us_time);
+
 	API_FCT(setting_set);
 	API_FCT(setting_get);
 	API_FCT(setting_setbool);
@@ -399,6 +409,8 @@ void ModApiUtil::InitializeAsync(AsyncEngine& engine)
 {
 	ASYNC_API_FCT(log);
 
+	ASYNC_API_FCT(get_us_time);
+
 	//ASYNC_API_FCT(setting_set);
 	ASYNC_API_FCT(setting_get);
 	//ASYNC_API_FCT(setting_setbool);
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index 4b55b196..68c24520 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -41,6 +41,9 @@ private:
 	// The two-argument version accept a log level: error, action, info, or verbose.
 	static int l_log(lua_State *L);
 
+	// get us precision time
+	static int l_get_us_time(lua_State *L);
+
 	// setting_set(name, value)
 	static int l_setting_set(lua_State *L);