Merge remote-tracking branch 'origin/wip5.8.0' into wip5.8.0-32

CMakeLists.txt

@@ -179,9 +179,9 @@ elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
 	message(STATUS "Using user-provided IrrlichtMt at subdirectory 'lib/irrlichtmt'")
 	if(BUILD_CLIENT)
 		# tell IrrlichtMt to create a static library
-		set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library" FORCE)
+		#set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library" FORCE)
 		add_subdirectory(lib/irrlichtmt EXCLUDE_FROM_ALL)
-		unset(BUILD_SHARED_LIBS CACHE)
+		#unset(BUILD_SHARED_LIBS CACHE)
 
 		if(NOT TARGET IrrlichtMt)
 			message(FATAL_ERROR "IrrlichtMt project is missing a CMake target?!")

src/CMakeLists.txt

@@ -102,22 +102,32 @@ if(NOT MSVC)
 	if(ENABLE_GPERF OR ENABLE_TCMALLOC)
 		set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+		if (NOT BUILD_SHARED_LIBS)
+			list(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+		endif()
+
 		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 			find_library(TCMALLOC_LIBRARY NAMES tcmalloc_debug tcmalloc)
 		else()
 			find_library(TCMALLOC_LIBRARY NAMES tcmalloc tcmalloc_and_profiler)
 		endif()
 
+
 		if(ENABLE_GPERF)
 			find_library(PROFILER_LIBRARY NAMES profiler tcmalloc_and_profiler)
 		endif()
 
+		if (NOT BUILD_SHARED_LIBS)
+			list(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+		endif()
+
 		if (PROFILER_LIBRARY)
+			# set(PLATFORM_LIBS ${PLATFORM_LIBS} -Wl,--no-as-needed ${PROFILER_LIBRARY} -Wl,--as-needed)
 			set(PLATFORM_LIBS ${PLATFORM_LIBS} ${PROFILER_LIBRARY})
 		endif()
 
 		if (TCMALLOC_LIBRARY)
-    		set(PLATFORM_LIBS ${PLATFORM_LIBS} ${TCMALLOC_LIBRARY})
+			set(PLATFORM_LIBS ${PLATFORM_LIBS} ${TCMALLOC_LIBRARY})
 			set(OTHER_FLAGS "${OTHER_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
 		endif()
 
@@ -377,6 +387,7 @@ if(ENABLE_LEVELDB)
 		set(SNAPPY_BUILD_TESTS 0 CACHE INTERNAL "")
 		set(SNAPPY_BUILD_BENCHMARKS 0 CACHE INTERNAL "")
 		set(SNAPPY_INSTALL 0 CACHE INTERNAL "")
+		set(HAVE_TCMALLOC 0 CACHE INTERNAL "")
 
 		add_subdirectory(${PROJECT_SOURCE_DIR}/external/snappy)
 		set(SNAPPY_LIBRARY snappy)
@@ -712,7 +723,8 @@ endif()
 #add_subdirectory(external/TinyTIFF/src)
 #set(TINYTIFF_LIRARY TinyTIFF)
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/libtiff/CMakeLists.txt)
+option(ENABLE_TIFF "Enable tiff (feotiff for mapgen earth)" 1)
+if(ENABLE_TIFF AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/libtiff/CMakeLists.txt)
 	set(tiff-tools 0 CACHE INTERNAL "")
 	set(tiff-tests 0 CACHE INTERNAL "")
 	set(tiff-docs 0 CACHE INTERNAL "")

src/client/activeobjectmgr.cpp

@@ -95,12 +95,13 @@ void ActiveObjectMgr::removeObject(u16 id)
 		return;
 	}
 
+	m_active_objects_deleted.emplace_back(obj);
+
 	//std::unique_ptr<ClientActiveObject> obj = std::move(it->second);
 	m_active_objects.erase(id);
 
 	obj->removeFromScene(true);
 
-	m_active_objects_deleted.emplace_back(std::move(obj));
 }
 
 // clang-format on

src/client/client.cpp

@@ -605,12 +605,12 @@ void Client::step(float dtime)
 		TimeTaker timer_step("Client: Replace updated meshes");
 
 		int num_processed_meshes = 0;
-		auto end_ms = porting::getTimeMs() + 10;
+		auto end_ms = porting::getTimeMs() + 5;
 		std::vector<v3bpos_t> blocks_to_ack;
 
 		auto qsize = m_mesh_update_manager->m_queue_out.size();
 		if (qsize > 1000)
-			end_ms += 100;
+			end_ms += 30;
 
 		bool force_update_shadows = false;
 		MeshUpdateResult r;
@@ -1719,13 +1719,15 @@ void Client::addNode(v3pos_t p, MapNode n, bool remove_metadata, int fast)
 	catch(InvalidPositionException &e) {
 	}
 
-	if (p.getDistanceFrom(floatToInt(m_env.getLocalPlayer()->getPosition(), BS)) > MAP_BLOCKSIZE*2)
+	const auto disance = p.getDistanceFrom(floatToInt(m_env.getLocalPlayer()->getPosition(), BS));
+	if (disance > MAP_BLOCKSIZE*2)
 		return;
 
-	addUpdateMeshTaskForNode(p, true);
+	addUpdateMeshTaskForNode(p, true, disance <= MAP_BLOCKSIZE);
+	modified_blocks.erase(getNodeBlockPos(p));
 
 	for (const auto &modified_block : modified_blocks) {
-		addUpdateMeshTaskWithEdge(modified_block.first, false, true);
+		addUpdateMeshTaskWithEdge(modified_block.first, false, false);
 	}
 }
 

src/client/clientmap.cpp

@@ -69,6 +69,10 @@ void MapDrawControl::fm_init()
 {
 	g_settings->getS32NoEx("farmesh", farmesh);
 	g_settings->getS32NoEx("lodmesh", lodmesh);
+	static const auto headless_optimize = g_settings->getBool("headless_optimize");
+	if (headless_optimize)
+		lodmesh = 0;
+
 	fov_want = fov = g_settings->getFloat("fov");
 }
 
@@ -901,16 +905,21 @@ void ClientMap::updateDrawListFm(float dtime, unsigned int max_cycle_ms)
 				Ignore if mesh doesn't exist
 			*/
 			{
-				if((!mesh && smesh_size < 0) || mesh_step != mesh->lod_step) {
+				if ((!mesh && smesh_size < 0) || mesh_step != mesh->lod_step) {
 					blocks_in_range_without_mesh++;
 					if (m_mesh_queued < maxq || range <= 1) {
+						const auto bts = block->getTimestamp();
+						if (block->mesh_requested_timestamp < bts) {
+							block->mesh_requested_timestamp = bts;
 						m_client->addUpdateMeshTask(bp, false);
 						++m_mesh_queued;
+						}
 					}
 					if (!mesh)
 						continue;
 				}
-				if(mesh_step == mesh->lod_step && block->getTimestamp() <= mesh->timestamp && !smesh_size) {
+				if (mesh_step == mesh->lod_step &&
+						block->getTimestamp() <= mesh->timestamp && !smesh_size) {
 					++blocks_in_range_without_mesh;
 					continue;
 				}
@@ -1025,10 +1034,17 @@ void ClientMap::updateDrawListFm(float dtime, unsigned int max_cycle_ms)
 				continue;
 */
 
-			if (mesh_step != mesh->lod_step && smesh_size < 0 && (m_mesh_queued < maxq*1.2 || range <= 2)) {
+			if (mesh_step != mesh->lod_step && smesh_size < 0 &&
+					(m_mesh_queued < maxq * 1.2 || range <= 2)) {
 				m_client->addUpdateMeshTask(bp);
 				++m_mesh_queued;
-			} else if (block->getTimestamp() > mesh->timestamp + (smesh_size ? 0 : range >= 1 ? 60 : 5) && (m_mesh_queued < maxq*1.5 || range <= 2)) {
+			} else if (const auto bts = block->getTimestamp();
+					   bts != BLOCK_TIMESTAMP_UNDEFINED &&
+					   block->getTimestamp() > mesh->timestamp + (smesh_size ? 0
+																		 : range >= 1
+																				 ? 60
+																				 : 5) &&
+					   (m_mesh_queued < maxq * 1.5 || range <= 2)) {
 				if (mesh_step > 1)
 					m_client->addUpdateMeshTask(bp);
 				else

src/client/fm_farmesh.cpp

@@ -84,7 +84,6 @@ void FarMesh::makeFarBlock(const v3bpos_t &blockpos)
 		const auto lock = std::lock_guard(block->far_mutex);
 		if (!block->getFarMesh(step)) {
 			MeshMakeData mdat(m_client, false, 0, step, &farcontainer);
-			mdat.block = block.get();
 			mdat.m_blockpos = blockpos_actual;
 			auto mbmsh = std::make_shared<MapBlockMesh>(&mdat, m_camera_offset);
 			block->setFarMesh(mbmsh, m_client->m_uptime);

src/client/mapblock_mesh.cpp

@@ -62,23 +62,6 @@ MeshMakeData::MeshMakeData(Client *client, bool use_shaders,
 		fscale(pow(2, far_step + lod_step))
 {}
 
-bool MeshMakeData::fill_data()
-{
-	if (filled)
-		return filled;
-
-	if (!block)
-		block = m_client->m_env.getClientMap().getBlockNoCreateNoEx(m_blockpos);
-
-	if (!block)
-		return filled;
-	filled = true;
-	timestamp = block->getTimestamp();
-
-	return filled;
-}
-
-
 void MeshMakeData::fillBlockDataBegin(const v3bpos_t &blockpos)
 {
 	m_blockpos = blockpos;
@@ -697,10 +680,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3pos_t camera_offset):
 	m_enable_shaders = data->m_use_shaders;
 	m_enable_vbo = g_settings->getBool("enable_vbo");
 
-	if (!data->fill_data()) {
-		return;
-	}
-
 	v3bpos_t bp = data->m_blockpos;
 	// Only generate minimap mapblocks at even coordinates.
 	if (fscale<=1) // || !data->block->getMesh())

src/client/mapblock_mesh.h

@@ -63,13 +63,7 @@ struct MeshMakeData
 	int range = 1;
 	bool no_draw = false;
 	unsigned int timestamp = 0;
-	MapBlock * block = nullptr;
-	//Map & map;
-	//MapDrawControl& draw_control;
 	bool debug = false;
-	bool filled = false;
-	void fill(MapBlock *block_);
-	bool fill_data();
 
 	explicit MeshMakeData(Client *client, bool use_shaders
 			, int lod_step = 0

src/client/mesh_generator_thread.cpp

@@ -210,6 +210,11 @@ void MeshUpdateQueue::fillDataFromMapBlocks(QueuedMeshUpdate *q)
 		if (block) {
 			auto lock = block->lock_shared_rec();
 			data->fillBlockData(pos, block->getData());
+
+			if (const auto bts = block->getTimestamp();
+					bts != BLOCK_TIMESTAMP_UNDEFINED) {
+				data->timestamp = std::max(data->timestamp, bts);
+			}
 		} else {
 			data->fillBlockData(pos, block_placeholder.data);
 		}
@@ -264,6 +269,7 @@ void MeshUpdateWorkerThread::doUpdate()
 
 MeshUpdateManager::MeshUpdateManager(Client *client):
 	m_queue_in(client)
+	, m_queue_in_urgent(client)
 {
 	int number_of_threads = rangelim(g_settings->getS32("mesh_generation_threads"), 0, 8);
 
@@ -277,6 +283,8 @@ MeshUpdateManager::MeshUpdateManager(Client *client):
 
 	for (int i = 0; i < number_of_threads; i++)
 		m_workers.push_back(std::make_unique<MeshUpdateWorkerThread>(&m_queue_in, this, &m_camera_offset));
+
+	m_workers.push_back(std::make_unique<MeshUpdateWorkerThread>(&m_queue_in_urgent, this, &m_camera_offset));
 }
 
 void MeshUpdateManager::updateBlock(Map *map, v3bpos_t p, bool ack_block_to_server,
@@ -285,7 +293,7 @@ void MeshUpdateManager::updateBlock(Map *map, v3bpos_t p, bool ack_block_to_serv
 	static thread_local const bool many_neighbors =
 			g_settings->getBool("smooth_lighting")
 			&& !g_settings->getFlag("performance_tradeoffs");
-	if (!m_queue_in.addBlock(map, p, ack_block_to_server, urgent)) {
+	if (!(urgent ? m_queue_in_urgent : m_queue_in).addBlock(map, p, ack_block_to_server, urgent)) {
 		warningstream << "Update requested for non-existent block at ("
 				<< p.X << ", " << p.Y << ", " << p.Z << ")" << std::endl;
 		return;

src/client/mesh_generator_thread.h

@@ -155,6 +155,7 @@ class MeshUpdateManager
 
 
 	MeshUpdateQueue m_queue_in;
+	MeshUpdateQueue m_queue_in_urgent;
 
 public:
 	MutexedQueue<MeshUpdateResult> m_queue_out;

src/cmake_config.h.in

@@ -15,6 +15,7 @@
 #cmakedefine01 MINETEST_TRANSPORT
 #cmakedefine01 STATIC_BUILD
 #cmakedefine01 USE_ENET
+#cmakedefine01 USE_GPERF
 #cmakedefine01 USE_ICONV
 #cmakedefine01 USE_IPV4_DEFAULT
 #cmakedefine01 USE_MANDELBULBER

src/mapblock.h

@@ -540,6 +540,7 @@ class MapBlock
 	MapBlock::mesh_type getFarMesh(int step);
 	void setFarMesh(const MapBlock::mesh_type & rmesh, uint32_t time);
 	std::mutex far_mutex;
+	u32 mesh_requested_timestamp = 0;
 #endif
 //===
 

src/server.cpp

@@ -641,9 +641,6 @@ void Server::start()
 			std::cerr << line << std::endl;
 	}
 
-
-
-// == fm:
 	actionstream << "\033[1mfree\033[1;33mminer \033[1;36mv" << g_version_hash
 				 << "\033[0m \t"
 #if ENABLE_THREADS
@@ -652,6 +649,24 @@ void Server::start()
 #ifndef NDEBUG
 				 << " debug \t"
 #endif
+#if USE_GPERF
+				<< " gperf \t"
+#endif
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
+				<< " asan \t"
+#endif
+#endif
+#if defined(__has_feature)
+#if __has_feature(thread_sanitizer)
+				<< " tsan \t"
+#endif
+#endif
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+				<< " msan \t"
+#endif
+#endif
 #if USE_MULTI
 				 << " multi: \t"
 #endif

src/version.cpp

@@ -54,6 +54,9 @@ const char *g_build_info =
 #if	ENABLE_THREADS
 	"\n" "ENABLE_THREADS"
 #endif
+#if	USE_GPERF
+	"\n" "USE_GPERF"
+#endif
 #if	USE_MULTI
 	"\n" "USE_MULTI"
 #endif