aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-03-14 12:49:33 +0000
committerrubenwardy <rw@rubenwardy.com>2019-03-14 17:58:19 +0000
commit10cc62d2ca03517b9653efb18df299fff9c96876 (patch)
tree24ec9ab0667aa4a65bd6ab0b55d84358afa7d54f
parentdd451a8a0055ad082d3fbc4af34c401f22bfb7d6 (diff)
downloadminetest-10cc62d2ca03517b9653efb18df299fff9c96876.tar.gz
minetest-10cc62d2ca03517b9653efb18df299fff9c96876.tar.bz2
minetest-10cc62d2ca03517b9653efb18df299fff9c96876.zip
num_emerge_threads: Warn of crashes when > 1 (#8357)
-rw-r--r--builtin/settingtypes.txt8
-rw-r--r--minetest.conf.example8
2 files changed, 10 insertions, 6 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 3df0376a3..6c5b3f317 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1915,16 +1915,18 @@ emergequeue_limit_diskonly (Limit of emerge queues on disk) int 64
emergequeue_limit_generate (Limit of emerge queues to generate) int 64
# Number of emerge threads to use.
+# WARNING: Currently there are multiple bugs that may cause crashes when
+# 'num_emerge_threads' is larger than 1. Until this warning is removed it is
+# strongly recommended this value is set to the default '1'.
# Empty or 0 value:
# - Automatic selection. The number of emerge threads will be
# - 'number of processors - 2', with a lower limit of 1.
# Any other value:
# - Specifies the number of emerge threads, with a lower limit of 1.
-# Warning: Increasing the number of emerge threads increases engine mapgen
+# WARNING: Increasing the number of emerge threads increases engine mapgen
# speed, but this may harm game performance by interfering with other
# processes, especially in singleplayer and/or when running Lua code in
-# 'on_generated'.
-# For many users the optimum setting may be '1'.
+# 'on_generated'. For many users the optimum setting may be '1'.
num_emerge_threads (Number of emerge threads) int 1
[Online Content Repository]
diff --git a/minetest.conf.example b/minetest.conf.example
index 6e40a4b6b..6e881596f 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -2994,16 +2994,18 @@
# emergequeue_limit_generate = 64
# Number of emerge threads to use.
+# WARNING: Currently there are multiple bugs that may cause crashes when
+# 'num_emerge_threads' is larger than 1. Until this warning is removed it is
+# strongly recommended this value is set to the default '1'.
# Empty or 0 value:
# - Automatic selection. The number of emerge threads will be
# - 'number of processors - 2', with a lower limit of 1.
# Any other value:
# - Specifies the number of emerge threads, with a lower limit of 1.
-# Warning: Increasing the number of emerge threads increases engine mapgen
+# WARNING: Increasing the number of emerge threads increases engine mapgen
# speed, but this may harm game performance by interfering with other
# processes, especially in singleplayer and/or when running Lua code in
-# 'on_generated'.
-# For many users the optimum setting may be '1'.
+# 'on_generated'. For many users the optimum setting may be '1'.
# type: int
# num_emerge_threads = 1