Adjust some settings to modern environments and networks. (#7549)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 125a962c0b3e2e594594e46eb3bc3bced001e8fd..afcee0f8c038b45df5f9851b3614a33d402fc781 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -923,7 +923,7 @@ ipv6_server (IPv6 server) bool false
 #    Maximum number of blocks that are simultaneously sent per client.
 #    The maximum total count is calculated dynamically:
 #    max_total = ceil((#clients + max_users) * per_client / 4)
-max_simultaneous_block_sends_per_client (Maximum simultaneous block sends per client) int 10
+max_simultaneous_block_sends_per_client (Maximum simultaneous block sends per client) int 40
 
 #    To reduce lag, block transfers are slowed down when a player is building something.
 #    This determines how long they are slowed down after placing or removing a node.
@@ -1846,17 +1846,17 @@ chunksize (Chunk size) int 5
 enable_mapgen_debug_info (Mapgen debug) bool false
 
 #    Maximum number of blocks that can be queued for loading.
-emergequeue_limit_total (Absolute limit of emerge queues) int 256
+emergequeue_limit_total (Absolute limit of emerge queues) int 512
 
 #    Maximum number of blocks to be queued that are to be loaded from file.
 #    Set to blank for an appropriate amount to be chosen automatically.
-emergequeue_limit_diskonly (Limit of emerge queues on disk) int 32
+emergequeue_limit_diskonly (Limit of emerge queues on disk) int 64
 
 #    Maximum number of blocks to be queued that are to be generated.
 #    Set to blank for an appropriate amount to be chosen automatically.
-emergequeue_limit_generate (Limit of emerge queues to generate) int 32
+emergequeue_limit_generate (Limit of emerge queues to generate) int 64
 
-#    Number of emerge threads to use. Make this field blank, or increase this number
+#    Number of emerge threads to use. Make this field blank or 0, 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 (Number of emerge threads) int 1
+num_emerge_threads (Number of emerge threads) int 0

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 277f56d2d1c4b2d9140bcc7762b46370971a7ce4..cd60efa300ca871cff5a7eaafcfd9b5293fd5ab1 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -298,7 +298,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("port", "30000");
        settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("player_transfer_distance", "0");
-       settings->setDefault("max_simultaneous_block_sends_per_client", "10");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "40");
        settings->setDefault("time_send_interval", "5");
 
        settings->setDefault("default_game", "minetest");
@@ -351,10 +351,10 @@ void set_default_settings(Settings *settings)
        settings->setDefault("ignore_world_load_errors", "false");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "action");
-       settings->setDefault("emergequeue_limit_total", "256");
-       settings->setDefault("emergequeue_limit_diskonly", "32");
-       settings->setDefault("emergequeue_limit_generate", "32");
-       settings->setDefault("num_emerge_threads", "1");
+       settings->setDefault("emergequeue_limit_total", "512");
+       settings->setDefault("emergequeue_limit_diskonly", "64");
+       settings->setDefault("emergequeue_limit_generate", "64");
+       settings->setDefault("num_emerge_threads", "0");
        settings->setDefault("secure.enable_security", "true");
        settings->setDefault("secure.trusted_mods", "");
        settings->setDefault("secure.http_mods", "");