Skip to content
Permalink
Browse files

Fix documentation of emergequeue_limit settings

  • Loading branch information
sfan5 committed May 24, 2020
1 parent 8ee2ece commit a9d6be8b6f769c1b795262f45e81bcb4a2cea4a1
Showing with 8 additions and 7 deletions.
  1. +5 −5 builtin/settingtypes.txt
  2. +2 −2 minetest.conf.example
  3. +1 −0 src/emerge.cpp
@@ -2159,15 +2159,15 @@ 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 512
emergequeue_limit_total (Absolute limit of queued blocks to emerge) 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 64
# This limit is enforced per player.
emergequeue_limit_diskonly (Per-player limit of queued blocks load from 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 64
# This limit is enforced per player.
emergequeue_limit_generate (Per-player limit of queued blocks to generate) int 64

# Number of emerge threads to use.
# Value 0:
@@ -3251,12 +3251,12 @@
# emergequeue_limit_total = 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.
# This limit is enforced per player.
# type: int
# emergequeue_limit_diskonly = 64

# Maximum number of blocks to be queued that are to be generated.
# Set to blank for an appropriate amount to be chosen automatically.
# This limit is enforced per player.
# type: int
# emergequeue_limit_generate = 64

@@ -159,6 +159,7 @@ EmergeManager::EmergeManager(Server *server)
nthreads = 1;

m_qlimit_total = g_settings->getU16("emergequeue_limit_total");
// FIXME: these fallback values are probably not good
if (!g_settings->getU16NoEx("emergequeue_limit_diskonly", m_qlimit_diskonly))
m_qlimit_diskonly = nthreads * 5 + 1;
if (!g_settings->getU16NoEx("emergequeue_limit_generate", m_qlimit_generate))

0 comments on commit a9d6be8

Please sign in to comment.
You can’t perform that action at this time.