From 0220184ebc550c6feec89047160a88eb57511e80 Mon Sep 17 00:00:00 2001 From: Treer Date: Sat, 9 Feb 2019 18:42:59 +1100 Subject: [PATCH] Optimize memory usage to reduce LuaJIT OOM errors Improve speed and reduce LuaJIT out of memory crashes by not allocating a new voxel buffer every on_generated() This fix requires Minetest v4.15 or later. Reference: paramat's explanation of #3 https://forum.minetest.net/viewtopic.php?t=16043 --- multi_map_core/core.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/multi_map_core/core.lua b/multi_map_core/core.lua index 78528a4..cf2f31b 100644 --- a/multi_map_core/core.lua +++ b/multi_map_core/core.lua @@ -31,6 +31,8 @@ multi_map.generators = {} -- When no suitable generator is found, this generator is used as a fallback multi_map.fallback_generator = nil +local vm_data = {} -- reuse the massive VoxelManip memory buffer instead of creating on every on_generate() + -- Set the current layer which the mapgen is generating -- y = absolute y value to be translated to layer function multi_map.set_current_layer(y) @@ -322,7 +324,7 @@ minetest.register_on_generated(function(minp, maxp) then local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") local area = VoxelArea:new({MinEdge = emin, MaxEdge = emax}) - local vm_data = vm:get_data() + vm:get_data(vm_data) if multi_map.layers[multi_map.current_layer] and multi_map.layers[multi_map.current_layer].bedrock_generator @@ -342,7 +344,7 @@ minetest.register_on_generated(function(minp, maxp) then local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") local area = VoxelArea:new({MinEdge = emin, MaxEdge = emax}) - local vm_data = vm:get_data() + vm:get_data(vm_data) if multi_map.layers[multi_map.current_layer] and multi_map.layers[multi_map.current_layer].skyrock_generator @@ -359,7 +361,7 @@ minetest.register_on_generated(function(minp, maxp) elseif multi_map.wrap_layers and multi_map.in_skip_area({ x = minp.x, y = minp.z }) then local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") local area = VoxelArea:new({MinEdge = emin, MaxEdge = emax}) - local vm_data = vm:get_data() + vm:get_data(vm_data) multi_map.generate_singlenode_chunk(minp, maxp, area, vm_data, multi_map.node["multi_map_core:skyrock"]) vm:set_data(vm_data) vm:calc_lighting(false) @@ -367,7 +369,7 @@ minetest.register_on_generated(function(minp, maxp) else local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") local area = VoxelArea:new({MinEdge = emin, MaxEdge = emax}) - local vm_data = vm:get_data() + vm:get_data(vm_data) local remove_shadow_caster = false -- Add a temporary shadow caster layer above the chunk to ensure caves are dark