1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00

Content ID caching in Lua (#12444)

* Cache content IDs in Lua

Co-authored-by: sfan5 <sfan5@live.de>
This commit is contained in:
Jude Melton-Houghton 2022-09-18 11:46:48 -04:00 committed by GitHub
parent 006d974c58
commit 310b12b5ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 166 additions and 2 deletions

View file

@ -43,6 +43,79 @@ minetest.register_chatcommand("test_bulk_set_node", {
end,
})
-- Safeguard against too much optimization. This way the results cannot be optimized
-- away, but they can be garbage collected (due to __mode = "k").
_G._bench_content_ids_data = setmetatable({}, {__mode = "k"})
local function bench_name2content()
local t = {}
_G._bench_content_ids_data[t] = true
local get_content_id = minetest.get_content_id
local start = minetest.get_us_time()
for i = 1, 200 do
for name in pairs(minetest.registered_nodes) do
t[#t + 1] = get_content_id(name)
end
end
local finish = minetest.get_us_time()
return (finish - start) / 1000
end
local function bench_content2name()
local t = {}
_G._bench_content_ids_data[t] = true
-- Try to estimate the highest content ID that's used
-- (not accurate but good enough for this test)
local n = 0
for _ in pairs(minetest.registered_nodes) do
n = n + 1
end
local get_name_from_content_id = minetest.get_name_from_content_id
local start = minetest.get_us_time()
for i = 1, 200 do
for j = 0, n do
t[#t + 1] = get_name_from_content_id(j)
end
end
local finish = minetest.get_us_time()
return (finish - start) / 1000
end
minetest.register_chatcommand("bench_name2content", {
params = "",
description = "Benchmark: Conversion from node names to content IDs",
func = function(name, param)
minetest.chat_send_player(name, "Benchmarking minetest.get_content_id. Warming up ...")
bench_name2content()
minetest.chat_send_player(name, "Warming up finished, now benchmarking ...")
local time = bench_name2content()
return true, ("Time: %.2f ms"):format(time)
end,
})
minetest.register_chatcommand("bench_content2name", {
params = "",
description = "Benchmark: Conversion from content IDs to node names",
func = function(name, param)
minetest.chat_send_player(name, "Benchmarking minetest.get_name_from_content_id. Warming up ...")
bench_content2name()
minetest.chat_send_player(name, "Warming up finished, now benchmarking ...")
local time = bench_content2name()
return true, ("Time: %.2f ms"):format(time)
end,
})
minetest.register_chatcommand("bench_bulk_set_node", {
params = "",
description = "Benchmark: Bulk-set 99×99×99 stone nodes",

View file

@ -0,0 +1,37 @@
core.register_alias("unittests:test_content_ids_alias1", "air")
core.register_alias("unittests:test_content_ids_alias2", "~")
local function test_content_ids()
assert(core.get_content_id("air") == core.CONTENT_AIR)
assert(core.get_content_id("unittests:test_content_ids_alias1") == core.CONTENT_AIR)
assert(core.get_content_id("unknown") == core.CONTENT_UNKNOWN)
assert(core.get_content_id("ignore") == core.CONTENT_IGNORE)
assert(core.get_name_from_content_id(core.CONTENT_AIR) == "air")
assert(core.get_name_from_content_id(core.CONTENT_UNKNOWN) == "unknown")
assert(core.get_name_from_content_id(core.CONTENT_IGNORE) == "ignore")
assert(pcall(core.get_content_id, "~") == false)
assert(pcall(core.get_content_id, "unittests:test_content_ids_alias2") == false)
assert(pcall(core.get_content_id) == false)
assert(core.get_name_from_content_id(0xFFFF) == "unknown")
assert(pcall(core.get_name_from_content_id) == false)
end
-- Run while mod is loading.
test_content_ids()
-- Run after mods have loaded.
unittests.register("test_content_ids", test_content_ids)
-- Run in async environment.
local function test_content_ids_async(cb)
local function func(test_func)
local ok, err = pcall(test_func)
if not ok then
return err
end
end
core.handle_async(func, cb, test_content_ids)
end
unittests.register("test_content_ids_async", test_content_ids_async, {async=true})

View file

@ -178,6 +178,7 @@ dofile(modpath .. "/crafting.lua")
dofile(modpath .. "/itemdescription.lua")
dofile(modpath .. "/async_env.lua")
dofile(modpath .. "/entity.lua")
dofile(modpath .. "/content_ids.lua")
--------------