Skip to content

Commit

Permalink
MapGen: add measure chunk gen time. Relates to lord-server#1059, lord…
Browse files Browse the repository at this point in the history
  • Loading branch information
alek13 committed Jul 10, 2023
1 parent 1a5db76 commit 8e999b4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
6 changes: 6 additions & 0 deletions minetest.conf.prod
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,9 @@ arenas = 2316, 3715
christmas_date = 01/01 00:00
# список подарков
christmas_tree_gifts = lottfarming:salad 23,lottpotion:cider 23,default:blueberries 23,lottfarming:cookie_cracker 23,default:charcoalblock 23,default:apple 23,lottfarming:carrot_item 23,lottmobs:meat 23,lottores:tin_lump 23,default:silver_sandstone 23


# ------- lord/lottmapgen
# Земер времени генерации чанка. Default: false
# Постоянно сыпет в лог, использовать локально при разработке или при крайней необходимости.
#mapgen_measure_chunk_gene_time = false
5 changes: 5 additions & 0 deletions minetest.conf.test
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,8 @@ arenas = 2
christmas_date = 12/24 00:00
# список подарков
christmas_tree_gifts = lottfarming:salad 23,lottpotion:cider 23,default:blueberries 23,lottfarming:cookie_cracker 23,default:charcoalblock 23,default:apple 23,lottfarming:carrot_item 23,lottmobs:meat 23,lottores:tin_lump 23,default:silver_sandstone 23

# ------- lord/lottmapgen
# Земер времени генерации чанка. Default: false
# Постоянно сыпет в лог, использовать локально при разработке или при крайней необходимости.
#mapgen_measure_chunk_gene_time = false
13 changes: 12 additions & 1 deletion mods/lord/lottmapgen/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ local np_random = {
lottmapgen = {}
local water_level = minetest.get_mapgen_setting("water_level")

local measure = minetest.settings:get_bool("mapgen_measure_chunk_gene_time", false)
local chunk_gen_count = 0
local chunk_gen_avg = 0

dofile(minetest.get_modpath("lottmapgen").."/nodes.lua")
dofile(minetest.get_modpath("lottmapgen").."/functions.lua")

Expand Down Expand Up @@ -197,6 +201,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
end

local t1 = os.clock()

local x1 = maxp.x
local y1 = maxp.y
local z1 = maxp.z
Expand Down Expand Up @@ -609,7 +614,13 @@ minetest.register_on_generated(function(minp, maxp, seed)
vm:set_lighting({day=0, night=0})
vm:calc_lighting()
vm:write_to_map(data)
local chugent = math.ceil((os.clock() - t1) * 1000)

if measure then
local chunk_gen_time = math.ceil((os.clock() - t1) * 1000)
chunk_gen_avg = math.ceil((chunk_gen_avg * chunk_gen_count + chunk_gen_time) / (chunk_gen_count + 1))
print("map-gen: " .. chunk_gen_time .. ", avg: " .. chunk_gen_avg)
chunk_gen_count = chunk_gen_count + 1
end
end)

dofile(minetest.get_modpath("lottmapgen").."/schematics.lua")
Expand Down

0 comments on commit 8e999b4

Please sign in to comment.