Tune block emerge and sending parameters to more aggressive values

diff --git a/minetest.conf.example b/minetest.conf.example
index 58039559697f13fb39938697c643d86afacd0cca..71a945b501737f9a0b48f3636ec591a45442331f 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -292,9 +292,9 @@
 # how large area of blocks are subject to the active block stuff (active = objects are loaded and ABMs run)
 #active_block_range = 2
 # how many blocks are flying in the wire simultaneously per client
-#max_simultaneous_block_sends_per_client = 2
+#max_simultaneous_block_sends_per_client = 10
 # how many blocks are flying in the wire simultaneously per server
-#max_simultaneous_block_sends_server_total = 8
+#max_simultaneous_block_sends_server_total = 40
 # From how far blocks are sent to clients (value * 16 nodes)
 #max_block_send_distance = 10
 # From how far blocks are generated for clients (value * 16 nodes)
@@ -341,11 +341,11 @@
 # Maximum number of blocks that can be queued for loading.
 #emergequeue_limit_total = 256
 # Maximum number of blocks to be queued that are to be loaded from file.
-# Leave blank for an appropriate amount to be chosen automatically.
-#emergequeue_limit_diskonly =
+# Set to blank for an appropriate amount to be chosen automatically.
+#emergequeue_limit_diskonly = 32
 # Maximum number of blocks to be queued that are to be generated.
-# Leave blank for an appropriate amount to be chosen automatically.
-#emergequeue_limit_generate =
+# Set to blank for an appropriate amount to be chosen automatically.
+#emergequeue_limit_generate = 32
 # Number of emerge threads to use.  Make this field blank, or increase this number, to use multiple threads.
 # On multiprocessor systems, this will improve mapgen speed greatly, at the cost of slightly buggy caves.
 #num_emerge_threads = 1

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 80edd07114cbee80c79efb10fb0f0ad93e7525f2..59ff16cfdd98c1637ee095eaf56dfa91c123a279 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -199,8 +199,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("active_block_range", "2");
        //settings->setDefault("max_simultaneous_block_sends_per_client", "1");
        // This causes frametime jitter on client side, or does it?
-       settings->setDefault("max_simultaneous_block_sends_per_client", "4");
-       settings->setDefault("max_simultaneous_block_sends_server_total", "20");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "10");
+       settings->setDefault("max_simultaneous_block_sends_server_total", "40");
        settings->setDefault("max_block_send_distance", "9");
        settings->setDefault("max_block_generate_distance", "7");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
@@ -220,6 +220,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "2");
        settings->setDefault("emergequeue_limit_total", "256");
+       settings->setDefault("emergequeue_limit_diskonly", "32");
+       settings->setDefault("emergequeue_limit_generate", "32");
        settings->setDefault("num_emerge_threads", "1");
        
        // physics stuff