From ee999ccbdf8c68175195b604ef5988ddda7b4956 Mon Sep 17 00:00:00 2001 From: Pauli Date: Sat, 9 Jun 2018 12:02:42 +0300 Subject: [PATCH 01/66] Implement runtime debug print filtering The runtime debug print filtering support dynamic debug print selection. Tis patch only implements basic core support for filtering. The commands to change the runtime filtering settings will be added in a following patch. But even with only this one can change filtering settings by editing memory using a debugger. It can even be automated by using gdb break point commands. --- library/CMakeLists.txt | 4 + library/Debug.cpp | 186 ++++++++ library/include/Debug.h | 369 ++++++++++++++++ library/include/DebugManager.h | 111 +++++ library/include/Signal.hpp | 782 +++++++++++++++++++++++++++++++++ 5 files changed, 1452 insertions(+) create mode 100644 library/Debug.cpp create mode 100644 library/include/Debug.h create mode 100644 library/include/DebugManager.h create mode 100644 library/include/Signal.hpp diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 390efdcfe..416e42c41 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -28,6 +28,8 @@ include/Core.h include/ColorText.h include/DataDefs.h include/DataIdentity.h +include/Debug.h +include/DebugManager.h include/VTableInterpose.h include/LuaWrapper.h include/LuaTools.h @@ -38,6 +40,7 @@ include/MiscUtils.h include/Module.h include/Pragma.h include/MemAccess.h +include/Signal.hpp include/TileTypes.h include/Types.h include/VersionInfo.h @@ -55,6 +58,7 @@ SET(MAIN_SOURCES Core.cpp ColorText.cpp DataDefs.cpp +Debug.cpp Error.cpp VTableInterpose.cpp LuaWrapper.cpp diff --git a/library/Debug.cpp b/library/Debug.cpp new file mode 100644 index 000000000..aa0cf8cdf --- /dev/null +++ b/library/Debug.cpp @@ -0,0 +1,186 @@ +/** +Copyright © 2018 Pauli + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. + */ +#define _POSIX_C_SOURCE 200809L +#include "Core.h" + +#include "Debug.h" +#include "DebugManager.h" + +#include +#include +#include + +#ifdef _MSC_VER +static tm* localtime_r(const time_t* time, tm* result) +{ + localtime_s(result, time); + return result; +} +#endif + +namespace DFHack { +DBG_DECLARE(core,debug); + +void DebugManager::registerCategory(DebugCategory& cat) +{ + DEBUG(debug) << "register DebugCategory '" << cat.category() + << "' from '" << cat.plugin() + << "' allowed " << cat.allowed() << std::endl; + std::lock_guard guard(access_mutex_); + push_back(&cat); + categorySignal(CAT_ADD, cat); +} + +void DebugManager::unregisterCategory(DebugCategory& cat) +{ + DEBUG(debug) << "unregister DebugCategory '" << cat.category() + << "' from '" << cat.plugin() + << "' allowed " << cat.allowed() << std::endl; + std::lock_guard guard(access_mutex_); + auto iter = std::find(begin(), end(), &cat); + std::swap(*iter, back()); + pop_back(); + categorySignal(CAT_REMOVE, cat); +} + +DebugRegisterBase::DebugRegisterBase(DebugCategory* cat) +{ + // Make sure Core lives at least as long any DebugCategory to + // allow debug prints until all Debugcategories has been destructed + Core::getInstance(); + DebugManager::getInstance().registerCategory(*cat); +} + +void DebugRegisterBase::unregister(DebugCategory* cat) +{ + DebugManager::getInstance().unregisterCategory(*cat); +} + +static color_value selectColor(const DebugCategory::level msgLevel) +{ + switch(msgLevel) { + case DebugCategory::LTRACE: + return COLOR_GREY; + case DebugCategory::LDEBUG: + return COLOR_LIGHTBLUE; + case DebugCategory::LINFO: + return COLOR_CYAN; + case DebugCategory::LWARNING: + return COLOR_YELLOW; + case DebugCategory::LERROR: + return COLOR_LIGHTRED; + } + return COLOR_WHITE; +} + +#if __GNUC__ +// Allow gcc to optimize tls access. It also makes sure initialized is done as +// early as possible. The early initialization helps to give threads same ids as +// gdb shows. +#define EXEC_ATTR __attribute__((tls_model("initial-exec"))) +#else +#define EXEC_ATTR +#endif + +namespace { +static std::atomic nextId{0}; +static EXEC_ATTR thread_local uint32_t thread_id{nextId.fetch_add(1)+1}; +} + +DebugCategory::ostream_proxy_prefix::ostream_proxy_prefix( + const DebugCategory& cat, + color_ostream& target, + const DebugCategory::level msgLevel) : + color_ostream_proxy(target) +{ + color(selectColor(msgLevel)); + auto now = std::chrono::system_clock::now(); + tm local{}; + //! \todo c++ 2020 will have std::chrono::to_stream(fmt, system_clock::now()) + //! but none implements it yet. + std::time_t now_c = std::chrono::system_clock::to_time_t(now); + auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; + // Output time in format %02H:%02M:%02S.%03ms +#if __GNUC__ < 5 + // Fallback for gcc 4 + char buffer[32]; + size_t sz = strftime(buffer, sizeof(buffer)/sizeof(buffer[0]), + "%T.", localtime_r(&now_c, &local)); + *this << (sz > 0 ? buffer : "HH:MM:SS.") +#else + *this << std::put_time(localtime_r(&now_c, &local),"%T.") +#endif + << std::setfill('0') << std::setw(3) << ms.count() + // Thread id is allocated in the thread creation order to a thread_local + // variable + << ":t" << thread_id + // Output plugin and category names to make it easier to locate where + // the message is coming. It would be easy replaces these with __FILE__ + // and __LINE__ passed from the macro if that would be preferred prefix. + << ':' << cat.plugin() << ':' << cat.category() << ": "; +} + + +DebugCategory::level DebugCategory::allowed() const noexcept +{ + return allowed_.load(std::memory_order_relaxed); +} + +void DebugCategory::allowed(DebugCategory::level value) noexcept +{ + level old = allowed_.exchange(value, std::memory_order_relaxed); + if (old == value) + return; + TRACE(debug) << "modify DebugCategory '" << category() + << "' from '" << plugin() + << "' allowed " << value << std::endl; + auto& manager = DebugManager::getInstance(); + manager.categorySignal(DebugManager::CAT_MODIFIED, *this); +} + +DebugCategory::cstring_ref DebugCategory::category() const noexcept +{ + return category_; +} + +DebugCategory::cstring_ref DebugCategory::plugin() const noexcept +{ + return plugin_; +} + +#if __cplusplus < 201703L && __cpp_lib_atomic_is_always_lock_free < 201603 +//! C++17 has std::atomic::is_always_lock_free for static_assert. Older +//! standards only provide runtime checks if an atomic type is lock free +struct failIfEnumAtomicIsNotLockFree { + failIfEnumAtomicIsNotLockFree() { + std::atomic test; + if (test.is_lock_free()) + return; + std::cerr << __FILE__ << ':' << __LINE__ + << ": error: std::atomic should be lock free. Your compiler reports the atomic requires runtime locks. Either you are using a very old CPU or we need to change code to use integer atomic type." << std::endl; + std::abort(); + } +} failIfEnumAtomicIsNotLockFree; +#endif + +} diff --git a/library/include/Debug.h b/library/include/Debug.h new file mode 100644 index 000000000..976172c8d --- /dev/null +++ b/library/include/Debug.h @@ -0,0 +1,369 @@ +/** +Copyright © 2018 Pauli + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. + */ + +#pragma once + +#include "ColorText.h" + +#include +#include "Core.h" + +namespace DFHack { + +/*! \file Debug.h + * Light weight wrappers to runtime debug output filtering. Idea is to add as + * little as possible code compared to debug output without filtering. The + * effect is archived using #TRACE, #DEBUG, #INFO, #WARN and #ERR macros. They + * "return" color_ostream object or reference that can be then used normally for + * either printf or stream style debug output. + * + * Internally macros do inline filtering check which allows compiler to have a + * fast path without debug output only checking unlikely condition. But if + * output is enabled then runtime code will jump to debug printing function + * calls. The macro setup code will also print standardized leading part of + * debug string including time stamp, plugin name and debug category name. + * + * \code{.cpp} + * #include "Debug.h" + * DBG_DECLARE(myplugin,init); + * + * DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) + * { + * command_result rv = CR_OK; + * DEBUG(init, out).print("initializing\n") + * if ((rv = initWork()) != CR_OK) { + * ERR(init, out) << "initWork failed with " + * << rv << " error code" << std::endl; + * return rv; + * } + * return rv + * } + * \endcode + * + * The debug print filtering levels can be changed using debugger. Following + * gdb example would automatically setup core/init and core/render to trace + * level when SDL_init is called. + * + * \code{.unparsed} + * break SDL_init + * commands + * silent + * p DFHack::debug::core::debug_init.allowed_ = 0 + * p DFHack::debug::core::debug_render.allowed_ = 0 + * c + * end + * \endcode + * + */ + +#ifndef __has_cpp_attribute +#define __has_cpp_attribute(x) 0 +#endif + +/*! + * \defgroup debug_branch_prediction Branch prediction helper macros + * Helper macro tells compiler that debug output branch is unlikely and should + * be optimized to cold section of the function. + * \{ + */ +#if __cplusplus >= 202000L || __has_cpp_attribute(likely) +// c++20 will have standard branch prediction hint attributes +#define likely(x) (x) [[likely]] +#define unlikely(x) (x) [[unlikely]] +#elif defined(__GNUC__) +// gcc has builtin functions that give hints to the branch prediction +#define likely(x) (__builtin_expect(!!(x), 1)) +#define unlikely(x) (__builtin_expect(!!(x), 0)) +#else +#define likely(x) (x) +#define unlikely(x) (x) +#endif +//! \} + +#ifdef NDEBUG +//! Reduce minimum compiled in debug levels if NDEBUG is defined +#define DBG_FILTER DFHack::DebugCategory::LINFO +#else +//! Set default compiled in debug levels to include all prints +#define DBG_FILTER DFHack::DebugCategory::LTRACE +#endif + +/*! + * DebugCategory is used to enable and disable debug messages in runtime. + * Declaration and definition are handled by #DBG_DECLARE and #DBG_DEFINE + * macros. Runtime filtering support is handled by #TRACE, #DEBUG, #INFO, #WARN + * and #ERR macros. + */ +class DFHACK_EXPORT DebugCategory final { +public: + //! type helper to maybe make it easier to convert to std::string_view when + //! c++17 can be required. + using cstring = const char*; + using cstring_ref = const char*; + /*! + * Debug level enum for message filtering + */ + enum level { + LTRACE = 0, + LDEBUG = 1, + LINFO = 2, + LWARNING = 3, + LERROR = 4, + }; + + /*! + * \param plugin the name of plugin the category belongs to + * \param category the name of category + * \param defaultLevel optional default filtering level for the category + */ + constexpr DebugCategory(cstring_ref plugin, + cstring_ref category, + level defaultLevel = LWARNING) noexcept : + plugin_{plugin}, + category_{category}, + allowed_{defaultLevel} + {} + + + DebugCategory(const DebugCategory&) = delete; + DebugCategory(DebugCategory&&) = delete; + DebugCategory& operator=(DebugCategory) = delete; + DebugCategory& operator=(DebugCategory&&) = delete; + + /*! + * Used by debug macros to check if message should be printed. + * + * It is defined in the header to allow compiler inline it and make disabled + * state a fast path without function calls. + * + * \param msgLevel the debug message level the following print belongs to + * \return boolean with true indicating that message should be printed + */ + bool isEnabled(const level msgLevel) const noexcept { + const uint32_t intLevel = static_cast(msgLevel); + // Compile time filtering to allow compiling out debug checks prints + // from binary. + return static_cast(DBG_FILTER) <= intLevel && + // Runtime filtering for debug messages + static_cast(allowed_.load(std::memory_order_relaxed)) <= intLevel; + } + + struct DFHACK_EXPORT ostream_proxy_prefix : public color_ostream_proxy { + ostream_proxy_prefix(const DebugCategory& cat, + color_ostream& target, + DebugCategory::level level); + ~ostream_proxy_prefix() + { + flush(); + } + }; + + /*! + * Fetch a steam object proxy object for output. It also adds standard + * message components like time and plugin and category names to the line. + * + * User must make sure that the line is terminated with a line end. + * + * \param msgLevel Specifies the level which next debug message belongs + * \return color_ostream_proxy that can be used to print the message + * \sa DFHack::Core::getConsole() + */ + ostream_proxy_prefix getStream(const level msgLevel) const + { + return {*this,Core::getInstance().getConsole(),msgLevel}; + } + /*! + * Add standard message components to existing output stream object to begin + * a new message line to an shared buffered object. + * + * \param msgLevel Specifies the level which next debug message belongs + * \param target An output stream object where a debug output is printed + * \return color_ostream reference that was passed as second parameter + */ + ostream_proxy_prefix getStream(const level msgLevel, color_ostream& target) const + { + return {*this,target,msgLevel}; + } + + /*! + * \brief Allow management code to set a new filtering level + * Caller must have locked DebugManager::access_mutex_. + */ + void allowed(level value) noexcept; + //! Query current filtering level + level allowed() const noexcept; + //! Query plugin name + cstring_ref plugin() const noexcept; + //! Query category name + cstring_ref category() const noexcept; +private: + + cstring plugin_; + cstring category_; + std::atomic allowed_; +#if __cplusplus >= 201703L || __cpp_lib_atomic_is_always_lock_free >= 201603 + static_assert(std::atomic::is_always_lock_free, + "std::atomic should be lock free. You are using a very old CPU or code needs to use std::atomic"); +#endif +}; + +/** + * Handle actual registering wrong template parameter generated pointer + * calculation. + */ +class DFHACK_EXPORT DebugRegisterBase { +protected: + DebugRegisterBase(DebugCategory* category); + void unregister(DebugCategory* category); +}; + +/** + * Register DebugCategory to DebugManager + */ +template +class DebugRegister final : public DebugRegisterBase { +public: + DebugRegister() : + DebugRegisterBase{category} + {} + ~DebugRegister() { + unregister(category); + } +}; + +#define DBG_NAME(category) debug_ ## category + + +/*! + * Declares a debug category. There must be only a declaration per category. + * Declaration should be in same plugin where it is used. If same category name + * is used in core and multiple plugins they all are changed with same command + * unless user specifies explicitly plugin name. + * + * Must be used in one translation unit only. + * + * \param plugin the name of plugin where debug category is used + * \param category the name of category + * \param level the initial DebugCategory::level filtering level. + */ +#define DBG_DECLARE(plugin,category, ...) \ + namespace debug { namespace plugin { \ + DebugCategory DBG_NAME(category){#plugin,#category,__VA_ARGS__}; \ + DebugRegister<&DBG_NAME(category)> register_ ## category; \ + } } \ + using debug::plugin::DBG_NAME(category) + +/*! + * Can be used to access a shared DBG_DECLARE category. But may not be used from + * static initializer because translation unit order is undefined. + * + * Can be used in shared headers to gain access to one definition from + * DBG_DECLARE. + * \param plugin The plugin name that must match DBG_DECLARE + * \param category The category name that must matnch DBG_DECLARE + */ +#define DBG_EXTERN(plugin,category) \ + namespace debug { namespace plugin { \ + extern DFHack::DebugCategory DBG_NAME(category); \ + } } \ + using debug::plugin::DBG_NAME(category) + +#define DBG_PRINT(category,pred,level,...) \ + if pred(!DFHack::DBG_NAME(category).isEnabled(level)) \ + ; /* nop fast path when debug category is disabled */ \ + else /* else to allow macro use in if-else branches */ \ + DFHack::DBG_NAME(category).getStream(level, ## __VA_ARGS__) \ +/* end of DBG_PRINT */ + +/*! + * Open a line for trace level debug output if enabled + * + * Preferred category for inside loop debug messages or callbacks/methods called + * multiple times per second. Good example would be render or onUpdate methods. + * + * \param category the debug category + * \param optional the optional second parameter is an existing + * color_ostream_proxy object + * \return color_ostream object that can be used for stream output + */ +#define TRACE(category, ...) DBG_PRINT(category, likely, \ + DFHack::DebugCategory::LTRACE, ## __VA_ARGS__) + +/*! + * Open a line for debug level debug output if enabled + * + * Preferred place to use it would be commonly called functions that don't fall + * into trace category. + * + * \param category the debug category + * \param optional the optional second parameter is an existing + * color_ostream_proxy object + * \return color_ostream object that can be used for stream output + */ +#define DEBUG(category, ...) DBG_PRINT(category, likely, \ + DFHack::DebugCategory::LDEBUG, ## __VA_ARGS__) + +/*! + * Open a line for error level debug output if enabled + * + * Important debug messages when some rarely changed state changes. Example + * would be when a debug category filtering level changes. + * + * \param category the debug category + * \param optional the optional second parameter is an existing + * color_ostream_proxy object + * \return color_ostream object that can be used for stream output + */ +#define INFO(category, ...) DBG_PRINT(category, likely, \ + DFHack::DebugCategory::LINFO, ## __VA_ARGS__) + +/*! + * Open a line for warning level debug output if enabled + * + * Warning category is for recoverable errors. This generally signals that + * something unusual happened but there is code handling the error which should + * allow df continue running without issues. + * + * \param category the debug category + * \param optional the optional second parameter is an existing + * color_ostream_proxy object + * \return color_ostream object that can be used for stream output + */ +#define WARN(category, ...) DBG_PRINT(category, unlikely, \ + DFHack::DebugCategory::LWARNING, ## __VA_ARGS__) + +/*! + * Open a line for error level error output if enabled + * + * Errors should be printed only for cases where plugin or dfhack can't recover + * from reported error and it requires manual handling from the user. + * + * \param category the debug category + * \param optional the optional second parameter is an existing + * color_ostream_proxy object + * \return color_ostream object that can be used for stream output + */ +#define ERR(category, ...) DBG_PRINT(category, unlikely, \ + DFHack::DebugCategory::LERROR, ## __VA_ARGS__) + +} diff --git a/library/include/DebugManager.h b/library/include/DebugManager.h new file mode 100644 index 000000000..fb4c635fb --- /dev/null +++ b/library/include/DebugManager.h @@ -0,0 +1,111 @@ +/** + Copyright © 2018 Pauli + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any + damages arising from the use of this software. + + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ + +#pragma once + +#include "Export.h" +#include "Signal.hpp" + +#include +#include + +namespace DFHack { + +/*! \file DebugManager.h + * Expose an simple interface to runtime debug output filtering. The management + * interface is separated from output interface because output is required in + * many places while management is expected to be required only in a few places. + */ + +class DebugCategory; + +/*! + * \brief Container holding all registered runtime debug categories + * Singleton DebugManager is a minor extension to std::vector that allows signal + * callbacks to be attached from ui code that manages. + * + * To avoid parallel plugin unload causing issues access to DebugManager must be + * protected by mutex. The access mutex will be taken when + * DFHack::DebugCategory::~DebugCategory performs unregister calls to + * DFHack::DebugManager. The mutex will protect from memory disappearing while + * ui code is accessing or changing the runtime state. + * + * Signal emitting happens from a locked contexts. Taking the + * DFHack::DebugManager::access_mutex_ in a signal callback will results to a + * deadlock. + * + * The interface is extremely simple but enough to implement persistent filter + * states and runtime configuration code in a plugin. + */ +class DFHACK_EXPORT DebugManager : public std::vector { +public: + friend class DebugRegisterBase; + + //! access_mutex_ protects all readers and writers to DFHack::DebugManager + std::mutex access_mutex_; + + //! Different signals that all will be routed to + //! DebugManager::categorySignal + enum signalType { + CAT_ADD, + CAT_REMOVE, + CAT_MODIFIED, + }; + + //! type to help access signal features like Connection and BlockGuard + using categorySignal_t = Signal; + + /*! + * Signal object where callbacks can be connected. Connecting to a class + * method can use a lambda wrapper to the capture object pointer and correctly + * call required method. + * + * Signal is internally serialized allowing multiple threads call it + * freely. + */ + categorySignal_t categorySignal; + + //! Get the singleton object + static DebugManager& getInstance() { + static DebugManager instance; + return instance; + } + + //! Prevent copies + DebugManager(const DebugManager&) = delete; + //! Prevent copies + DebugManager(DebugManager&&) = delete; + //! Prevent copies + DebugManager& operator=(DebugManager) = delete; + //! Prevent copies + DebugManager& operator=(DebugManager&&) = delete; +protected: + DebugManager() = default; + + //! Helper for automatic category registering and signaling + void registerCategory(DebugCategory &); + //! Helper for automatic category unregistering and signaling + void unregisterCategory(DebugCategory &); +private: +}; +} diff --git a/library/include/Signal.hpp b/library/include/Signal.hpp new file mode 100644 index 000000000..acc8f4a0a --- /dev/null +++ b/library/include/Signal.hpp @@ -0,0 +1,782 @@ +/** +Copyright © 2018 Pauli + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. + */ + +#pragma once + +#include + +#include +#include +#include +#include +#include + +#ifdef __SSE__ +#include +#endif + +namespace DFHack { + +/*! + * Select inline implementation for Signal members + * This requires careful destruction order where all connection has been + * disconnected before Signal::~Signal() + */ +class signal_inline_tag; +/*! + * Select share_ptr managed implementation for Signal members. + * + * If Connection holding object may be deleted without full serialization + * between disconnect and signal emit the holding object must be managed by + * shared_ptr and derive from ConnectedBase. It will also have to pass the + * std::shared_ptr to connect. + + * It uses two way std::weak_ptr reference to guarantee destruction of either + * object doesn't happen when call is made to them. + * + * It is still possible to get a callback call after manual disconnect from + * outside destructor. But without destruction risk the disconnect race can be + * handled by slot implementation side. + */ +class signal_shared_tag; + +/** + * Used for signal_shared_tag holders that may race with destructor triggered + * disconnect and emit from Signal. + */ +class ConnectedBase { +}; + +template +class Signal; + +namespace details { + +template +struct SignalImpl; + +template +struct selectImpl; + +//! Manage callback states in thread safe manner +template +class CallbackHolderImpl; + +template +struct CallbackHolderBase { + using Callback = std::function; + + CallbackHolderBase(const Callback& cb) : + cb_{cb}, + state_{} + {} + + //! Block the connection + void block() noexcept + { + state_ += blocked; + } + + //! Unblock the connection + void unblock() noexcept + { + state_ -= blocked; + } + + //! Check if connection is deleted + bool erased() const noexcept + { + return state_ & deleted; + } + + //! Check if connection is still active (not blocked or erased) + operator bool() const noexcept + { + return !(state_ & ~inCall); + } + +protected: + //! Immutable callback object + const Callback cb_; + using state_t = unsigned; + //! Single shared state as a bitfield to simplify synchronization + //! between state changes. + std::atomic state_; + static constexpr state_t deleted = 0x1 << (sizeof(state_t)*CHAR_BIT - 1); + static constexpr state_t inCall = deleted >> (sizeof(state_t)*CHAR_BIT/2); + static constexpr state_t blocked = 0x1; + static constexpr state_t blockedMask = inCall - 1; + static constexpr state_t inCallMask = (deleted - 1) ^ blockedMask; +}; + +template +class CallbackHolderImpl : + public CallbackHolderBase { + using parent_t = CallbackHolderBase; +public: + using Callback = typename parent_t::Callback; +private: + using state_t = typename parent_t::state_t; + //! Make sure callback pointed object doesn't disappear under us + //! while we call it. + struct CallGuard { + + //! Prevent copies but allow copy elision + CallGuard(const CallGuard&); + + //! Allow implicit conversion to callback for simply syntax + const Callback& operator*() const noexcept + { + return holder_->cb_; + } + + operator bool() const noexcept + { + return *holder_; + } + + //! Mark call not to be called any more + ~CallGuard() { + holder_->state_ -= parent_t::inCall; + } + private: + //! Reference to the connection + CallbackHolderImpl* holder_; + + //! Mark call to be in process + CallGuard(CallbackHolderImpl* holder) : + holder_{holder} + { + holder_->state_ += parent_t::inCall; + } + //! Only allow construction from the CallbackHolderImpl::prepareCall + friend class CallbackHolderImpl; + }; +public: + //! Construct the callback state for a callback + CallbackHolderImpl(const Callback& cb) : + parent_t{cb} + {} + + /*! + * Data race free disconnection for the connection. It spins until + * no more callers to wait. Spinning should be problem as callbacks + * are expected to be simple and fast to execute. + * + * Must not be called from withing callback! + * + * \todo Maybe use monitor instruction to avoid busy wait and call + * std::thread::yield() if wait is longer than expected. + */ + void erase() noexcept + { + state_t oldstate; + state_t newstate; + /** Spin until no callers to this callback */ +spin: + while ((oldstate = parent_t::state_) & parent_t::inCallMask) { + // pause would be portable to all old processors but there + // isn't portable way to generate it without SSE header. +#ifdef __SSE__ + _mm_pause(); +#endif + } + do { + if (oldstate & parent_t::inCallMask) + goto spin; + newstate = oldstate | parent_t::deleted; + } while(!parent_t::state_.compare_exchange_weak(oldstate, newstate)); + } + + //! Return RAII CallGuard to protect race between callback and + //! disconnect. + CallGuard prepareCall() + { + return {this}; + } +}; + +template +class CallbackHolderImpl : + public CallbackHolderBase { + using parent_t = CallbackHolderBase; +public: + using Callback = typename parent_t::Callback; +private: + using state_t = typename parent_t::state_t; + //! Make sure callback pointed object doesn't disappear under us + //! while we call it. + struct CallGuard { + + //! Prevent copies but allow copy elision + CallGuard(const CallGuard&); + + //! Allow implicit conversion to callback for simply syntax + const Callback& operator*() const noexcept + { + return holder_->cb_; + } + + operator bool() const noexcept + { + // If this is not marked erased then weak_ref->lock succeeded or + // the slot isn't managed by shared_ptr + return *holder_; + } + + private: + //! Reference to the connection + CallbackHolderImpl* holder_; + std::shared_ptr strong_ref_; + + //! Mark call to be in process + CallGuard(CallbackHolderImpl* holder) : + holder_{holder}, + strong_ref_{holder->weak_ref_.lock()} + { + } + //! Only allow construction from the CallbackHolderImpl::prepareCall + friend class CallbackHolderImpl; + }; + + std::weak_ptr weak_ref_; + friend CallGuard; +public: + //! Construct the callback state for an automatically synchronized object + CallbackHolderImpl(const Callback& cb, + std::shared_ptr& ref) : + parent_t{cb}, + weak_ref_{ref} + {} + + //! Construct the callback state for an externally synchronized object + CallbackHolderImpl(const Callback& cb) : + parent_t{cb}, + weak_ref_{} + {} + + /*! + * erase from destructor can't happen while we are in call because + */ + void erase() noexcept + { + parent_t::state_ |= parent_t::deleted; + } + + //! Return RAII CallGuard to protect race between callback and + //! disconnect. + CallGuard prepareCall() + { + return {this}; + } +}; + +template +struct SignalImpl : public selectImpl::parent_t { +protected: + using select_t = selectImpl; + using parent_t = typename select_t::parent_t; +public: + using CallbackHolder = CallbackHolderImpl; + using Callback = typename CallbackHolder::Callback; + + //! The container type used to store callbacks + using CallbackContainer = std::list; + struct BlockGuard; + + //! Simple connection class that is required to disconnect from the + //! signal. + struct Connection { + //! Construct a default Connection object but using it will result + //! to undefined behavior unless proper connection is assigned to it + Connection() = default; + + Connection(Connection&& o) : + iter_{o.iter_}, + signal_{} + { + std::swap(signal_, o.signal_); + } + + Connection& operator=(Connection&& o) + { + disconnect(); + iter_ = o.iter_; + std::swap(signal_, o.signal_); + return *this; + } + + Connection(const Connection&) = delete; + Connection& operator=(const Connection&) = delete; + + //! Disconnect from signal + void disconnect() + { + auto s = select_t::lock(signal_); + if (!s) + return; + + s->disconnect(*this); + } + + ~Connection() + { + disconnect(); + } + private: + //! Block the connection temporary + void block() + { + auto s = select_t::lock(signal_); + if (!s) + return; + iter_->block(); + } + + //! Restore blocked connection + void unblock() + { + auto s = select_t::lock(signal_); + if (!s) + return; + iter_->unblock(); + } + + //! Construct connection object + Connection(const typename CallbackContainer::iterator &iter, + typename select_t::weak_ptr ptr) : + iter_{iter}, + signal_{ptr} + {} + + //! std::list iterator that is used to access the callback and allow + //! removal from the list. + typename CallbackContainer::iterator iter_; + //! Reference to signal object + typename select_t::weak_ptr signal_; + friend SignalImpl; + friend BlockGuard; + }; + + /*! + * BlockGuard allows temporary RAII guard managed blocking of a + * connection object. + */ + struct BlockGuard { + /*! + * Block a connection that belongs to signal + * \param connection The connection that will be temporary blocked + */ + BlockGuard(Connection& connection) : + blocked_{&connection} + { + connection.block(); + } + + /*! + * Unblock the temporary blocked connection + */ + ~BlockGuard() + { + blocked_->unblock(); + } + + //! Prevent copies but allow copy elision + BlockGuard(const BlockGuard&); + private: + Connection* blocked_; + }; + + Connection connect(const Callback& f) + { + std::lock_guard lock(access_); + auto iter = callbacks_.emplace(callbacks_.begin(), f); + return {iter, parent_t::shared_from_this()}; + } + + Connection connect(std::shared_ptr c, const Callback& f) + { + std::lock_guard lock(access_); + auto iter = callbacks_.emplace(callbacks_.begin(), f, c); + return {iter, parent_t::shared_from_this()}; + } + + void disconnect(Connection& connection) { + std::lock_guard lock(access_); + if (recursion_) { + deleted_ = true; + connection.iter_->erase(); + } else { + callbacks_.erase(connection.iter_); + } + select_t::reset(connection.signal_); + } + + template + void operator()(Combiner &combiner, Args&&... arg) + { + std::unique_lock lock(access_); + struct RecursionGuard { + SignalImpl* signal_; + std::unique_lock* lock_; + //! Increment access count to make sure disconnect doesn't erase + RecursionGuard(SignalImpl *signal, std::unique_lock* lock) : + signal_{signal}, + lock_{lock} + { + ++signal_->recursion_; + } + + /*! + * Clean up deleted functions in data race free and exception + * safe manner. + */ + ~RecursionGuard() + { + lock_->lock(); + if (--signal_->recursion_ == 0 && signal_->deleted_) { + for (auto iter = signal_->callbacks_.begin(); iter != signal_->callbacks_.end();) { + if (iter->erased()) + iter = signal_->callbacks_.erase(iter); + else + ++iter; + } + signal_->deleted_ = false; + } + } + + } guard{this, &lock}; + // Call begin in locked context to allow data race free iteration + // even if there is parallel inserts to the begin after unlocking. + auto iter = callbacks_.begin(); + lock.unlock(); + for (; iter != callbacks_.end(); ++iter) { + // Quickly skip blocked calls without memory writes + if (!*iter) + continue; + // Protect connection from deletion while we are about to call + // it. + auto cb = iter->prepareCall(); + if (cb) + combiner(*cb, std::forward(arg)...); + } + } + + void operator()(Args&&... arg) + { + auto combiner = [](const Callback& cb, Args&&... arg2) + { + cb(std::forward(arg2)...); + }; + (*this)(combiner,std::forward(arg)...); + } + + ~SignalImpl() { + // Check that callbacks are empty. If this triggers then signal may + // have to be extended to allow automatic disconnection of active + // connections in the destructor. + if (std::is_same::value) + assert(callbacks_.empty() && "It is very likely that this signal should use signal_shared_tag"); + } + + //! Simplify access to pimpl when it is inline + SignalImpl* operator->() { + return this; + } + SignalImpl& operator*() { + return *this; + } + + SignalImpl() = default; +private: + SignalImpl(const SignalImpl&) : + SignalImpl{} + {} + std::mutex access_; + CallbackContainer callbacks_; + int recursion_; + bool deleted_; + friend Signal; +}; + +template +struct selectImpl { + using impl_t = SignalImpl; + using interface_t = Signal; + using type = impl_t; + using weak_ptr = impl_t*; + struct ptr_from_this { + weak_ptr shared_from_this() + { + return static_cast(this); + } + }; + using parent_t = ptr_from_this; + + selectImpl() = default; + + // Disallow copies for inline version. + selectImpl(const selectImpl&) = delete; + selectImpl(selectImpl&&) = delete; + selectImpl& operator=(const selectImpl&) = delete; + selectImpl& operator=(selectImpl&&) = delete; + + + static type make() { + return {}; + } + + static void reset(weak_ptr& ptr) { + ptr = nullptr; + } + + static weak_ptr lock(weak_ptr& ptr) { + return ptr; + } + + static weak_ptr get(interface_t& signal) { + return &signal.pimpl; + } +}; + +template +struct selectImpl { + using impl_t = SignalImpl; + using interface_t = Signal; + using type = std::shared_ptr; + using weak_ptr = std::weak_ptr; + using parent_t = std::enable_shared_from_this; + + // Allow copies for shared version + + static type make() { + return std::make_shared>(); + } + + static void reset(weak_ptr& ptr) { + ptr.reset(); + } + + static type lock(weak_ptr& ptr) { + return ptr.lock(); + } + + static weak_ptr get(interface_t& signal) { + return signal.pimpl; + } +}; +} + +/*! + * As I couldn't figure out which signal library would be a good. Too bad all + * signal libraries seem to be either heavy with unnecessary features or written + * before C++11/14 have become useable targets. That seems to indicate everyone + * is now building signal system with standard components. + * + * Implementation and interface is build around std::function holding delegates + * to a function pointer or a functor. One can put there example lambda function + * that captures this pointer from connect side. The lambda function then calls + * the slot method of object correctly. + * + * It is fairly simple to change the signal signature to directly call methods + * but internally that std::function becomes more complex. The pointer to + * member function is problematic because multiple inheritance requires + * adjustments to this. The lambda capture approach should be easy to use while + * letting compiler optimize method call in the callee side. + * + * DFHack::Signal::Connection is an connection handle. The handle can be used to + * disconnect and block a callback. Connection destructor will automatically + * disconnect from the signal. + * + * DFHack::Signal::BlockGuard is an automatic blocked callback guard object. It + * prevents any signals from calling the slot as long the BlockGuard object is + * alive. Internally it replaces the callback with an empty callback and stores + * the real callback in a member variable. Destructor then puts back the real + * callback. This allows easily recursive BlockGuard work correctly because only + * the first BlockGuard has the real callback. + * + * signal_inline_tag requires careful destruction order where all connection are + * disconnected before signal destruction. The implementation is specifically + * targeting places like static and singleton variables and widget hierarchies. + * It provides data race free connect, disconnect and emit operations. + * + * signal_shared_tag allows a bit more freedom when destroying the Signal. It + * adds data race safety between Connection, BlockGuard and destructor. If + * multiple callers need access to Signal with potential of destruction of + * original owner then callers can use Signal copy constructor to take a strong + * reference managed by shared_ptr or weak_ptr with Signal::weak_from_this(). + * weak_from_this returns an object that forwards call directly to + * implementation when the shared_ptr is created using Signal::lock + * + * \param RT return type is derived from a single signature template argument + * \param Args Variable argument type list that is derived from a signature + * template argument. + * \param tag The tag type which selects between shared_ptr managed pimpl and + * inline member variables. + */ +template +class Signal : protected details::selectImpl { +public: + //! Type of callable that can be connected to the signal. + using Callback = std::function; + +protected: + using select_t = details::selectImpl; + using CallbackContainer = typename select_t::impl_t::CallbackContainer; +public: + using weak_ptr = typename select_t::weak_ptr; + + /*! + * Simple connection class that is required to disconnect from the + * signal. + * \sa SignalImpl::Connection + */ + using Connection = typename select_t::impl_t::Connection; + /*! + * BlockGuard allows temporary RAII guard managed blocking of a + * connection object. + * \sa SignalImpl::BlockGuard + */ + using BlockGuard = typename select_t::impl_t::BlockGuard; + + /*! + * Connect a callback function to the signal + * + * Safe to call from any context as long as SignalImpl destructor can't be + * called simultaneously from other thread. + * + * \param f callable that will connected to the signal + * \return connection handle that can be used to disconnect it + */ + Connection connect(const Callback& f) + { + return pimpl->connect(f); + } + + /*! + * Thread safe connect variant connection and Connected object destruction + * can't race with emit from different threads. + * + * Safe to call from any context as long as SignalImpl destructor can't be + * called simultaneously from other thread. + */ + Connection connect(std::shared_ptr c, const Callback& f) + { + static_assert(std::is_same::value, + "Race free destruction is only possible with signal_shared_tag"); + return pimpl->connect(c, f); + } + + /*! + * Disconnection a callback from slots + * + * signal_inline_tag: + * This may not be called if the callback has been called in same + * thread. If callback should trigger destruction an object then + * deletion must use deferred. This rule prevents issues if other thread + * are trying to call the callback when disconnecting. + * + * signal_shared_tag: + * disconnect can be freely called from anywhere as long as caller holds a + * strong reference to the Signal. Strong reference can be obtained by using + * Connection::disconnect, Signal copy constructor to have a copy of signal + * or weak_ptr from weak_from_this() passed to Signal::lock(). + * + * \param connection the object returned from DFHack::Signal::connect + */ + void disconnect(Connection& connection) + { + pimpl->disconnect(connection); + } + + /*! + * Call all connected callbacks using passed arguments. + * + * signal_inline_tag: + * Must not call operator() from callbacks. + * Must not disconnect called callback from inside callback. Solution often + * is to set just atomic state variables in callback and do actual + * processing including deletion in update handler or logic vmethod. + * + * signal_shared_tag: + * Safe to call from any context as long as SignalImpl destructor can't be + * called simultaneously from other thread. + * Safe to disconnect any connection from callbacks. + * + * \param combiner that calls callbacks and processes return values + * \param arg arguments list defined by template parameter signature. + */ + template + void operator()(Combiner &combiner, Args&&... arg) + { + (*pimpl)(combiner, std::forward(arg)...); + } + + /*! + * Call all connected callbacks using passed arguments. + * + * signal_inline_tag: + * Must not call operator() from callbacks. + * Must not disconnect called callback from inside callback. Solution often + * is to set just atomic state variables in callback and do actual + * processing including deletion in update handler or logic vmethod. + * + * signal_shared_tag: + * Safe to call from any context as long as SignalImpl destructor can't be + * called simultaneously from other thread. + * Safe to disconnect any connection from callbacks. + * + * \param arg arguments list defined by template parameter signature. + */ + void operator()(Args&&... arg) + { + (*pimpl)(std::forward(arg)...); + } + + /*! + * Helper to lock the weak_ptr + */ + static typename select_t::type lock(weak_ptr& ptr) + { + return select_t::lock(ptr); + } + + /*! + * Helper to create a weak reference to pimpl which can be used to access + * pimpl directly. If the tag is signal_shared_tag then it provides race + * free access to Signal when using Signal::lock and checking returned + * shared_ptr. + */ + weak_ptr weak_from_this() noexcept + { + return select_t::get(*this); + } + + Signal() : + pimpl{select_t::make()} + {} +private: + typename select_t::type pimpl; + friend select_t; +}; +} From 8a3a05de242fdede47d832b4e453d7bec8a734fe Mon Sep 17 00:00:00 2001 From: Pauli Date: Sun, 10 Jun 2018 10:17:23 +0300 Subject: [PATCH 02/66] Allow unloading plugins that use std::regex --- library/CMakeLists.txt | 1 + library/CompilerWorkAround.cpp | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 library/CompilerWorkAround.cpp diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 416e42c41..d3bff72df 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -57,6 +57,7 @@ include/wdirent.h SET(MAIN_SOURCES Core.cpp ColorText.cpp +CompilerWorkAround.cpp DataDefs.cpp Debug.cpp Error.cpp diff --git a/library/CompilerWorkAround.cpp b/library/CompilerWorkAround.cpp new file mode 100644 index 000000000..402553bd8 --- /dev/null +++ b/library/CompilerWorkAround.cpp @@ -0,0 +1,32 @@ +#include + +namespace DFHack { +namespace neverCalled { + +/** + * gcc/linstdc++ seems to generate code that links libstdc++ back to first + * shared object using std::regex. To allow plugins unload with std::regex in + * the code we need the std::regex functions inside libdfhack.so. + * + * If your plugin decides to use any overloads that aren't listed here it may + * stay in memory after dlclose. + */ +std::regex stdRegexPluginUnloadWorkaround() +{ + std::regex fake("foo"); + std::string haystack("bar is foo in the world"); + std::regex fake2(std::string("bar")); + if (std::regex_match(haystack, fake)) + std::swap(fake, fake2); + if (std::regex_search(haystack, fake)) + std::swap(fake, fake2); + const char* haystack2 = "foo"; + if (std::regex_match(haystack2, fake)) + std::swap(fake, fake2); + if (std::regex_search(haystack2, fake)) + std::swap(fake, fake2); + return fake; +} + +} +} From 9cfb07f4760f7d99cc95109c06c44be8669bb731 Mon Sep 17 00:00:00 2001 From: Pauli Date: Sun, 10 Jun 2018 10:18:39 +0300 Subject: [PATCH 03/66] Add debug plugin to manage runtime debug filters --- plugins/CMakeLists.txt | 1 + plugins/debug.cpp | 1139 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1140 insertions(+) create mode 100644 plugins/debug.cpp diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index fbf458c4f..a05d680ea 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -107,6 +107,7 @@ if (BUILD_SUPPORTED) DFHACK_PLUGIN(cursecheck cursecheck.cpp) DFHACK_PLUGIN(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua) DFHACK_PLUGIN(deramp deramp.cpp) + DFHACK_PLUGIN(debug debug.cpp LINK_LIBRARIES jsoncpp_lib_static) DFHACK_PLUGIN(dig dig.cpp) DFHACK_PLUGIN(digFlood digFlood.cpp) add_subdirectory(diggingInvaders) diff --git a/plugins/debug.cpp b/plugins/debug.cpp new file mode 100644 index 000000000..9464305dd --- /dev/null +++ b/plugins/debug.cpp @@ -0,0 +1,1139 @@ +/** +Copyright © 2018 Pauli + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source + distribution. + */ + +#include "Core.h" +#include "PluginManager.h" +#include "DebugManager.h" +#include "Debug.h" +#include "modules/Filesystem.h" + +#include + +#include +#include +#include +#include +#include +#include +#include + +DFHACK_PLUGIN("debug"); + +namespace DFHack { +DBG_DECLARE(debug,filter); +DBG_DECLARE(debug,init); +DBG_DECLARE(debug,command); +DBG_DECLARE(debug,ui); +} + +namespace serialization { + +template +struct nvp : public std::pair { + using parent_t = std::pair; + nvp(const char* name, T& value) : + parent_t{name, &value} + {} +}; + +template +nvp make_nvp(const char* name, T& value) { + return {name, value}; +} + +} + +#define NVP(variable) serialization::make_nvp(#variable, variable) + +namespace Json { +template +typename std::enable_if::value, ET>::type +get(Json::Value& ar, const std::string &key, const ET& default_) +{ + return static_cast(as(ar.get(key, static_cast(default_)))); +} +} + +namespace DFHack { namespace debugPlugin { + +using JsonArchive = Json::Value; + +//! Write a named and type value to Json::Value. enable_if makes sure this is +//! only available for types that Json::Value supports directly. +template::value, int>::type = 0> +JsonArchive& operator<<(JsonArchive& ar, const serialization::nvp& target) +{ + ar[target.first] = *target.second; + return ar; +} + +//! Read a named and typed value from Json::Value +template +JsonArchive& operator>>(JsonArchive& ar, const serialization::nvp& target) +{ + *target.second = Json::get(ar, target.first, T{}); + return ar; +} + +/*! + * Default regex flags optimized for matching speed because objects are stored + * long time in memory. + */ +static constexpr auto defaultRegex = + std::regex::optimize | std::regex::nosubs | std::regex::collate; + +static const char* const commandHelp = + " Manage runtime debug print filters.\n" + "\n" + " debugfilter category [ []]\n" + " List categories matching regular expressions.\n" + " debugfilter filter []\n" + " List active filters or show detailed information for a filter.\n" + " debugfilter set [persistent] [ []]\n" + " Set a filter level to categories matching regular expressions.\n" + " debugfilter unset [ ...]\n" + " Unset filters matching space separated list of ids from 'filter'.\n" + " debugfilter disable [ ...]\n" + " Disable filters matching space separated list of ids from 'filter'.\n" + " debugfilter enable [ ...]\n" + " Enable filters matching space separated list of ids from 'filter'.\n" + " debugfilter help []\n" + " Show detailed help for a command or this help.\n"; +static const char* const commandCategory = + " category [ []]\n" + " List categories with optional filters. Parameters are passed to\n" + " std::regex to limit which once are shown. The first regular\n" + " expression is used to match category and the second is used match\n" + " plugin name.\n"; +static const char* const commandSet = + " set [persistent] [ []]\n" + " Set filtering level for matching categories. 'level' must be one of\n" + " trace, debug, info, warning and error. The 'level' parameter sets\n" + " the lowest message level that will be shown. The command doesn't\n" + " allow filters to disable any error messages.\n" + " Default filter life time is until Dwarf Fortress process exists or\n" + " plugin is unloaded. Passing 'persistent' as second parameter tells\n" + " the plugin to store the filter to dfhack-config. Stored filters\n" + " will be active until always when the plugin is loaded. 'unset'\n" + " command can be used to remove persistent filters.\n" + " Filters are applied FIFO order. The latest filter will override any\n" + " older filter that also matches.\n"; +static const char* const commandFilters = + " filter []\n" + " Show the list of active filters. The first column is 'id' which can\n" + " be used to deactivate filters using 'unset' command.\n" + " Filters are printed in same order as applied - the oldest first.\n"; +static const char* const commandUnset = + " unset [ ...]\n" + " 'unset' takes space separated list of filter ids from 'filter'.\n" + " It will reset any matching category back to the default 'warning'\n" + " level or any other still active matching filter level.\n"; +static const char* const commandDisable = + " disable [ ...]\n" + " 'disable' takes space separated list of filter ids from 'filter'.\n" + " It will reset any matching category back to the default 'warning'\n" + " level or any other still active matching filter level.\n" + " 'disable' will print red filters that were already disabled.\n"; +static const char* const commandEnable = + " enable [ ...]\n" + " 'enable' takes space separated list of filter ids from 'filter'.\n" + " It will reset any matching category back to the default 'warning'\n" + " level or any other still active matching filter level.\n" + " 'enable' will print red filters that were already enabled.\n"; +static const char* const commandHelpDetails = + " help []\n" + " Show help for any of subcommands. Without any parameters it shows\n" + " short help for all subcommands.\n"; + +//! Helper type to hold static dispatch table for subcommands +struct CommandDispatch { + //! Store handler function pointer and help message for commands + struct Command { + using handler_t = command_result(*)(color_ostream&,std::vector&); + Command(handler_t handler, const char* help) : + handler_(handler), + help_(help) + {} + + command_result operator()(color_ostream& out, + std::vector& parameters) const noexcept + { + return handler_(out, parameters); + } + + handler_t handler() const noexcept + { return handler_; } + + const char* help() const noexcept + { return help_; } + private: + handler_t handler_; + const char* help_; + }; + using dispatch_t = const std::map; + //! Name to handler function and help message mapping + static dispatch_t dispatch; +}; + +struct LevelName { + static constexpr auto regex_opt = std::regex::icase | std::regex::optimize | std::regex::nosubs; + LevelName(const std::string& name) : + name_{name}, + match_{name, regex_opt} + {} + + bool match(const std::string& value) const + { + return std::regex_match(value, match_); + } + + operator const std::string&() const noexcept + { + return name_; + } + + const std::string& str() const noexcept + { + return name_; + } + + template + std::string operator+(const T& v) const + { + return name_ + v; + } +private: + std::string name_; + std::regex match_; +}; + +std::string operator+(const std::string& a, const LevelName& b) +{ + return a + static_cast(b); +} + +//! List of DebugCategory::level's in human readable form +static const std::array levelNames{ + LevelName{"Trace"}, + LevelName{"Debug"}, + LevelName{"Info"}, + LevelName{"Warning"}, + LevelName{"Error"}, +}; + +/*! + * Filter applies a runtime filter to matching DFHack::DebugCategory 's. + * Filters are stored in DFHack::debugPlugin::FilterManager which applies + * filters to dynamically added categories. The manager also stores and loads + * persistent Filters from the configuration file. + */ +struct Filter { + explicit Filter(DebugCategory::level level, + const std::string& categoryText, + const std::regex& category, + const std::string& pluginText, + const std::regex& plugin, + bool persistent = true, + bool enabled = true) noexcept; + + explicit Filter(DebugCategory::level level, + const std::string& categoryText, + const std::string& pluginText, + bool persistent = true, + bool enabled = true); + + explicit Filter() = default; + + //! Apply the filter to a category if regex's match + void apply(DFHack::DebugCategory& cat) noexcept; + //! Apply the filter to a category that has been already matched + bool applyAgain(DFHack::DebugCategory& cat) const noexcept; + //! Remove the category from matching count if regex's match + //! \return true if regex's matched + bool remove(const DFHack::DebugCategory& cat) noexcept; + + //! Query if filter is enabled + bool enabled() const noexcept {return enabled_;} + //! Set the enable status of filter + void enabled(bool enable) noexcept; + //! Query if filter is persistent + bool persistent() const noexcept {return persistent_;} + //! Query if the filter level + bool level() const noexcept {return level_;} + //! Query number of matching categories + size_t matches() const noexcept {return matches_;} + //! Add matches count for the initial category filter matching + void addMatch() noexcept {++matches_;} + //! Return the category filter text + const std::string& categoryText() const noexcept {return categoryText_;} + //! Return the plugin filter text + const std::string& pluginText() const noexcept {return pluginText_;} + + //! Load Filter from configuration file. Second parameter would be version + //! number if format changes in future to include more fields. Then new + //! fields would have to be loaded conditionally + void load(JsonArchive& ar, const unsigned int) + { + ar >> NVP(categoryText_) + >> NVP(pluginText_) + >> NVP(enabled_) + >> NVP(level_); + TRACE(filter) << "Loading filter cat: " << categoryText_ + << " plug: " << pluginText_ + << " ena " << enabled_ + << " level: " << level_ + << std::endl; + persistent_ = true; + matches_ = 0; + category_ = std::regex{categoryText_}; + plugin_ = std::regex{pluginText_}; + } + + //! Save the Filter to json configuration file + void save(JsonArchive& ar, const unsigned int) const + { + ar << NVP(categoryText_) + << NVP(pluginText_) + << NVP(enabled_) + << NVP(level_); + } + +private: + std::regex category_; + std::regex plugin_; + DebugCategory::level level_; + size_t matches_; + bool persistent_; + bool enabled_; + std::string categoryText_; + std::string pluginText_; +}; + +Filter::Filter(DebugCategory::level level, + const std::string& categoryText, + const std::regex& category, + const std::string& pluginText, + const std::regex& plugin, + bool persistent, + bool enabled) noexcept : + category_{category}, + plugin_{plugin}, + level_{level}, + matches_{0}, + persistent_{persistent}, + enabled_{enabled}, + categoryText_{categoryText}, + pluginText_{pluginText} +{} + +Filter::Filter(DebugCategory::level level, + const std::string& categoryText, + const std::string& pluginText, + bool persistent, + bool enabled) : + Filter{ + level, + categoryText, + std::regex{categoryText, defaultRegex}, + pluginText, + std::regex{pluginText, defaultRegex}, + persistent, + enabled, + } +{} + +void Filter::enabled(bool enable) noexcept +{ + if (enable == enabled_) + return; + enabled_ = enable; +} + +bool Filter::applyAgain(DebugCategory& cat) const noexcept +{ + if (!enabled_) + return false; + if (!std::regex_search(cat.category(), category_)) + return false; + if (!std::regex_search(cat.category(), plugin_)) + return false; + TRACE(filter) << "apply " << cat.plugin() << ':' << cat.category() << " matches '" + << pluginText() << "' '" << categoryText() << '\'' << std::endl; + cat.allowed(level_); + return true; +} + +void Filter::apply(DebugCategory& cat) noexcept +{ + if (applyAgain(cat)) + ++matches_; +} + +bool Filter::remove(const DebugCategory& cat) noexcept +{ + if (!enabled_) + return false; + if (!std::regex_search(cat.category(), category_)) + return false; + if (!std::regex_search(cat.category(), plugin_)) + return false; + TRACE(filter) << "remove " << cat.plugin() << ':' << cat.category() << " matches '" + << pluginText() << "' '" << categoryText() << std::endl; + --matches_; + return true; +} + +/** + * Storage for enabled and disabled filters. It uses ordered map because common + * case is to iterate filters from oldest to the newest. + * + * Data races: any reader and writer must lock + * DFHack::DebugManager::access_lock_. Sharing DebugManager make sense because + * most of functionality related to filters requires locking DebugManager too. + * Remaining functionality can share same lock because they are rarely called + * functions. + */ +struct FilterManager : public std::map +{ + using parent_t = std::map; + //! Current configuration version implemented by the code + constexpr static Json::UInt configVersion{1}; + //! Path to the configuration file + constexpr static const char* configPath{"dfhack-config/runtime-debug.json"}; + + //! Get reference to the singleton + static FilterManager& getInstance() noexcept + { + static FilterManager instance; + return instance; + } + + //! Add a new filter which gets automatically a new id + template + std::pair emplaceNew( Args&&... args ) { + return emplace(std::piecewise_construct, + std::forward_as_tuple(nextId_++), + std::forward_as_tuple(std::forward(args)...)); + } + + //! Load state from the configuration file + DFHack::command_result loadConfig(DFHack::color_ostream& out) noexcept; + //! Save state to the configuration file + DFHack::command_result saveConfig(DFHack::color_ostream& out) const noexcept; + + //! Connect FilterManager to DFHack::DebugManager::categorySignal + void connectTo(DebugManager::categorySignal_t& signal) noexcept; + //! Temporary block DFHack::DebugManager::categorySignal + DebugManager::categorySignal_t::BlockGuard blockSlot() noexcept; + + ~FilterManager(); + + FilterManager(const FilterManager&) = delete; + FilterManager(FilterManager&&) = delete; + FilterManager& operator=(FilterManager) = delete; + FilterManager& operator=(FilterManager&&) = delete; + + void load(JsonArchive& ar) + { + Json::UInt version = -1; + ar >> serialization::make_nvp("configVersion", version); + if (version > configVersion) { + std::stringstream ss; + ss << "The saved config version (" + << version + << ") is newer than code supported version (" + << configVersion + << ")"; + throw std::runtime_error{ss.str()}; + } + ar >> NVP(nextId_); + JsonArchive& children = ar["filters"]; + for (auto iter = children.begin(); iter != children.end(); ++iter) { + Filter child; + child.load(*iter, version); + std::stringstream ss(iter.name()); + size_t id; + ss >> id; + insert(std::make_pair(id, child)); + } + } + + void save(JsonArchive& ar) const + { + JsonArchive children{Json::objectValue}; + for (const auto& filterPair: *this) { + if (!filterPair.second.persistent()) + continue; + std::stringstream ss; + ss << filterPair.first; + filterPair.second.save(children[ss.str()], configVersion); + } + auto configVersion = FilterManager::configVersion; + ar << NVP(configVersion) + << NVP(nextId_); + ar["filters"] = children; + } + +private: + FilterManager() = default; + //! The next integer to use as id to have each with unique number + Json::UInt64 nextId_; + DebugManager::categorySignal_t::Connection connection_; +}; + +FilterManager::~FilterManager() +{ +} + +command_result FilterManager::loadConfig(DFHack::color_ostream& out) noexcept +{ + nextId_ = 1; + if (!Filesystem::isfile(configPath)) + return CR_OK; + try { + DEBUG(command, out) << "Load config from '" << configPath << "'" << std::endl; + JsonArchive archive; + std::ifstream ifs(configPath); + if (!ifs.good()) + throw std::runtime_error{"Failed to open configuration file for reading"}; + ifs >> archive; + load(archive); + } catch(std::exception& e) { + ERR(command, out) << "Serializing filters from '" << configPath << "' failed: " + << e.what() << std::endl; + return CR_FAILURE; + } + return CR_OK; +} + +command_result FilterManager::saveConfig(DFHack::color_ostream& out) const noexcept +{ + try { + DEBUG(command, out) << "Save config to '" << configPath << "'" << std::endl; + JsonArchive archive; + save(archive); + std::ofstream ofs(configPath); + if (!ofs.good()) + throw std::runtime_error{"Failed to open configuration file for writing"}; + ofs << archive; + } catch(std::exception e) { + ERR(command, out) << "Serializing filters to '" << configPath << "' failed: " + << e.what() << std::endl; + return CR_FAILURE; + } + return CR_OK; +} + +void FilterManager::connectTo(DebugManager::categorySignal_t& signal) noexcept +{ + connection_ = signal.connect( + [this](DebugManager::signalType t, DebugCategory& cat) { + TRACE(filter) << "sig type: " << t << ' ' + << cat.plugin() << ':' + << cat.category() << std::endl; + switch (t) { + case DebugManager::CAT_ADD: + for (auto& filterPair: *this) + filterPair.second.apply(cat); + break; + case DebugManager::CAT_REMOVE: + for (auto& filterPair: *this) + filterPair.second.remove(cat); + break; + case DebugManager::CAT_MODIFIED: + break; + } + }); +} + +DebugManager::categorySignal_t::BlockGuard FilterManager::blockSlot() noexcept +{ + TRACE(filter) << "Temporary disable FilterManager::connection_" << std::endl; + return {connection_}; +} + +//! \brief Helper to parse optional regex string safely +static command_result parseRegexParam(std::regex& target, + color_ostream& out, + std::vector& parameters, + size_t pos) +{ + if (parameters.size() <= pos) + return CR_OK; + try { + std::regex temp{parameters[pos], defaultRegex}; + target = std::move(temp); + } catch(std::regex_error e) { + ERR(command,out) << "Failed to parse regular expression '" + << parameters[pos] << "'\n"; + ERR(command,out) << "Parser message: " << e.what() << std::endl; + return CR_WRONG_USAGE; + } + return CR_OK; +} + +/*! + * "Algorithm" to apply category filters based on optional regex parameters. + * \param out The output stream where errors should be written + * \param paramters The list of parameters for the command + * \param pos The position where first optional regular expression parameter is + * \param header The callback after locking DebugManager and before loop + * \param categoryMatch The callback for each matching category + */ +template +static command_result applyCategoryFilters(color_ostream& out, + std::vector& parameters, + size_t pos, Callable1 header, + Callable2 categoryMatch, + Callable3 listComplete) +{ + std::regex pluginRegex{".", defaultRegex}; + std::regex categoryRegex{".", defaultRegex}; + command_result rv = CR_OK; + + DEBUG(command,out) << "applying category filters '" + << (parameters.size() >= pos + 1 ? parameters[pos] : "") + << "' and plugin filter '" + << (parameters.size() >= pos + 2 ? parameters[pos+1] : "") + << '\'' << std::endl; + // Parse parameters + if ((rv = parseRegexParam(pluginRegex, out, parameters, pos)) != CR_OK) + return rv; + if ((rv = parseRegexParam(categoryRegex, out, parameters, pos+1)) != CR_OK) + return rv; + // Lock the manager to have consistent view of categories + auto& manager = DebugManager::getInstance(); + std::lock_guard lock(manager.access_mutex_); + out << std::left; + auto guard = header(manager, categoryRegex, pluginRegex); + for (auto* category: manager) { + DebugCategory::cstring_ref p = category->plugin(); + DebugCategory::cstring_ref c = category->category(); + // Apply filters to the category and plugin names + if (!std::regex_search(c, categoryRegex)) + continue; + if (!std::regex_search(p, pluginRegex)) + continue; + categoryMatch(*category); + } + out << std::flush << std::right; + out.color(COLOR_RESET); + return listComplete(); +} + +static void printCategoryListHeader(color_ostream& out) +{ + // Output the header. + out.color(COLOR_GREEN); + out << std::setw(12) << "Plugin" + << std::setw(12) << "Category" + << std::setw(18) << "Lowest printed" << '\n'; +} + +static void printCategoryListEntry(color_ostream& out, + unsigned& line, + DebugCategory& cat, + DebugCategory::level old = static_cast(-1)) +{ + if ((line & 31) == 0) + printCategoryListHeader(out); + // Output matching categories. + out.color((line++ & 1) == 0 ? COLOR_CYAN : COLOR_LIGHTCYAN); + const std::string& level = (old != static_cast(-1)) ? + levelNames[static_cast(old)] + "->" + + levelNames[static_cast(cat.allowed())] : + levelNames[static_cast(cat.allowed())].str(); + out << std::setw(12) << cat.plugin() + << std::setw(12) << cat.category() + << std::setw(18) << level << '\n'; +} + +//! Handler for debugfilter category +static command_result listCategories(color_ostream& out, + std::vector& parameters) +{ + unsigned line = 0; + return applyCategoryFilters(out, parameters, 1u, + // After parameter parsing + [](DebugManager&, const std::regex&, const std::regex&) { + return 0; + }, + // Per category + [&out, &line](DebugCategory& cat) { + printCategoryListEntry(out, line, cat); + }, + // After list + []() {return CR_OK;}); +} + +//! Type that prints parameter string in center of output stream field +template> +struct center { + using string = std::basic_string; + center(const string& str) : + str_(str) + {} + + const string& str_; +}; + +/*! + * Helper to construct a center object to print fields centered + * \code{.cpp} + * out << std::setw(20) << centered("centered"_s); + * \endcode + */ +template +center centered(const ST& str) +{ + return {str}; +} + +//! c++14 string conversion literal to std::string +std::string operator "" _s(const char* cstr, size_t len) +{ + return {cstr, len}; +} + +//! Output centered string, the stream must be using std::ios::right +//! \sa DFHack::debugPlugin::centered +template +std::basic_ostream& operator<<(std::basic_ostream& os, const center& toCenter) +{ + std::streamsize w = os.width(); + const auto& str = toCenter.str_; + mbstate_t ps{}; + std::streamsize ccount = 0; + auto iter = str.cbegin(); + // Check multibyte character length. It will break when mbrlen find the '\0' + for (;ccount < w; ++ccount) { + const size_t n = std::distance(iter, str.cend()); + using ss_t = std::make_signed::type; + ss_t bytes = mbrlen(&*iter, n, &ps); + if (bytes <= 0) /* Check for errors and null */ + break; + std::advance(iter, bytes); + } + + if (ccount < w) { + // Center the character when there is less than the width + // fillw = w - count + // cw = w - (fillw)/2 = (2w - w + count)/2 + // Extra one for rounding half results up + std::streamsize cw = (w + ccount + 1)/2; + os << std::setw(cw) << str + << std::setw(w - cw) << ""; + } else { + // Truncate characters to the width of field + os.write(&str[0], std::distance(str.begin(), iter)); + // Reset the field width because we wrote the string with write + os << std::setw(0); + } + return os; +} + +static FilterManager::iterator parseFilterId(color_ostream& out, + const std::string& parameter) +{ + unsigned long id = 0; + try { + id = std::stoul(parameter); + } catch(...) { + } + auto& filMan = FilterManager::getInstance(); + auto iter = filMan.find(id); + if (iter == filMan.end()) { + WARN(command,out) << "The optional parameter (" + << parameter << ") must be an filter id." << std::endl; + } + return iter; +} + +static void printFilterListEntry(color_ostream& out, + unsigned line, + color_value lineColor, + size_t id, + const Filter& filter) +{ + if ((line & 31) == 0) { + out.color(COLOR_GREEN); + out << std::setw(4) << "ID" + << std::setw(8) << "enabled" + << std::setw(8) << "persist" + << std::setw(9) << centered("level"_s) + << ' ' + << std::setw(15) << centered("category"_s) + << ' ' + << std::setw(15) << centered("plugin"_s) + << std::setw(8) << "matches" + << '\n'; + } + out.color(lineColor); + out << std::setw(4) << id + << std::setw(8) << centered(filter.enabled() ? "X"_s:""_s) + << std::setw(8) << centered(filter.persistent() ? "X"_s:""_s) + << std::setw(9) << centered(levelNames[filter.level()].str()) + << ' ' + << std::setw(15) << centered(filter.categoryText()) + << ' ' + << std::setw(15) << centered(filter.pluginText()) + << std::setw(8) << filter.matches() + << '\n'; +} + +//! Handler for debugfilter filter +static command_result listFilters(color_ostream& out, + std::vector& parameters) +{ + if (1u < parameters.size()) { + auto& catMan = DebugManager::getInstance(); + std::lock_guard lock(catMan.access_mutex_); + auto iter = parseFilterId(out, parameters[1]); + if (iter == FilterManager::getInstance().end()) + return CR_WRONG_USAGE; + + auto id = iter->first; + Filter& filter = iter->second; + + out << std::left + << std::setw(10) << "ID:" << id << '\n' + << std::setw(10) << "Enabled:" << (filter.enabled() ? "Yes"_s:"No"_s) << '\n' + << std::setw(10) << "Persist:" << (filter.persistent() ? "Yes"_s:"No"_s) << '\n' + << std::setw(10) << "Level:" << levelNames[filter.level()].str() << '\n' + << std::setw(10) << "category:" << filter.categoryText() << '\n' + << std::setw(10) << "plugin:" << filter.pluginText() << '\n' + << std::setw(10) << "matches:" << filter.matches() << '\n' + << std::right + << std::endl; + return CR_OK; + } + auto& catMan = DebugManager::getInstance(); + { + std::lock_guard lock(catMan.access_mutex_); + auto& filMan = FilterManager::getInstance(); + unsigned line = 0; + for (auto& filterPair: filMan) { + size_t id = filterPair.first; + const Filter& filter = filterPair.second; + + color_value c = (line & 1) == 0 ? COLOR_CYAN : COLOR_LIGHTCYAN; + printFilterListEntry(out,line++,c,id,filter); + } + } + out.color(COLOR_RESET); + out.flush(); + return CR_OK; +} + +static const std::string persistent("persistent"); + +//! Handler for debugfilter set +static command_result setFilter(color_ostream& out, + std::vector& parameters) +{ + bool persist = false; + size_t pos = 1u; + if (pos < parameters.size() && + parameters[pos] == persistent) { + pos++; + persist = true; + } + if (pos >= parameters.size()) { + ERR(command,out).print("set requires at least the level parameter\n"); + return CR_WRONG_USAGE; + } + const std::string& level = parameters[pos]; + auto iter = std::find_if(levelNames.begin(), levelNames.end(), + [&level](const LevelName& v) -> bool { + return v.match(level); + }); + if (iter == levelNames.end()) { + ERR(command,out).print("level ('%s') parameter must be one of " + "trace, debug, info, warning, error.\n", + parameters[pos].c_str()); + return CR_WRONG_USAGE; + } + + DebugCategory::level filterLevel = static_cast( + iter - levelNames.begin()); + + unsigned line = 0; + Filter* newFilter = nullptr; + return applyCategoryFilters(out, parameters, pos + 1, + // After parameters parsing + [¶meters, pos, filterLevel,persist,&newFilter](DebugManager&, const std::regex& catRegex, const std::regex& pluginRegex) + { + auto& filMan = FilterManager::getInstance(); + newFilter = &filMan.emplaceNew(filterLevel, + pos+1 < parameters.size()?parameters[pos+1]:".", + catRegex, + pos+2 < parameters.size()?parameters[pos+2]:".", + pluginRegex, + persist).first->second; + return filMan.blockSlot(); + }, + // Per item + [filterLevel, &line, &out, &newFilter](DebugCategory& cat) { + auto old = cat.allowed(); + cat.allowed(filterLevel); + newFilter->addMatch(); + printCategoryListEntry(out, line, cat, old); + }, + // After list + [&out,&persist]() { + if (persist) + return FilterManager::getInstance().saveConfig(out); + return CR_OK; + }); +} + +template +static command_result applyFilterIds(color_ostream& out, + std::vector& parameters, + const char* name, + HighlightRed hlRed, + ListComplete listComplete) +{ + if (1u >= parameters.size()) { + ERR(command,out) << name << " requires at least a filter id" << std::endl; + return CR_WRONG_USAGE; + } + command_result rv = CR_OK; + { + auto& catMan = DebugManager::getInstance(); + std::lock_guard lock(catMan.access_mutex_); + auto& filMan = FilterManager::getInstance(); + unsigned line = 0; + for (size_t pos = 1; pos < parameters.size(); ++pos) { + const std::string& p = parameters[pos]; + auto iter = parseFilterId(out, p); + if (iter == filMan.end()) + continue; + color_value c = (line & 1) == 0 ? COLOR_CYAN : COLOR_LIGHTCYAN; + if (hlRed(iter)) + c = COLOR_RED; + printFilterListEntry(out,line++,c,iter->first,iter->second); + } + rv = listComplete(); + } + out.color(COLOR_RESET); + out.flush(); + return rv; +} + +//! Handler for debugfilter disable +static command_result disableFilter(color_ostream& out, + std::vector& parameters) +{ + std::set modified; + bool mustSave = false; + return applyFilterIds(out,parameters,"disable", + // Per item + [&modified,&mustSave](FilterManager::iterator& iter) -> bool { + Filter& filter = iter->second; + bool enabled = filter.enabled(); + if (enabled == false) + return true; + auto& catMan = DebugManager::getInstance(); + for (DebugCategory* cat: catMan) { + if (filter.remove(*cat)) + modified.emplace(cat); + } + filter.enabled(false); + mustSave = mustSave || filter.persistent(); + return false; + }, + // After list + [&modified,&mustSave,&out]() { + for (DebugCategory* cat: modified) { + // Reset filtering back to default + cat->allowed(DebugCategory::LWARNING); + auto& filMan = FilterManager::getInstance(); + // Reapply all remaining filters + for (auto& filterPair: filMan) + filterPair.second.applyAgain(*cat); + } + if (mustSave) + return FilterManager::getInstance().saveConfig(out); + return CR_OK; + }); +} + +//! Handler for debugfilter enable +static command_result enableFilter(color_ostream& out, + std::vector& parameters) +{ + std::set modified; + bool mustSave = false; + return applyFilterIds(out,parameters,"enable", + // Per item + [&modified,&mustSave](FilterManager::iterator& iter) -> bool { + Filter& filter = iter->second; + bool enabled = filter.enabled(); + if (enabled == true) + return true; + filter.enabled(true); + auto& catMan = DebugManager::getInstance(); + for (DebugCategory* cat: catMan) { + if (filter.applyAgain(*cat)) { + modified.emplace(cat); + filter.addMatch(); + } + } + mustSave = mustSave || filter.persistent(); + return false; + }, + // After list + [&modified,&mustSave,&out]() { + for (DebugCategory* cat: modified) { + // Reset filtering back to default + cat->allowed(DebugCategory::LWARNING); + auto& filMan = FilterManager::getInstance(); + // Reapply all remaining filters + for (auto& filterPair: filMan) + filterPair.second.applyAgain(*cat); + } + if (mustSave) + return FilterManager::getInstance().saveConfig(out); + return CR_OK; + }); +} + +//! Handler for debugfilter unset +static command_result unsetFilter(color_ostream& out, + std::vector& parameters) +{ + std::set modified; + std::vector toErase; + return applyFilterIds(out,parameters,"unset", + // Per item + [&modified, &toErase](FilterManager::iterator& iter) -> bool { + Filter& filter = iter->second; + if (filter.enabled()) { + auto& catMan = DebugManager::getInstance(); + for (DebugCategory* cat: catMan) { + if (filter.remove(*cat)) + modified.emplace(cat); + } + } + toErase.emplace_back(iter); + return false; + }, + // After list + [&modified,&toErase,&out]() { + auto& filMan = FilterManager::getInstance(); + bool mustSave = false; + for (auto iter: toErase) { + mustSave = mustSave || iter->second.persistent(); + filMan.erase(iter); + } + + for (DebugCategory* cat: modified) { + // Reset filtering back to default + cat->allowed(DebugCategory::LWARNING); + // Reapply all remaining filters + for (auto& filterPair: filMan) + filterPair.second.applyAgain(*cat); + } + if (mustSave) + return FilterManager::getInstance().saveConfig(out); + return CR_OK; + }); +} + +using DFHack::debugPlugin::CommandDispatch; + +static command_result printHelp(color_ostream& out, + std::vector& parameters) +{ + const char* help = commandHelp; + auto iter = CommandDispatch::dispatch.end(); + if (1u < parameters.size()) + iter = CommandDispatch::dispatch.find(parameters[1]); + if (iter != CommandDispatch::dispatch.end()) + help = iter->second.help(); + out << help << std::flush; + return CR_OK; +} + +CommandDispatch::dispatch_t CommandDispatch::dispatch { + {"category", {listCategories,commandCategory}}, + {"filter", {listFilters,commandFilters}}, + {"set", {setFilter,commandSet}}, + {"unset", {unsetFilter,commandUnset}}, + {"enable", {enableFilter,commandEnable}}, + {"disable", {disableFilter,commandDisable}}, + {"help", {printHelp,commandHelpDetails}}, +}; + +//! Dispatch command handling to the subcommand or help +static command_result commandDebugFilter(color_ostream& out, + std::vector& parameters) +{ + DEBUG(command,out).print("debugfilter %s, parameter count %zu\n", + parameters.size() > 0 ? parameters[0].c_str() : "", + parameters.size()); + auto handler = printHelp; + auto iter = CommandDispatch::dispatch.end(); + if (0u < parameters.size()) + iter = CommandDispatch::dispatch.find(parameters[0]); + if (iter != CommandDispatch::dispatch.end()) + handler = iter->second.handler(); + return (handler)(out, parameters); +} + +} } /* namespace debug */ + +DFhackCExport DFHack::command_result plugin_init(DFHack::color_ostream& out, + std::vector& commands) +{ + commands.emplace_back( + "debugfilter", + "Manage runtime debug print filters", + DFHack::debugPlugin::commandDebugFilter, + false, + DFHack::debugPlugin::commandHelp); + auto& filMan = DFHack::debugPlugin::FilterManager::getInstance(); + DFHack::command_result rv = DFHack::CR_OK; + if ((rv = filMan.loadConfig(out)) != DFHack::CR_OK) + return rv; + auto& catMan = DFHack::DebugManager::getInstance(); + std::lock_guard lock(catMan.access_mutex_); + for (auto* cat: catMan) { + for (auto& filterPair: filMan) { + DFHack::debugPlugin::Filter& filter = filterPair.second; + filter.apply(*cat); + } + } + INFO(init,out).print("plugin_init with %zu commands, %zu filters and %zu categories\n", + commands.size(), filMan.size(), catMan.size()); + filMan.connectTo(catMan.categorySignal); + return rv; +} + +DFhackCExport DFHack::command_result plugin_shutdown(DFHack::color_ostream& out) +{ + INFO(init,out).print("plugin_shutdown\n"); + return DFHack::CR_OK; +} From 490a8557766bf3459ff85d8e0cb2ea941f311c24 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 2 Jul 2018 18:48:33 +0300 Subject: [PATCH 04/66] Add a test for signal_shared_tag implementation The test cases check that the signal_shared_tag implementation can be used and destructed safely from multiple threads. --- plugins/CMakeLists.txt | 2 + plugins/devel/CMakeLists.txt | 2 +- plugins/devel/kittens.cpp | 178 +++++++++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+), 1 deletion(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index a05d680ea..07a94112c 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,5 +1,7 @@ INCLUDE(Plugins.cmake) +find_package(Threads) + OPTION(BUILD_STONESENSE "Build stonesense (needs a checkout first)." OFF) if(BUILD_STONESENSE) add_subdirectory (stonesense) diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt index 4fb4b5cf5..879edd5bb 100644 --- a/plugins/devel/CMakeLists.txt +++ b/plugins/devel/CMakeLists.txt @@ -9,7 +9,7 @@ DFHACK_PLUGIN(counters counters.cpp) DFHACK_PLUGIN(dumpmats dumpmats.cpp) DFHACK_PLUGIN(eventExample eventExample.cpp) DFHACK_PLUGIN(frozen frozen.cpp) -DFHACK_PLUGIN(kittens kittens.cpp) +DFHACK_PLUGIN(kittens kittens.cpp LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) DFHACK_PLUGIN(memview memview.cpp memutils.cpp LINK_LIBRARIES lua) DFHACK_PLUGIN(nestboxes nestboxes.cpp) DFHACK_PLUGIN(notes notes.cpp) diff --git a/plugins/devel/kittens.cpp b/plugins/devel/kittens.cpp index 5de94ced3..26a2655e8 100644 --- a/plugins/devel/kittens.cpp +++ b/plugins/devel/kittens.cpp @@ -1,12 +1,16 @@ #include #include +#include #include +#include #include "Console.h" #include "Core.h" +#include "Debug.h" #include "Export.h" #include "MiscUtils.h" #include "PluginManager.h" +#include "Signal.hpp" #include "modules/Gui.h" #include "modules/Items.h" @@ -25,6 +29,10 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled); REQUIRE_GLOBAL(ui); REQUIRE_GLOBAL(world); +namespace DFHack { +DBG_DECLARE(kittens,command); +} + std::atomic shutdown_flag{false}; std::atomic final_flag{true}; std::atomic timering{false}; @@ -42,6 +50,7 @@ command_result trackmenu (color_ostream &out, vector & parameters); command_result trackpos (color_ostream &out, vector & parameters); command_result trackstate (color_ostream &out, vector & parameters); command_result colormods (color_ostream &out, vector & parameters); +command_result sharedsignal (color_ostream &out, vector & parameters); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { @@ -51,6 +60,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector & parameters) return CR_OK; } +struct Connected; +using shared = std::shared_ptr; +using weak = std::weak_ptr; + +static constexpr std::chrono::microseconds delay{1}; + +template +struct ClearMem : public ConnectedBase { + ~ClearMem() + { + memset(reinterpret_cast(this), 0xDE, sizeof(Derived)); + } +}; + +struct Connected : public ClearMem { + using Sig = Signal; + std::array con; + Sig signal; + weak other; + Sig::weak_ptr other_sig; + color_ostream *out; + int id; + uint32_t count; + uint32_t caller; + alignas(64) std::atomic callee; + Connected() = default; + Connected(int id) : + Connected{} + { + this->id = id; + } + void connect(color_ostream& o, shared& b, size_t pos, uint32_t c) + { + out = &o; + count = c*2; + other = b; + other_sig = b->signal.weak_from_this(); + // Externally synchronized object destruction is only safe to this + // connect. + con[pos] = b->signal.connect( + [this](int) { + uint32_t old = callee.fetch_add(1); + assert(old != 0xDEDEDEDE); + std::this_thread::sleep_for(delay); + assert(callee != 0xDEDEDEDE); + }); + // Shared object managed object with possibility of destruction while + // other threads calling emit must pass the shared_ptr to connect. + Connected *bptr = b.get(); + b->con[pos] = signal.connect(b, + [bptr](int) { + uint32_t old = bptr->callee.fetch_add(1); + assert(old != 0xDEDEDEDE); + std::this_thread::sleep_for(delay); + assert(bptr->callee != 0xDEDEDEDE); + }); + } + void reconnect(size_t pos) { + auto b = other.lock(); + if (!b) + return; + // Not required to use Sig::lock because other holds strong reference to + // Signal. But this just shows how weak_ref could be used. + auto sig = Sig::lock(other_sig); + if (!sig) + return; + con[pos] = sig->connect(b, + [this](int) { + uint32_t old = callee.fetch_add(1); + assert(old != 0xDEDEDEDE); + std::this_thread::sleep_for(delay); + assert(callee != 0xDEDEDEDE); + }); + } + void connect(color_ostream& o, shared& a, shared& b,size_t pos, uint32_t c) + { + out = &o; + count = c; + con[pos] = b->signal.connect(a, + [this](int) { + uint32_t old = callee.fetch_add(1); + assert(old != 0xDEDEDEDE); + std::this_thread::sleep_for(delay); + assert(callee != 0xDEDEDEDE); + }); + } + Connected* operator->() noexcept + { + return this; + } + ~Connected() { + INFO(command,*out).print("Connected %d had %d count. " + "It was caller %d times. " + "It was callee %d times.\n", + id, count, caller, callee.load()); + } +}; + +command_result sharedsignal (color_ostream &out, vector & parameters) +{ + using rng_t = std::linear_congruential_engine; + rng_t rng(std::random_device{}()); + size_t count = 10; + if (0 < parameters.size()) { + std::stringstream ss(parameters[0]); + ss >> count; + DEBUG(command, out) << "Parsed " << count + << " from paramters[0] '" << parameters[0] << '\'' << std::endl; + } + + + std::uniform_int_distribution dis(4096,8192); + out << "Running signal_shared_tag destruction test " + << count << " times" << std::endl; + for (size_t nr = 0; nr < count; ++nr) { + std::array t{}; + // Make an object which destruction is protected by std::thread::join() + Connected external{static_cast(t.size())}; + TRACE(command, out) << "begin " << std::endl; + { + int id = 0; + // Make objects that are automatically protected using weak_ptr + // references that are promoted to shared_ptr when Signal is + // accessed. + std::array c = { + std::make_shared(id++), + std::make_shared(id++), + std::make_shared(id++), + std::make_shared(id++), + }; + assert(t.size() == c.size()); + for (unsigned i = 1; i < c.size(); ++i) { + c[0]->connect(out, c[0], c[i], i - 1, dis(rng)); + c[i]->connect(out, c[i], c[0], 0, dis(rng)); + } + external.connect(out, c[1], 1, dis(rng)); + auto thr = [&out](shared c) { + TRACE(command, out) << "Thread " << c->id << " started." << std::endl; + weak ref = c; + for (;c->caller < c->count; ++c->caller) { + c->signal(c->caller); + } + TRACE(command, out) << "Thread " << c->id << " resets shared." << std::endl; + c.reset(); + while((c = ref.lock())) { + ++c->caller; + c->signal(c->caller); + c.reset(); + std::this_thread::sleep_for(delay*25); + } + }; + for (unsigned i = 0; i < c.size(); ++i) { + TRACE(command, out) << "start thread " << i << std::endl; + t[i] = std::thread{thr, c[i]}; + } + } + TRACE(command, out) << "running " << std::endl; + for (;external->caller < external->count; ++external->caller) { + external->signal(external->caller); + external->reconnect(1); + } + TRACE(command, out) << "join " << std::endl; + for (unsigned i = 0; i < t.size(); ++i) + t[i].join(); + } + return CR_OK; +} + command_result kittens (color_ostream &out, vector & parameters) { if (parameters.size() >= 1) From c201cf5b7b3faf44e109484ebdcb84a7a0589346 Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 4 Jul 2018 14:54:00 +0300 Subject: [PATCH 05/66] Documentation and Changelog for debug printing and Signal --- docs/Plugins.rst | 96 ++++++++++++++++++++++++++++++++++++++++++++++ docs/changelog.txt | 15 ++++++++ 2 files changed, 111 insertions(+) diff --git a/docs/Plugins.rst b/docs/Plugins.rst index 5f41bafed..bbeeb813a 100644 --- a/docs/Plugins.rst +++ b/docs/Plugins.rst @@ -392,6 +392,102 @@ Otherwise somewhat similar to `gui/quickcmd`. .. image:: images/command-prompt.png +.. _debug: + +debug +===== +Manager DFHack runtime debug prints. Debug prints are grouped by plugin name, +category name and print level. Levels are ``trace``, ``debug``, ``info``, +``warning`` and ``error``. + +The runtime message printing is controlled using filters. Filters set minimum +visible message to all matching categories. Matching uses regular expression +that allows listing multiple alternative matches or partial name matches. +Persistent filters are stored in ``dfhack-config/runtime-debug.json``. + +Oldest filters are applied first. That means a newer filter can override the +older printing level selection. + +Usage: ``debugfilter [subcommand] [parameters...]`` + +Following subcommands are supported. + +Regular expression syntax +------------------------- + +Syntax is C++ version of ECMA-262 grammar (Javascript regular expression). +Deails of differences can be found from +https://en.cppreference.com/w/cpp/regex/ecmascript + +help +---- +Give overall help or a detailed help for a subcommand. + +Usage: ``debugfilter help [subcommand]`` + +category +-------- +List available debug plugin and category names. + +Usage: ``debugfilter category [plugin regex] [category regex]`` + +The list can be filtered using optional regex parameters. If filters aren't +given then the it uses ``"."`` regex which matches any character. The regex +parameters are good way to test regex before passing them to ``set``. + +filter +------ +List active and passive debug print level changes. + +Usage: ``debugfilter filter [id]`` + +Optional ``id`` parameter is the id listed as first column in the filter list. +If id is given then the command shows information for the given filter only in +multi line format that is better format if filter has long regex. + +set +--- +Creates a new debug filter to set category printing levels. + +Usage: ``debugfilter set [level] [plugin regex] [category regex]`` + +Adds a filter that will be deleted when DF process exists or plugin is unloaded. + +Usage: ``debugfilter set persistent [level] [plugin regex] [category regex]`` + +Stores the filter in the configuration file to until ``unset`` is used to remove +it. + +Level is the minimum debug printing level to show in log. + +* ``trace``: Possibly very noisy messages which can be printed many times per second + +* ``debug``: Messages that happen often but they should happen only a couple of times per second + +* ``info``: Important state changes that happen rarely during normal execution + +* ``warining``: Enabled by default. Shows warnings about unexpected events which code managed to handle correctly. + +* ``error``: Enabled by default. Shows errors which code can't handle without user intervention. + +unset +----- +Delete a space separated list of filters + +Usage: ``debugfilter unset [id...]`` + +disable +------- +Disable a space separated list of filters but keep it in the filter list + +Usage: ``debugfilter disable [id...]`` + +enable +------ +Enable a space sperate list of filters + +Usage: ``debugfilter enable [id...]`` + .. _hotkeys: hotkeys diff --git a/docs/changelog.txt b/docs/changelog.txt index 083697b3b..3bf19b338 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -37,6 +37,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ================================================================================ # Future +## New Plugins +- `debug`: manages runtime debug print category filtering + ## Fixes - `fix/dead-units`: fixed script trying to use missing isDiplomat function @@ -56,6 +59,18 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - New functions: - ``Units::isDiplomat(unit)`` - Exposed ``Screen::zoom()`` to C++ (was Lua-only) +- New classes: + - ``Signal`` to C++ only + - ``DebugCategory`` to C++ only (used through new macros) + - ``DebugManager`` to C++ only +- New macros: + - ``DBG_DECLARE`` + - ``DBG_EXTERN`` + - ``TRACE`` + - ``DEBUG`` + - ``INFO`` + - ``WARN`` + - ``ERR`` ## Lua - ``gui.widgets``: ``List:setChoices`` clones ``choices`` for internal table changes From c127ceab964ac75745613dd24d0675ac9d20c825 Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 11:19:19 -0700 Subject: [PATCH 06/66] Use a unique_ptr for VersionInfo to avoid worrying about memory --- library/Process-darwin.cpp | 11 +++-------- library/Process-linux.cpp | 11 +++-------- library/Process-windows.cpp | 7 ++----- library/include/MemAccess.h | 5 +++-- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/library/Process-darwin.cpp b/library/Process-darwin.cpp index 2091d9a96..58e78d7ce 100644 --- a/library/Process-darwin.cpp +++ b/library/Process-darwin.cpp @@ -48,7 +48,7 @@ using namespace std; #include using namespace DFHack; -Process::Process(VersionInfoFactory * known_versions) +Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe(0) { int target_result; @@ -59,10 +59,6 @@ Process::Process(VersionInfoFactory * known_versions) real_path = realpath(path, NULL); } - identified = false; - my_descriptor = 0; - my_pe = 0; - md5wrapper md5; uint32_t length; uint8_t first_kb [1024]; @@ -73,7 +69,7 @@ Process::Process(VersionInfoFactory * known_versions) VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); if(vinfo) { - my_descriptor = new VersionInfo(*vinfo); + my_descriptor.reset(new VersionInfo(*vinfo)); identified = true; } else @@ -112,8 +108,7 @@ Process::Process(VersionInfoFactory * known_versions) Process::~Process() { - // destroy our copy of the memory descriptor - delete my_descriptor; + // Nothing to do here } string Process::doReadClassName (void * vptr) diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp index fa06d28e4..f18eff5f8 100644 --- a/library/Process-linux.cpp +++ b/library/Process-linux.cpp @@ -46,7 +46,7 @@ using namespace std; #include using namespace DFHack; -Process::Process(VersionInfoFactory * known_versions) +Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe(0) { const char * dir_name = "/proc/self/"; const char * exe_link_name = "/proc/self/exe"; @@ -54,10 +54,6 @@ Process::Process(VersionInfoFactory * known_versions) const char * cmdline_name = "/proc/self/cmdline"; int target_result; - identified = false; - my_descriptor = 0; - my_pe = 0; - // valgrind replaces readlink for /proc/self/exe, but not open. char self_exe[1024]; memset(self_exe, 0, sizeof(self_exe)); @@ -77,7 +73,7 @@ Process::Process(VersionInfoFactory * known_versions) VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); if(vinfo) { - my_descriptor = new VersionInfo(*vinfo); + my_descriptor.reset(new VersionInfo(*vinfo)); identified = true; } else @@ -116,8 +112,7 @@ Process::Process(VersionInfoFactory * known_versions) Process::~Process() { - // destroy our copy of the memory descriptor - delete my_descriptor; + // Nothing to do here } string Process::doReadClassName (void * vptr) diff --git a/library/Process-windows.cpp b/library/Process-windows.cpp index 3a1da0ac4..aa20ec8b8 100644 --- a/library/Process-windows.cpp +++ b/library/Process-windows.cpp @@ -62,13 +62,11 @@ namespace DFHack char * base; }; } -Process::Process(VersionInfoFactory * factory) +Process::Process(VersionInfoFactory * factory) : identified(false) { HMODULE hmod = NULL; DWORD needed; bool found = false; - identified = false; - my_descriptor = NULL; d = new PlatformSpecific(); // open process @@ -102,7 +100,7 @@ Process::Process(VersionInfoFactory * factory) { identified = true; // give the process a data model and memory layout fixed for the base of first module - my_descriptor = new VersionInfo(*vinfo); + my_descriptor.reset(new VersionInfo(*vinfo)); my_descriptor->rebaseTo(getBase()); } else @@ -115,7 +113,6 @@ Process::Process(VersionInfoFactory * factory) Process::~Process() { // destroy our rebased copy of the memory descriptor - delete my_descriptor; if(d->sections != NULL) free(d->sections); } diff --git a/library/include/MemAccess.h b/library/include/MemAccess.h index 3022688f9..da94e81df 100644 --- a/library/include/MemAccess.h +++ b/library/include/MemAccess.h @@ -33,6 +33,7 @@ distribution. #include #include #include +#include namespace DFHack { @@ -248,7 +249,7 @@ namespace DFHack /// get the symbol table extension of this process VersionInfo *getDescriptor() { - return my_descriptor; + return my_descriptor.get(); }; uintptr_t getBase(); /// get the DF Process ID @@ -291,7 +292,7 @@ namespace DFHack std::string getMD5() { return my_md5; } private: - VersionInfo * my_descriptor; + std::unique_ptr my_descriptor; PlatformSpecific *d; bool identified; uint32_t my_pid; From b5ddde8475ac08294cf133a6c7077aa03c323884 Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 11:34:12 -0700 Subject: [PATCH 07/66] Use a shared_ptr to avoid having to manage VersionInfo vector memory --- library/Process-darwin.cpp | 2 +- library/Process-linux.cpp | 2 +- library/Process-windows.cpp | 2 +- library/VersionInfoFactory.cpp | 17 ++++++----------- library/include/VersionInfoFactory.h | 8 +++++--- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/library/Process-darwin.cpp b/library/Process-darwin.cpp index 58e78d7ce..614432584 100644 --- a/library/Process-darwin.cpp +++ b/library/Process-darwin.cpp @@ -66,7 +66,7 @@ Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe // get hash of the running DF process my_md5 = md5.getHashFromFile(real_path, length, (char *) first_kb); // create linux process, add it to the vector - VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); + const VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); if(vinfo) { my_descriptor.reset(new VersionInfo(*vinfo)); diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp index f18eff5f8..37e55865e 100644 --- a/library/Process-linux.cpp +++ b/library/Process-linux.cpp @@ -70,7 +70,7 @@ Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe // get hash of the running DF process my_md5 = md5.getHashFromFile(self_exe_name, length, (char *) first_kb); // create linux process, add it to the vector - VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); + const VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); if(vinfo) { my_descriptor.reset(new VersionInfo(*vinfo)); diff --git a/library/Process-windows.cpp b/library/Process-windows.cpp index aa20ec8b8..a45afa619 100644 --- a/library/Process-windows.cpp +++ b/library/Process-windows.cpp @@ -95,7 +95,7 @@ Process::Process(VersionInfoFactory * factory) : identified(false) return; } my_pe = d->pe_header.FileHeader.TimeDateStamp; - VersionInfo* vinfo = factory->getVersionInfoByPETimestamp(my_pe); + const VersionInfo* vinfo = factory->getVersionInfoByPETimestamp(my_pe); if(vinfo) { identified = true; diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp index c895a1510..7a15a2d81 100644 --- a/library/VersionInfoFactory.cpp +++ b/library/VersionInfoFactory.cpp @@ -52,31 +52,26 @@ VersionInfoFactory::~VersionInfoFactory() void VersionInfoFactory::clear() { - // for each stored version, delete - for(size_t i = 0; i < versions.size();i++) - { - delete versions[i]; - } versions.clear(); error = false; } -VersionInfo * VersionInfoFactory::getVersionInfoByMD5(string hash) +const VersionInfo * VersionInfoFactory::getVersionInfoByMD5(string hash) { for(size_t i = 0; i < versions.size();i++) { if(versions[i]->hasMD5(hash)) - return versions[i]; + return versions[i].get(); } return 0; } -VersionInfo * VersionInfoFactory::getVersionInfoByPETimestamp(uintptr_t timestamp) +const VersionInfo * VersionInfoFactory::getVersionInfoByPETimestamp(uintptr_t timestamp) { for(size_t i = 0; i < versions.size();i++) { if(versions[i]->hasPE(timestamp)) - return versions[i]; + return versions[i].get(); } return 0; } @@ -230,8 +225,8 @@ bool VersionInfoFactory::loadFile(string path_to_xml) const char *name = pMemInfo->Attribute("name"); if(name) { - VersionInfo *version = new VersionInfo(); - ParseVersion( pMemInfo , version ); + auto version = std::make_shared(); + ParseVersion( pMemInfo , version.get() ); versions.push_back(version); } } diff --git a/library/include/VersionInfoFactory.h b/library/include/VersionInfoFactory.h index 8a2cabdc3..a03c11aa1 100644 --- a/library/include/VersionInfoFactory.h +++ b/library/include/VersionInfoFactory.h @@ -25,6 +25,8 @@ distribution. #pragma once +#include + #include "Pragma.h" #include "Export.h" @@ -39,9 +41,9 @@ namespace DFHack ~VersionInfoFactory(); bool loadFile( std::string path_to_xml); bool isInErrorState() const {return error;}; - VersionInfo * getVersionInfoByMD5(std::string md5string); - VersionInfo * getVersionInfoByPETimestamp(uintptr_t timestamp); - std::vector versions; + const VersionInfo * getVersionInfoByMD5(std::string md5string); + const VersionInfo * getVersionInfoByPETimestamp(uintptr_t timestamp); + std::vector> versions; // trash existing list void clear(); private: From 12c8046f90dd59ef7f5f54ec79bb856b1eb7d2c5 Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 12:04:53 -0700 Subject: [PATCH 08/66] Some memory management changes for Core --- library/Core.cpp | 16 +++++++--------- library/LuaApi.cpp | 4 ++-- library/include/Core.h | 5 +++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/library/Core.cpp b/library/Core.cpp index 69ef5a132..d4db9bb08 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -1518,7 +1518,7 @@ Core::~Core() } Core::Core() : - d{new Private}, + d(new Private), script_path_mutex{}, HotkeyMutex{}, HotkeyCond{}, @@ -1630,10 +1630,10 @@ bool Core::Init() fatal(out.str()); return false; } - p = new DFHack::Process(vif); - vinfo = p->getDescriptor(); + std::unique_ptr local_p(new DFHack::Process(vif)); + vinfo = local_p->getDescriptor(); - if(!vinfo || !p->isIdentified()) + if(!vinfo || !local_p->isIdentified()) { if (!Version::git_xml_match()) { @@ -1664,11 +1664,10 @@ bool Core::Init() fatal("Not a known DF version.\n"); } errorstate = true; - delete p; - p = NULL; return false; } cerr << "Version: " << vinfo->getVersion() << endl; + p = std::move(local_p); #if defined(_WIN32) const OSType expected = OS_WINDOWS; @@ -2321,8 +2320,7 @@ int Core::Shutdown ( void ) } allModules.clear(); memset(&(s_mods), 0, sizeof(s_mods)); - delete d; - d = nullptr; + d.reset(); return -1; } @@ -2751,7 +2749,7 @@ void ClassNameCheck::getKnownClassNames(std::vector &names) MemoryPatcher::MemoryPatcher(Process *p_) : p(p_) { if (!p) - p = Core::getInstance().p; + p = Core::getInstance().p.get(); } MemoryPatcher::~MemoryPatcher() diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index a435c7a8e..2840aa5b9 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -2521,7 +2521,7 @@ static const LuaWrapper::FunctionReg dfhack_internal_module[] = { static int internal_getmd5(lua_State *L) { - auto p = Core::getInstance().p; + auto& p = Core::getInstance().p; if (p->getDescriptor()->getOS() == OS_WINDOWS) luaL_error(L, "process MD5 not available on Windows"); lua_pushstring(L, p->getMD5().c_str()); @@ -2530,7 +2530,7 @@ static int internal_getmd5(lua_State *L) static int internal_getPE(lua_State *L) { - auto p = Core::getInstance().p; + auto& p = Core::getInstance().p; if (p->getDescriptor()->getOS() != OS_WINDOWS) luaL_error(L, "process PE timestamp not available on non-Windows"); lua_pushinteger(L, p->getPE()); diff --git a/library/include/Core.h b/library/include/Core.h index 529633ff2..9ea24f15a 100644 --- a/library/include/Core.h +++ b/library/include/Core.h @@ -30,6 +30,7 @@ distribution. #include #include #include +#include #include #include "Console.h" #include "modules/Graphic.h" @@ -191,7 +192,7 @@ namespace DFHack DFHack::Console &getConsole() { return con; } - DFHack::Process * p; + std::unique_ptr p; DFHack::VersionInfo * vinfo; DFHack::Windows::df_window * screen_window; @@ -209,7 +210,7 @@ namespace DFHack ~Core(); struct Private; - Private *d; + std::unique_ptr d; bool Init(); int Update (void); From 6cfd987c0d9bb4a36167e0a6fd9817f7478c9b79 Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 12:05:34 -0700 Subject: [PATCH 09/66] Remove an outdated comment, with c++11 enabled the code is thread safe --- library/include/Core.h | 1 - 1 file changed, 1 deletion(-) diff --git a/library/include/Core.h b/library/include/Core.h index 9ea24f15a..d83ee9aea 100644 --- a/library/include/Core.h +++ b/library/include/Core.h @@ -136,7 +136,6 @@ namespace DFHack /// Get the single Core instance or make one. static Core& getInstance() { - // FIXME: add critical section for thread safety here. static Core instance; return instance; } From 699f864110c17ecc0fde36474aa950f175e0f535 Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 16:10:01 -0700 Subject: [PATCH 10/66] use dts::make_unique instead of new --- library/Core.cpp | 3 ++- library/Process-darwin.cpp | 3 ++- library/Process-linux.cpp | 3 ++- library/Process-windows.cpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/library/Core.cpp b/library/Core.cpp index d4db9bb08..e18b03140 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -42,6 +42,7 @@ using namespace std; #include "Core.h" #include "DataDefs.h" #include "Console.h" +#include "MiscUtils.h" #include "Module.h" #include "VersionInfoFactory.h" #include "VersionInfo.h" @@ -1518,7 +1519,7 @@ Core::~Core() } Core::Core() : - d(new Private), + d(dts::make_unique()), script_path_mutex{}, HotkeyMutex{}, HotkeyCond{}, diff --git a/library/Process-darwin.cpp b/library/Process-darwin.cpp index 614432584..13657ca17 100644 --- a/library/Process-darwin.cpp +++ b/library/Process-darwin.cpp @@ -42,6 +42,7 @@ using namespace std; #include #include "MemAccess.h" #include "Memory.h" +#include "MiscUtils.h" #include "VersionInfoFactory.h" #include "VersionInfo.h" #include "Error.h" @@ -69,7 +70,7 @@ Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe const VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); if(vinfo) { - my_descriptor.reset(new VersionInfo(*vinfo)); + my_descriptor = dts::make_unique(*vinfo); identified = true; } else diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp index 37e55865e..c5dea6b46 100644 --- a/library/Process-linux.cpp +++ b/library/Process-linux.cpp @@ -40,6 +40,7 @@ using namespace std; #include #include "MemAccess.h" #include "Memory.h" +#include "MiscUtils.h" #include "VersionInfoFactory.h" #include "VersionInfo.h" #include "Error.h" @@ -73,7 +74,7 @@ Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe const VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); if(vinfo) { - my_descriptor.reset(new VersionInfo(*vinfo)); + my_descriptor = dts::make_unique(*vinfo); identified = true; } else diff --git a/library/Process-windows.cpp b/library/Process-windows.cpp index a45afa619..eee7c4feb 100644 --- a/library/Process-windows.cpp +++ b/library/Process-windows.cpp @@ -44,6 +44,7 @@ using namespace std; #include "Error.h" #include "MemAccess.h" #include "Memory.h" +#include "MiscUtils.h" using namespace DFHack; namespace DFHack { @@ -100,7 +101,7 @@ Process::Process(VersionInfoFactory * factory) : identified(false) { identified = true; // give the process a data model and memory layout fixed for the base of first module - my_descriptor.reset(new VersionInfo(*vinfo)); + my_descriptor = dts::make_unique(*vinfo); my_descriptor->rebaseTo(getBase()); } else From 6f90273bb6a81a5bb778c9d64a8a635dc8658ffe Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 15:50:14 -0700 Subject: [PATCH 11/66] More usage of smart pointers throughout core and version info. --- library/Core.cpp | 25 +++++-------------------- library/DataStatics.cpp | 2 +- library/Process-darwin.cpp | 7 +++---- library/Process-linux.cpp | 7 +++---- library/Process-windows.cpp | 7 +++---- library/VersionInfoFactory.cpp | 20 ++++++++++---------- library/include/Core.h | 4 ++-- library/include/MemAccess.h | 16 +++++++++++----- library/include/VersionInfo.h | 15 +++++++++++++++ library/include/VersionInfoFactory.h | 6 +++--- 10 files changed, 56 insertions(+), 53 deletions(-) diff --git a/library/Core.cpp b/library/Core.cpp index e18b03140..52705af1a 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -1532,10 +1532,7 @@ Core::Core() : { // init the console. This must be always the first step! plug_mgr = 0; - vif = 0; - p = 0; errorstate = false; - vinfo = 0; started = false; memset(&(s_mods), 0, sizeof(s_mods)); @@ -1614,24 +1611,24 @@ bool Core::Init() #else const char * path = "hack\\symbols.xml"; #endif - vif = new DFHack::VersionInfoFactory(); + auto local_vif = dts::make_unique(); cerr << "Identifying DF version.\n"; try { - vif->loadFile(path); + local_vif->loadFile(path); } catch(Error::All & err) { std::stringstream out; out << "Error while reading symbols.xml:\n"; out << err.what() << std::endl; - delete vif; - vif = NULL; errorstate = true; fatal(out.str()); return false; } - std::unique_ptr local_p(new DFHack::Process(vif)); + vif = std::move(local_vif); + auto local_p = dts::make_unique(*vif); + local_p->ValidateDescriptionOS(); vinfo = local_p->getDescriptor(); if(!vinfo || !local_p->isIdentified()) @@ -1670,18 +1667,6 @@ bool Core::Init() cerr << "Version: " << vinfo->getVersion() << endl; p = std::move(local_p); -#if defined(_WIN32) - const OSType expected = OS_WINDOWS; -#elif defined(_DARWIN) - const OSType expected = OS_APPLE; -#else - const OSType expected = OS_LINUX; -#endif - if (expected != vinfo->getOS()) { - cerr << "OS mismatch; resetting to " << int(expected) << endl; - vinfo->setOS(expected); - } - // Init global object pointers df::global::InitGlobals(); diff --git a/library/DataStatics.cpp b/library/DataStatics.cpp index 1e4b21be9..31c8c0200 100644 --- a/library/DataStatics.cpp +++ b/library/DataStatics.cpp @@ -17,7 +17,7 @@ namespace { } #define INIT_GLOBAL_FUNCTION_PREFIX \ - DFHack::VersionInfo *global_table_ = DFHack::Core::getInstance().vinfo; \ + DFHack::VersionInfo *global_table_ = DFHack::Core::getInstance().vinfo.get(); \ void * tmp_; #define INIT_GLOBAL_FUNCTION_ITEM(type,name) \ diff --git a/library/Process-darwin.cpp b/library/Process-darwin.cpp index 13657ca17..4e1abc108 100644 --- a/library/Process-darwin.cpp +++ b/library/Process-darwin.cpp @@ -42,14 +42,13 @@ using namespace std; #include #include "MemAccess.h" #include "Memory.h" -#include "MiscUtils.h" #include "VersionInfoFactory.h" #include "VersionInfo.h" #include "Error.h" #include using namespace DFHack; -Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe(0) +Process::Process(const VersionInfoFactory& known_versions) : identified(false), my_pe(0) { int target_result; @@ -67,10 +66,10 @@ Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe // get hash of the running DF process my_md5 = md5.getHashFromFile(real_path, length, (char *) first_kb); // create linux process, add it to the vector - const VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); + auto vinfo = known_versions.getVersionInfoByMD5(my_md5); if(vinfo) { - my_descriptor = dts::make_unique(*vinfo); + my_descriptor = std::make_shared(*vinfo); identified = true; } else diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp index c5dea6b46..a7f09a7f6 100644 --- a/library/Process-linux.cpp +++ b/library/Process-linux.cpp @@ -40,14 +40,13 @@ using namespace std; #include #include "MemAccess.h" #include "Memory.h" -#include "MiscUtils.h" #include "VersionInfoFactory.h" #include "VersionInfo.h" #include "Error.h" #include using namespace DFHack; -Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe(0) +Process::Process(const VersionInfoFactory& known_versions) : identified(false), my_pe(0) { const char * dir_name = "/proc/self/"; const char * exe_link_name = "/proc/self/exe"; @@ -71,10 +70,10 @@ Process::Process(VersionInfoFactory * known_versions) : identified(false), my_pe // get hash of the running DF process my_md5 = md5.getHashFromFile(self_exe_name, length, (char *) first_kb); // create linux process, add it to the vector - const VersionInfo * vinfo = known_versions->getVersionInfoByMD5(my_md5); + auto vinfo = known_versions.getVersionInfoByMD5(my_md5); if(vinfo) { - my_descriptor = dts::make_unique(*vinfo); + my_descriptor = std::make_shared(*vinfo); identified = true; } else diff --git a/library/Process-windows.cpp b/library/Process-windows.cpp index eee7c4feb..9e3b7d1fb 100644 --- a/library/Process-windows.cpp +++ b/library/Process-windows.cpp @@ -44,7 +44,6 @@ using namespace std; #include "Error.h" #include "MemAccess.h" #include "Memory.h" -#include "MiscUtils.h" using namespace DFHack; namespace DFHack { @@ -63,7 +62,7 @@ namespace DFHack char * base; }; } -Process::Process(VersionInfoFactory * factory) : identified(false) +Process::Process(const VersionInfoFactory& factory) : identified(false) { HMODULE hmod = NULL; DWORD needed; @@ -96,12 +95,12 @@ Process::Process(VersionInfoFactory * factory) : identified(false) return; } my_pe = d->pe_header.FileHeader.TimeDateStamp; - const VersionInfo* vinfo = factory->getVersionInfoByPETimestamp(my_pe); + auto vinfo = factory.getVersionInfoByPETimestamp(my_pe); if(vinfo) { identified = true; // give the process a data model and memory layout fixed for the base of first module - my_descriptor = dts::make_unique(*vinfo); + my_descriptor = std::make_shared(*vinfo); my_descriptor->rebaseTo(getBase()); } else diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp index 7a15a2d81..4202df5bb 100644 --- a/library/VersionInfoFactory.cpp +++ b/library/VersionInfoFactory.cpp @@ -56,24 +56,24 @@ void VersionInfoFactory::clear() error = false; } -const VersionInfo * VersionInfoFactory::getVersionInfoByMD5(string hash) +std::shared_ptr VersionInfoFactory::getVersionInfoByMD5(string hash) const { - for(size_t i = 0; i < versions.size();i++) + for (const auto& version : versions) { - if(versions[i]->hasMD5(hash)) - return versions[i].get(); + if(version->hasMD5(hash)) + return version; } - return 0; + return nullptr; } -const VersionInfo * VersionInfoFactory::getVersionInfoByPETimestamp(uintptr_t timestamp) +std::shared_ptr VersionInfoFactory::getVersionInfoByPETimestamp(uintptr_t timestamp) const { - for(size_t i = 0; i < versions.size();i++) + for (const auto& version : versions) { - if(versions[i]->hasPE(timestamp)) - return versions[i].get(); + if(version->hasPE(timestamp)) + return version; } - return 0; + return nullptr; } void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem) diff --git a/library/include/Core.h b/library/include/Core.h index d83ee9aea..8e70f928f 100644 --- a/library/include/Core.h +++ b/library/include/Core.h @@ -192,7 +192,7 @@ namespace DFHack DFHack::Console &getConsole() { return con; } std::unique_ptr p; - DFHack::VersionInfo * vinfo; + std::shared_ptr vinfo; DFHack::Windows::df_window * screen_window; static void print(const char *format, ...) Wformat(printf,1,2); @@ -235,7 +235,7 @@ namespace DFHack struct Cond; // FIXME: shouldn't be kept around like this - DFHack::VersionInfoFactory * vif; + std::unique_ptr vif; // Module storage struct { diff --git a/library/include/MemAccess.h b/library/include/MemAccess.h index da94e81df..7f3be74df 100644 --- a/library/include/MemAccess.h +++ b/library/include/MemAccess.h @@ -35,9 +35,10 @@ distribution. #include #include +#include "VersionInfo.h" + namespace DFHack { - struct VersionInfo; class Process; //class Window; class DFVector; @@ -79,7 +80,7 @@ namespace DFHack { public: /// this is the single most important destructor ever. ~px - Process(VersionInfoFactory * known_versions); + Process(const VersionInfoFactory& known_versions); ~Process(); /// read a 8-byte integer uint64_t readQuad(const void * address) @@ -247,10 +248,15 @@ namespace DFHack void getMemRanges(std::vector & ranges ); /// get the symbol table extension of this process - VersionInfo *getDescriptor() + std::shared_ptr getDescriptor() { - return my_descriptor.get(); + return my_descriptor; + }; + + void ValidateDescriptionOS() { + my_descriptor->ValidateOS(); }; + uintptr_t getBase(); /// get the DF Process ID int getPID(); @@ -292,7 +298,7 @@ namespace DFHack std::string getMD5() { return my_md5; } private: - std::unique_ptr my_descriptor; + std::shared_ptr my_descriptor; PlatformSpecific *d; bool identified; uint32_t my_pid; diff --git a/library/include/VersionInfo.h b/library/include/VersionInfo.h index dc959f1db..0d069c00c 100644 --- a/library/include/VersionInfo.h +++ b/library/include/VersionInfo.h @@ -26,6 +26,7 @@ distribution. #pragma once #include +#include #include #include #include @@ -169,5 +170,19 @@ namespace DFHack { return OS; }; + + void ValidateOS() { +#if defined(_WIN32) + const OSType expected = OS_WINDOWS; +#elif defined(_DARWIN) + const OSType expected = OS_APPLE; +#else + const OSType expected = OS_LINUX; +#endif + if (expected != getOS()) { + std::cerr << "OS mismatch; resetting to " << int(expected) << std::endl; + setOS(expected); + } + } }; } diff --git a/library/include/VersionInfoFactory.h b/library/include/VersionInfoFactory.h index a03c11aa1..a6b1a17d5 100644 --- a/library/include/VersionInfoFactory.h +++ b/library/include/VersionInfoFactory.h @@ -41,12 +41,12 @@ namespace DFHack ~VersionInfoFactory(); bool loadFile( std::string path_to_xml); bool isInErrorState() const {return error;}; - const VersionInfo * getVersionInfoByMD5(std::string md5string); - const VersionInfo * getVersionInfoByPETimestamp(uintptr_t timestamp); - std::vector> versions; + std::shared_ptr getVersionInfoByMD5(std::string md5string) const; + std::shared_ptr getVersionInfoByPETimestamp(uintptr_t timestamp) const; // trash existing list void clear(); private: + std::vector> versions; void ParseVersion (TiXmlElement* version, VersionInfo* mem); bool error; }; From 38cccdb0f42ad3228431b9f3d502c5c536a47c2e Mon Sep 17 00:00:00 2001 From: Stoyan Gaydarov Date: Sun, 8 Jul 2018 20:48:39 -0700 Subject: [PATCH 12/66] Update the module create calls to return unique_ptrs --- library/Core.cpp | 10 +++------- library/include/Core.h | 2 +- library/include/ModuleFactory.h | 10 +++++----- library/modules/Graphic.cpp | 5 +++-- library/modules/Materials.cpp | 5 ++--- library/modules/Notes.cpp | 5 +++-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/library/Core.cpp b/library/Core.cpp index 52705af1a..5eec30489 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -2300,10 +2300,6 @@ int Core::Shutdown ( void ) plug_mgr = 0; } // invalidate all modules - for(size_t i = 0 ; i < allModules.size(); i++) - { - delete allModules[i]; - } allModules.clear(); memset(&(s_mods), 0, sizeof(s_mods)); d.reset(); @@ -2826,9 +2822,9 @@ TYPE * Core::get##TYPE() \ if(errorstate) return NULL;\ if(!s_mods.p##TYPE)\ {\ - Module * mod = create##TYPE();\ - s_mods.p##TYPE = (TYPE *) mod;\ - allModules.push_back(mod);\ + std::unique_ptr mod = create##TYPE();\ + s_mods.p##TYPE = (TYPE *) mod.get();\ + allModules.push_back(std::move(mod));\ }\ return s_mods.p##TYPE;\ } diff --git a/library/include/Core.h b/library/include/Core.h index 8e70f928f..0fec2774d 100644 --- a/library/include/Core.h +++ b/library/include/Core.h @@ -243,7 +243,7 @@ namespace DFHack Notes * pNotes; Graphic * pGraphic; } s_mods; - std::vector allModules; + std::vector> allModules; DFHack::PluginManager * plug_mgr; std::vector script_paths[2]; diff --git a/library/include/ModuleFactory.h b/library/include/ModuleFactory.h index 87c9a726f..5c3c149a2 100644 --- a/library/include/ModuleFactory.h +++ b/library/include/ModuleFactory.h @@ -27,13 +27,13 @@ distribution. #ifndef MODULE_FACTORY_H_INCLUDED #define MODULE_FACTORY_H_INCLUDED +#include + namespace DFHack { class Module; - Module* createGui(); - Module* createWorld(); - Module* createMaterials(); - Module* createNotes(); - Module* createGraphic(); + std::unique_ptr createMaterials(); + std::unique_ptr createNotes(); + std::unique_ptr createGraphic(); } #endif diff --git a/library/modules/Graphic.cpp b/library/modules/Graphic.cpp index e965bc7e1..1d84926e3 100644 --- a/library/modules/Graphic.cpp +++ b/library/modules/Graphic.cpp @@ -36,14 +36,15 @@ using namespace std; #include "Error.h" #include "VersionInfo.h" #include "MemAccess.h" +#include "MiscUtils.h" #include "ModuleFactory.h" #include "Core.h" using namespace DFHack; -Module* DFHack::createGraphic() +std::unique_ptr DFHack::createGraphic() { - return new Graphic(); + return dts::make_unique(); } struct Graphic::Private diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp index a8f10d7d2..51d717d05 100644 --- a/library/modules/Materials.cpp +++ b/library/modules/Materials.cpp @@ -592,12 +592,11 @@ bool DFHack::isStoneInorganic(int material) return true; } -Module* DFHack::createMaterials() +std::unique_ptr DFHack::createMaterials() { - return new Materials(); + return dts::make_unique(); } - Materials::Materials() { } diff --git a/library/modules/Notes.cpp b/library/modules/Notes.cpp index b5215102f..04fb59e4d 100644 --- a/library/modules/Notes.cpp +++ b/library/modules/Notes.cpp @@ -33,6 +33,7 @@ using namespace std; #include "Types.h" #include "Error.h" #include "MemAccess.h" +#include "MiscUtils.h" #include "ModuleFactory.h" #include "Core.h" #include "modules/Notes.h" @@ -40,9 +41,9 @@ using namespace std; #include "df/ui.h" using namespace DFHack; -Module* DFHack::createNotes() +std::unique_ptr DFHack::createNotes() { - return new Notes(); + return dts::make_unique(); } // FIXME: not even a wrapper now From 143b557ad99a12a936f0c4595e149ca7ecedbb2b Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sun, 5 Aug 2018 17:10:41 +0200 Subject: [PATCH 13/66] Added embark-assistant world match indication --- docs/changelog.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index fd53e4f4c..17ed0c25f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -40,7 +40,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `building-hacks`: fixed error when dealing with custom animation tables - `devel/test-perlin`: fixed Lua error (``math.pow()``) -- `embark-assistant`: fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices +- `embark-assistant`: + - fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices + - added match indicator display on the right ("World") map - `labormanager`: - stopped assigning labors to ineligible dwarves, pets, etc. - stopped assigning invalid labors From 70630cfd923b3c01adcae0b5c3979507f0f18c5e Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sun, 5 Aug 2018 17:11:26 +0200 Subject: [PATCH 14/66] Added embark-assistant world match indication --- plugins/embark-assistant/embark-assistant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/embark-assistant/embark-assistant.cpp b/plugins/embark-assistant/embark-assistant.cpp index 728d96f58..cfd44a30b 100644 --- a/plugins/embark-assistant/embark-assistant.cpp +++ b/plugins/embark-assistant/embark-assistant.cpp @@ -143,7 +143,7 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector Date: Sun, 5 Aug 2018 17:11:39 +0200 Subject: [PATCH 15/66] Added embark-assistant world match indication --- plugins/embark-assistant/matcher.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp index 28c72b76f..b2509336b 100644 --- a/plugins/embark-assistant/matcher.cpp +++ b/plugins/embark-assistant/matcher.cpp @@ -1518,11 +1518,11 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter preliminary_matches = preliminary_world_match(survey_results, &iterator->finder, match_results); if (preliminary_matches == 0) { - out.printerr("matcher::find: Preliminarily matching world tiles: %i\n", preliminary_matches); + out.printerr("matcher::find: Preliminarily matching World Tiles: %i\n", preliminary_matches); return 0; } else { - out.print("matcher::find: Preliminarily matching world tiles: %i\n", preliminary_matches); + out.print("matcher::find: Preliminarily matching World Tiles: %i\n", preliminary_matches); } while (screen->location.region_pos.x != 0 || screen->location.region_pos.y != 0) { From f7fadaab377d1aab744a3327bc1359c383fdba05 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sun, 5 Aug 2018 17:11:47 +0200 Subject: [PATCH 16/66] Added embark-assistant world match indication --- plugins/embark-assistant/overlay.cpp | 62 ++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp index 19615cac5..c0f5e0c8c 100644 --- a/plugins/embark-assistant/overlay.cpp +++ b/plugins/embark-assistant/overlay.cpp @@ -48,7 +48,7 @@ namespace embark_assist { std::vector embark_info; - Screen::Pen region_match_grid[16][16]; + Screen::Pen local_match_grid[16][16]; pen_column *world_match_grid = nullptr; uint16_t match_count = 0; @@ -60,26 +60,38 @@ namespace embark_assist { //==================================================================== -/* // Attempt to replicate the DF logic for sizing the right world map. This - // code seems to compute the values correctly, but the author hasn't been - // able to apply them at the same time as DF does to 100%. - // DF seems to round down on 0.5 values. - df::coord2d world_dimension_size(uint16_t available_screen, uint16_t map_size) { + // Logic for sizing the World map to the right. + df::coord2d world_dimension_size(uint16_t available_screen, uint16_t map_size) { uint16_t result; for (uint16_t factor = 1; factor < 17; factor++) { - result = map_size / factor; - if ((map_size - result * factor) * 2 != factor) { - result = (map_size + factor / 2) / factor; - } + result = ceil (double (map_size - 1) / factor); if (result <= available_screen) { - return {result, factor}; + if (factor == 1 && + map_size <= available_screen) { + return{ uint16_t(result + 1), factor }; + } + else if ((map_size == 129 && // Weird exceptions where the last row/column goes unused. + (factor == 6 || + factor == 7)) || + (map_size == 257 && + (factor == 5 || + factor == 11 || + factor == 12 || + factor == 14 || + factor == 15))) { + return{ uint16_t(result - 1), factor }; + } + else + { + return{ result, factor }; + } } } return{16, 16}; // Should never get here. } -*/ + //==================================================================== class ViewscreenOverlay : public df::viewscreen_choose_start_sitest @@ -155,6 +167,7 @@ namespace embark_assist { Screen::Pen pen_lr(' ', COLOR_LIGHTRED); Screen::Pen pen_w(' ', COLOR_WHITE); + Screen::Pen pen_g(' ', COLOR_GREY); Screen::paintString(pen_lr, width - 28, 20, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_I).c_str(), false); Screen::paintString(pen_w, width - 27, 20, ": Embark Assistant Info", false); @@ -166,6 +179,7 @@ namespace embark_assist { Screen::paintString(pen_w, width - 27, 23, ": Quit Embark Assistant", false); Screen::paintString(pen_w, width - 28, 25, "Matching World Tiles:", false); Screen::paintString(empty_pen, width - 6, 25, to_string(state->match_count), false); + Screen::paintString(pen_g, width - 28, 26, "(Those on the Region Map)", false); if (height > 25) { // Mask the vanilla DF find help as it's overridden. Screen::paintString(pen_w, 50, height - 2, " ", false); @@ -221,13 +235,25 @@ namespace embark_assist { for (uint8_t i = 0; i < 16; i++) { for (uint8_t k = 0; k < 16; k++) { - if (state->region_match_grid[i][k].ch) { - Screen::paintTile(state->region_match_grid[i][k], i + 1, k + 2); + if (state->local_match_grid[i][k].ch) { + Screen::paintTile(state->local_match_grid[i][k], i + 1, k + 2); } } } -/* // Stuff for trying to replicate the DF right world map sizing logic. Close, but not there. + uint16_t l_width = width - 30 - (ceil(double_t(width) / 2) - 5) + 1; // Horizontal space available for world map. + uint16_t l_height = height - 8 - 2 + 1; // Vertical space available for world map. + df::coord2d size_factor_x = world_dimension_size(l_width, world->worldgen.worldgen_parms.dim_x); + df::coord2d size_factor_y = world_dimension_size(l_height, world->worldgen.worldgen_parms.dim_y); + + for (uint16_t i = 0; i < world->worldgen.worldgen_parms.dim_x; i++) { + for (uint16_t k = 0; k < world->worldgen.worldgen_parms.dim_y; k++) { + if (state->world_match_grid[i][k].ch) { + Screen::paintTile(state->world_match_grid[i][k], width / 2 - 5 + min(size_factor_x.x - 1, i / size_factor_x.y), 2 + min(size_factor_y.x - 1, k / size_factor_y.y)); + } + } + } + /* // Stuff for trying to replicate the DF right world map sizing logic. Close, but not there. Screen::Pen pen(' ', COLOR_YELLOW); // Boundaries of the top level world map Screen::paintString(pen, width / 2 - 5, 2, "X", false); // Marks UL corner of right world map. Constant @@ -390,11 +416,11 @@ void embark_assist::overlay::set_mid_level_tile_match(embark_assist::defs::mlt_m for (uint8_t i = 0; i < 16; i++) { for (uint8_t k = 0; k < 16; k++) { if (mlt_matches[i][k]) { - state->region_match_grid[i][k] = green_x_pen; + state->local_match_grid[i][k] = green_x_pen; } else { - state->region_match_grid[i][k] = empty_pen; + state->local_match_grid[i][k] = empty_pen; } } } @@ -411,7 +437,7 @@ void embark_assist::overlay::clear_match_results() { for (uint8_t i = 0; i < 16; i++) { for (uint8_t k = 0; k < 16; k++) { - state->region_match_grid[i][k] = empty_pen; + state->local_match_grid[i][k] = empty_pen; } } } From 136eb0f03a074b22fe6a01b14ddd829ebe4d2160 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sun, 5 Aug 2018 17:23:03 +0200 Subject: [PATCH 17/66] Added embark-assistant world match indication --- plugins/embark-assistant/help_ui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/embark-assistant/help_ui.cpp b/plugins/embark-assistant/help_ui.cpp index 7c0763a71..0eae32c6b 100644 --- a/plugins/embark-assistant/help_ui.cpp +++ b/plugins/embark-assistant/help_ui.cpp @@ -171,8 +171,8 @@ namespace embark_assist{ help_text.push_back("A list of all economic minerals present in the embark. Both clays and flux"); help_text.push_back("stones are economic, so they show up here as well."); help_text.push_back("In addition to the above, the Find functionality can also produce blinking"); - help_text.push_back("overlays over the region map and the middle world map to indicate where"); - help_text.push_back("matching embarks are found. The region display marks the top left corner of"); + help_text.push_back("overlays over the Local, Region, and World maps to indicate where"); + help_text.push_back("matching embarks are found. The Local display marks the top left corner of"); help_text.push_back("a matching embark rectangle as a matching tile."); break; @@ -264,7 +264,7 @@ namespace embark_assist{ help_text.push_back(" reaching caverns that have been removed at world gen to fail to be"); help_text.push_back(" generated at all. It's likely this bug also affects magma pools."); help_text.push_back(" This plugin does not address this but scripts can correct it."); - help_text.push_back("Version 0.5 2018-07-13"); + help_text.push_back("Version 0.6 2018-08-05"); break; } From aa6182a1eebfbc132ae0abfe0f1ee6aca9d7715c Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sun, 5 Aug 2018 17:28:49 +0200 Subject: [PATCH 18/66] Added embark-assistant world match indication --- plugins/embark-assistant/overlay.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp index c0f5e0c8c..bacd0b2d6 100644 --- a/plugins/embark-assistant/overlay.cpp +++ b/plugins/embark-assistant/overlay.cpp @@ -253,23 +253,6 @@ namespace embark_assist { } } } - /* // Stuff for trying to replicate the DF right world map sizing logic. Close, but not there. - Screen::Pen pen(' ', COLOR_YELLOW); - // Boundaries of the top level world map - Screen::paintString(pen, width / 2 - 5, 2, "X", false); // Marks UL corner of right world map. Constant -// Screen::paintString(pen, width - 30, 2, "X", false); // Marks UR corner of right world map area. -// Screen::paintString(pen, width / 2 - 5, height - 8, "X", false); // BL corner of right world map area. -// Screen::paintString(pen, width - 30, height - 8, "X", false); // BR corner of right world map area. - - uint16_t l_width = width - 30 - (width / 2 - 5) + 1; // Horizontal space available for right world map. - uint16_t l_height = height - 8 - 2 + 1; // Vertical space available for right world map. - df::coord2d size_factor_x = world_dimension_size(l_width, world->worldgen.worldgen_parms.dim_x); - df::coord2d size_factor_y = world_dimension_size(l_height, world->worldgen.worldgen_parms.dim_y); - - Screen::paintString(pen, width / 2 - 5 + size_factor_x.x - 1, 2, "X", false); - Screen::paintString(pen, width / 2 - 5, 2 + size_factor_y.x - 1, "X", false); - Screen::paintString(pen, width / 2 - 5 + size_factor_x.x - 1, 2 + size_factor_y.x - 1, "X", false); - */ } if (state->matching) { From c75a4fe8eebd3f8ef6b57f094e4c56c29f70eb9e Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Mon, 6 Aug 2018 11:52:22 +0200 Subject: [PATCH 19/66] Used taleden's world map size algorithm --- plugins/embark-assistant/overlay.cpp | 39 +++++----------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp index bacd0b2d6..63c70996c 100644 --- a/plugins/embark-assistant/overlay.cpp +++ b/plugins/embark-assistant/overlay.cpp @@ -61,35 +61,12 @@ namespace embark_assist { //==================================================================== // Logic for sizing the World map to the right. - df::coord2d world_dimension_size(uint16_t available_screen, uint16_t map_size) { - uint16_t result; + df::coord2d world_dimension_size(uint16_t map_size, uint16_t region_size) { + uint16_t factor = (map_size - 1 + region_size - 1) / region_size; + uint16_t result = (map_size + ((factor - 1) / 2)) / factor; + if (result > region_size) { result = region_size; } - for (uint16_t factor = 1; factor < 17; factor++) { - result = ceil (double (map_size - 1) / factor); - - if (result <= available_screen) { - if (factor == 1 && - map_size <= available_screen) { - return{ uint16_t(result + 1), factor }; - } - else if ((map_size == 129 && // Weird exceptions where the last row/column goes unused. - (factor == 6 || - factor == 7)) || - (map_size == 257 && - (factor == 5 || - factor == 11 || - factor == 12 || - factor == 14 || - factor == 15))) { - return{ uint16_t(result - 1), factor }; - } - else - { - return{ result, factor }; - } - } - } - return{16, 16}; // Should never get here. + return{ result, factor}; } //==================================================================== @@ -241,10 +218,8 @@ namespace embark_assist { } } - uint16_t l_width = width - 30 - (ceil(double_t(width) / 2) - 5) + 1; // Horizontal space available for world map. - uint16_t l_height = height - 8 - 2 + 1; // Vertical space available for world map. - df::coord2d size_factor_x = world_dimension_size(l_width, world->worldgen.worldgen_parms.dim_x); - df::coord2d size_factor_y = world_dimension_size(l_height, world->worldgen.worldgen_parms.dim_y); + df::coord2d size_factor_x = world_dimension_size(world->worldgen.worldgen_parms.dim_x, width / 2 - 24); + df::coord2d size_factor_y = world_dimension_size(world->worldgen.worldgen_parms.dim_y, height - 9); for (uint16_t i = 0; i < world->worldgen.worldgen_parms.dim_x; i++) { for (uint16_t k = 0; k < world->worldgen.worldgen_parms.dim_y; k++) { From 19a575df3ad11036dc6973c9fd5861af1eb5fa3c Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 9 Aug 2018 06:18:01 -0500 Subject: [PATCH 20/66] labormanager: assign more dwarves to cleaning I am fairly certain that Toady changed how cleaning jobs are spawned; this makes it so that cleaning actually happens with labormanager. --- plugins/labormanager/labormanager.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index 7e42afd64..5f0003b75 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -1911,6 +1911,11 @@ public: labors_changed = true; } } + else if (l == df::unit_labor::CLEAN && best_score < 0) + { + if (Units::isValidLabor((*bestdwarf)->dwarf, l)) + set_labor(*bestdwarf, l, true); + } else if ((*bestdwarf)->state == IDLE) { if (Units::isValidLabor((*bestdwarf)->dwarf, l)) @@ -1961,6 +1966,10 @@ public: { set_labor(*d, l, true); } + + if (score < 0) + set_labor(*d, df::unit_labor::CLEAN, true); + if ((*d)->using_labor != df::unit_labor::NONE && (score > current_score + 5000 || base_priority[(*d)->using_labor] < base_priority[l]) && default_labor_infos[(*d)->using_labor].tool == TOOL_NONE) @@ -1990,6 +1999,8 @@ public: set_labor(canary_dwarf, l, true); } + set_labor(canary_dwarf, df::unit_labor::CLEAN, true); + /* Also set the canary to remove constructions, because we have no way yet to tell if there are constructions needing removal */ set_labor(canary_dwarf, df::unit_labor::REMOVE_CONSTRUCTION, true); From 039fb3bc6b5e7e3431ec22bc2ff69722b86ebd27 Mon Sep 17 00:00:00 2001 From: billw2012 Date: Fri, 10 Aug 2018 20:42:34 +0100 Subject: [PATCH 21/66] labormanager: add option to disable the management of a labor. Also switching to case insensitive labor name matching. --- plugins/labormanager/labormanager.cpp | 67 +++++++++++++++++++-------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index 7e42afd64..55cbc8c0e 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -100,6 +100,11 @@ enum ConfigFlags { CF_ALLOW_HUNTING = 4, }; +// Value of 0 for max dwarfs means uncapped. +const int MAX_DWARFS_NONE = 0; +// Value < 0 for max dwarfs means don't manager the labor. +const int MAX_DWARFS_DISABLE = -1; + // Here go all the command declarations... // mostly to allow having the mandatory stuff on top of the file and commands on the bottom @@ -390,16 +395,18 @@ struct labor_info int idle_dwarfs; int busy_dwarfs; - int priority() { return config.ival(1); } + int priority() const { return config.ival(1); } void set_priority(int priority) { config.ival(1) = priority; } - int maximum_dwarfs() { return config.ival(2); } + bool is_disabled() const { return maximum_dwarfs() == MAX_DWARFS_DISABLE; } + int maximum_dwarfs() const { return config.ival(2); } void set_maximum_dwarfs(int maximum_dwarfs) { config.ival(2) = maximum_dwarfs; } - int time_since_last_assigned() + int time_since_last_assigned() const { return (*df::global::cur_year - config.ival(3)) * 403200 + *df::global::cur_year_tick - config.ival(4); } + void mark_assigned() { config.ival(3) = (*df::global::cur_year); config.ival(4) = (*df::global::cur_year_tick); @@ -412,7 +419,6 @@ enum tools_enum { TOOLS_MAX }; - struct labor_default { int priority; @@ -841,6 +847,8 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector \n" " Set max number of dwarves assigned to a labor.\n" + " labormanager max disable\n" + " Don't attempt to assign any dwarves to a labor.\n" " labormanager max none\n" " Unrestrict the number of dwarves assigned to a labor.\n" " labormanager priority \n" @@ -944,7 +952,7 @@ private: private: void set_labor(dwarf_info_t* dwarf, df::unit_labor labor, bool value) { - if (labor >= 0 && labor <= ENUM_LAST_ITEM(unit_labor)) + if (labor >= 0 && labor <= ENUM_LAST_ITEM(unit_labor) && !labor_infos[labor].is_disabled()) { if (!Units::isValidLabor(dwarf->dwarf, labor)) { @@ -954,7 +962,6 @@ private: ENUM_KEY_STR(unit_labor, labor).c_str()); return; } - bool old = dwarf->dwarf->status.labors[labor]; dwarf->dwarf->status.labors[labor] = value; if (old != value) @@ -1782,9 +1789,13 @@ public: if (l == df::unit_labor::NONE) continue; - if (labor_infos[l].maximum_dwarfs() > 0 && - i->second > labor_infos[l].maximum_dwarfs()) - i->second = labor_infos[l].maximum_dwarfs(); + const int user_specified_max_dwarfs = labor_infos[l].maximum_dwarfs(); + + // Allow values less than 0, they will disable this labor. + if (user_specified_max_dwarfs != MAX_DWARFS_NONE && i->second > user_specified_max_dwarfs) + { + i->second = user_specified_max_dwarfs; + } int priority = labor_infos[l].priority(); @@ -2172,25 +2183,41 @@ void print_labor(df::unit_labor labor, color_ostream &out) out << labor_name << ": "; for (int i = 0; i < 20 - (int)labor_name.length(); i++) out << ' '; - out << "priority " << labor_infos[labor].priority() - << ", maximum " << labor_infos[labor].maximum_dwarfs() - << ", currently " << labor_infos[labor].active_dwarfs << " dwarfs (" - << labor_infos[labor].busy_dwarfs << " busy, " - << labor_infos[labor].idle_dwarfs << " idle)" + const auto& labor_info = labor_infos[labor]; + if (labor_info.is_disabled()) + { + out << "DISABLED"; + } + else + { + out << "priority " << labor_info.priority(); + + if (labor_info.maximum_dwarfs() == MAX_DWARFS_NONE) + out << ", no maximum"; + else + out << ", maximum " << labor_info.maximum_dwarfs(); + } + + out << ", currently " << labor_info.active_dwarfs << " dwarfs (" + << labor_info.busy_dwarfs << " busy, " + << labor_info.idle_dwarfs << " idle)" << endl; } -df::unit_labor lookup_labor_by_name(std::string& name) +df::unit_labor lookup_labor_by_name(std::string name) { - df::unit_labor labor = df::unit_labor::NONE; + // We should accept incorrect casing, there is no ambiguity. + std::transform(name.begin(), name.end(), name.begin(), ::toupper); FOR_ENUM_ITEMS(unit_labor, test_labor) { if (name == ENUM_KEY_STR(unit_labor, test_labor)) - labor = test_labor; + { + return test_labor; + } } - return labor; + return df::unit_labor::NONE; } DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) @@ -2250,7 +2277,9 @@ command_result labormanager(color_ostream &out, std::vector & para int v; if (parameters[2] == "none") - v = 0; + v = MAX_DWARFS_NONE; + else if (parameters[2] == "disable") + v = MAX_DWARFS_DISABLE; else v = atoi(parameters[2].c_str()); From 76b8f4af0ed59ac486a55e1c9e9acb3ab2875e3a Mon Sep 17 00:00:00 2001 From: billw2012 Date: Fri, 10 Aug 2018 21:25:40 +0100 Subject: [PATCH 22/66] Fixing tab --- plugins/labormanager/labormanager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index 55cbc8c0e..d7a2f6f44 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -2197,8 +2197,7 @@ void print_labor(df::unit_labor labor, color_ostream &out) else out << ", maximum " << labor_info.maximum_dwarfs(); } - - out << ", currently " << labor_info.active_dwarfs << " dwarfs (" + out << ", currently " << labor_info.active_dwarfs << " dwarfs (" << labor_info.busy_dwarfs << " busy, " << labor_info.idle_dwarfs << " idle)" << endl; From a404ab3096e7fb981ee7fd92445f703c397eecac Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 16 Aug 2018 10:21:44 -0500 Subject: [PATCH 23/66] nestboxes: clean up & update description --- plugins/devel/nestboxes.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/devel/nestboxes.cpp b/plugins/devel/nestboxes.cpp index 634735f78..4276bef38 100644 --- a/plugins/devel/nestboxes.cpp +++ b/plugins/devel/nestboxes.cpp @@ -68,9 +68,11 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector & parameters) { CoreSuspender suspend; - bool clean = false; - int dump_count = 0; - int good_egg = 0; if (parameters.size() == 1) { if (parameters[0] == "enable") From c840321edf48c30721ea2eec6afb2a9372d5834f Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 16 Aug 2018 10:23:15 -0500 Subject: [PATCH 24/66] move nestboxes out of devel --- plugins/CMakeLists.txt | 1 + plugins/devel/CMakeLists.txt | 1 - plugins/{devel => }/nestboxes.cpp | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename plugins/{devel => }/nestboxes.cpp (100%) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 951a1d2d6..208da7125 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -138,6 +138,7 @@ if (BUILD_SUPPORTED) DFHACK_PLUGIN(misery misery.cpp) DFHACK_PLUGIN(mode mode.cpp) DFHACK_PLUGIN(mousequery mousequery.cpp) + DFHACK_PLUGIN(nestboxes nestboxes.cpp) DFHACK_PLUGIN(orders orders.cpp LINK_LIBRARIES jsoncpp_lib_static) DFHACK_PLUGIN(pathable pathable.cpp LINK_LIBRARIES lua) DFHACK_PLUGIN(petcapRemover petcapRemover.cpp) diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt index 4fb4b5cf5..9478ba805 100644 --- a/plugins/devel/CMakeLists.txt +++ b/plugins/devel/CMakeLists.txt @@ -11,7 +11,6 @@ DFHACK_PLUGIN(eventExample eventExample.cpp) DFHACK_PLUGIN(frozen frozen.cpp) DFHACK_PLUGIN(kittens kittens.cpp) DFHACK_PLUGIN(memview memview.cpp memutils.cpp LINK_LIBRARIES lua) -DFHACK_PLUGIN(nestboxes nestboxes.cpp) DFHACK_PLUGIN(notes notes.cpp) DFHACK_PLUGIN(onceExample onceExample.cpp) DFHACK_PLUGIN(renderer-msg renderer-msg.cpp) diff --git a/plugins/devel/nestboxes.cpp b/plugins/nestboxes.cpp similarity index 100% rename from plugins/devel/nestboxes.cpp rename to plugins/nestboxes.cpp From 750b3cb8850a3ce186666e0b57c4922387402d8c Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 16 Aug 2018 10:30:53 -0500 Subject: [PATCH 25/66] the tabmonster strikes again --- plugins/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 208da7125..0a21fc270 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -137,8 +137,8 @@ if (BUILD_SUPPORTED) DFHACK_PLUGIN(manipulator manipulator.cpp) DFHACK_PLUGIN(misery misery.cpp) DFHACK_PLUGIN(mode mode.cpp) - DFHACK_PLUGIN(mousequery mousequery.cpp) - DFHACK_PLUGIN(nestboxes nestboxes.cpp) + DFHACK_PLUGIN(mousequery mousequery.cpp) + DFHACK_PLUGIN(nestboxes nestboxes.cpp) DFHACK_PLUGIN(orders orders.cpp LINK_LIBRARIES jsoncpp_lib_static) DFHACK_PLUGIN(pathable pathable.cpp LINK_LIBRARIES lua) DFHACK_PLUGIN(petcapRemover petcapRemover.cpp) From 784c3b1590d7db8c43cb2445afcbe31bc4333a77 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 16 Aug 2018 10:32:50 -0500 Subject: [PATCH 26/66] a pox on invisible whitespace --- plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 0a21fc270..d0e7df34b 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -137,7 +137,7 @@ if (BUILD_SUPPORTED) DFHACK_PLUGIN(manipulator manipulator.cpp) DFHACK_PLUGIN(misery misery.cpp) DFHACK_PLUGIN(mode mode.cpp) - DFHACK_PLUGIN(mousequery mousequery.cpp) + DFHACK_PLUGIN(mousequery mousequery.cpp) DFHACK_PLUGIN(nestboxes nestboxes.cpp) DFHACK_PLUGIN(orders orders.cpp LINK_LIBRARIES jsoncpp_lib_static) DFHACK_PLUGIN(pathable pathable.cpp LINK_LIBRARIES lua) From 6275905644921414fd1997afbe6724fb2594a65c Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 16 Aug 2018 11:33:59 -0500 Subject: [PATCH 27/66] nestboxes: Use buildings.others[NEST_BOX] Should minimize performance impact (not that it was much before) --- plugins/nestboxes.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/nestboxes.cpp b/plugins/nestboxes.cpp index 4276bef38..b527322c2 100644 --- a/plugins/nestboxes.cpp +++ b/plugins/nestboxes.cpp @@ -8,6 +8,7 @@ #include "df/ui.h" #include "df/building_nest_boxst.h" #include "df/building_type.h" +#include "df/buildings_other_id.h" #include "df/global_objects.h" #include "df/item.h" #include "df/unit.h" @@ -37,7 +38,7 @@ static void eggscan(color_ostream &out) { CoreSuspender suspend; - for (df::building *build : world->buildings.all) + for (df::building *build : world->buildings.other[df::buildings_other_id::NEST_BOX]) { auto type = build->getType(); if (df::enums::building_type::NestBox == type) From 866379204144f3ac84fa59ad8e4612c9adaef56c Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sat, 18 Aug 2018 18:01:30 +0200 Subject: [PATCH 28/66] Made cancel state sensitive --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 17ed0c25f..d87131be7 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `embark-assistant`: - fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices - added match indicator display on the right ("World") map + - changed 'c'ancel to abort find if it's under way and clear results if not, allowing use of partial surveys. - `labormanager`: - stopped assigning labors to ineligible dwarves, pets, etc. - stopped assigning invalid labors From 2ed6469be8e4753c3c9fd8e58e8db0286b616fb8 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sat, 18 Aug 2018 18:02:19 +0200 Subject: [PATCH 29/66] Made cancel state sensitive --- plugins/embark-assistant/help_ui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/embark-assistant/help_ui.cpp b/plugins/embark-assistant/help_ui.cpp index 0eae32c6b..395cbc25f 100644 --- a/plugins/embark-assistant/help_ui.cpp +++ b/plugins/embark-assistant/help_ui.cpp @@ -127,8 +127,8 @@ namespace embark_assist{ help_text.push_back("Main screen control keys used by the Embark Assistant:"); help_text.push_back("i: Info/Help. Brings up this display."); help_text.push_back("f: Brings up the Find Embark screen. See the Find page for more information."); - help_text.push_back("c: Clears the results of a Find operation, and also cancels an operation if"); - help_text.push_back(" one is under way."); + help_text.push_back("c: Clears the results of a Find operation, or cancels an operation if one is"); + help_text.push_back(" under way (at which time a second 'c' clears it)."); help_text.push_back("q: Quits the Embark Assistant and brings you back to the vanilla DF interface."); help_text.push_back(" It can be noted that the Embark Assistant automatically cancels itself"); help_text.push_back(" when DF leaves the embark screen either through Abort Game or by"); @@ -264,7 +264,7 @@ namespace embark_assist{ help_text.push_back(" reaching caverns that have been removed at world gen to fail to be"); help_text.push_back(" generated at all. It's likely this bug also affects magma pools."); help_text.push_back(" This plugin does not address this but scripts can correct it."); - help_text.push_back("Version 0.6 2018-08-05"); + help_text.push_back("Version 0.7 2018-08-18"); break; } From 73e7ffff837d7339deb362098e24827946e38f6a Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sat, 18 Aug 2018 18:03:00 +0200 Subject: [PATCH 30/66] Made cancel state sensitive --- plugins/embark-assistant/overlay.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp index 63c70996c..75e6258a3 100644 --- a/plugins/embark-assistant/overlay.cpp +++ b/plugins/embark-assistant/overlay.cpp @@ -103,9 +103,13 @@ namespace embark_assist { state->embark_update(); } else if (input->count(df::interface_key::CUSTOM_C)) { - state->match_active = false; - state->matching = false; - state->clear_match_callback(); + if (state->matching) { + state->matching = false; + } + else { + state->match_active = false; + state->clear_match_callback(); + } } else if (input->count(df::interface_key::CUSTOM_F)) { if (!state->match_active && !state->matching) { From 239d4a8c466286b76f572cf96243f49d75866f8d Mon Sep 17 00:00:00 2001 From: billw2012 Date: Sun, 26 Aug 2018 13:38:03 +0100 Subject: [PATCH 31/66] Attempt to full exclude disabled labors from all relevant calculations. --- plugins/labormanager/labormanager.cpp | 127 +++++++++++++++----------- 1 file changed, 73 insertions(+), 54 deletions(-) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index d7a2f6f44..a3fd7db4a 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -1016,7 +1016,7 @@ private: df::unit_labor labor = labor_mapper->find_job_labor(j); - if (labor != df::unit_labor::NONE) + if (labor != df::unit_labor::NONE && !labor_infos[labor].is_disabled()) { labor_needed[labor]++; if (worker == -1) @@ -1143,7 +1143,7 @@ private: { df::item* item = *i; - if (item->flags.bits.dump) + if (item->flags.bits.dump && !labor_infos[df::unit_labor::HAUL_REFUSE].is_disabled()) labor_needed[df::unit_labor::HAUL_REFUSE]++; if (item->flags.whole & bad_flags.whole) @@ -1443,7 +1443,7 @@ private: FOR_ENUM_ITEMS(unit_labor, labor) { - if (labor == df::unit_labor::NONE) + if (labor == df::unit_labor::NONE || labor_infos[labor].is_disabled()) continue; df::job_skill skill = labor_to_skill[labor]; @@ -1463,7 +1463,7 @@ private: { FOR_ENUM_ITEMS(unit_labor, labor) { - if (labor == unit_labor::NONE) + if (labor == unit_labor::NONE || labor_infos[labor].is_disabled()) continue; if (Units::isValidLabor(dwarf->dwarf, labor)) set_labor(dwarf, labor, false); @@ -1707,67 +1707,79 @@ public: if (l == df::unit_labor::NONE) continue; - int before = labor_needed[l]; - - labor_needed[l] = max(0, labor_needed[l] - labor_in_use[l]); + if (!labor_infos[l].is_disabled()) + { + int before = labor_needed[l]; - if (default_labor_infos[l].tool != TOOL_NONE) - labor_needed[l] = std::min(labor_needed[l], tool_count[default_labor_infos[l].tool] - tool_in_use[default_labor_infos[l].tool]); + labor_needed[l] = max(0, labor_needed[l] - labor_in_use[l]); - if (print_debug && before != labor_needed[l]) - out.print("labor %s reduced from %d to %d\n", ENUM_KEY_STR(unit_labor, l).c_str(), before, labor_needed[l]); + if (default_labor_infos[l].tool != TOOL_NONE) + labor_needed[l] = std::min(labor_needed[l], tool_count[default_labor_infos[l].tool] - tool_in_use[default_labor_infos[l].tool]); + if (print_debug && before != labor_needed[l]) + out.print("labor %s reduced from %d to %d\n", ENUM_KEY_STR(unit_labor, l).c_str(), before, labor_needed[l]); + } + else + { + labor_needed[l] = 0; + } } /* assign food haulers for rotting food items */ - - if (priority_food > 0 && labor_infos[df::unit_labor::HAUL_FOOD].idle_dwarfs > 0) - priority_food = 1; - - if (print_debug) - out.print("priority food count = %d\n", priority_food); - - while (!available_dwarfs.empty() && priority_food > 0) + if (!labor_infos[df::unit_labor::HAUL_FOOD].is_disabled()) { - std::list::iterator bestdwarf = available_dwarfs.begin(); + if (priority_food > 0 && labor_infos[df::unit_labor::HAUL_FOOD].idle_dwarfs > 0) + priority_food = 1; - int best_score = INT_MIN; + if (print_debug) + out.print("priority food count = %d\n", priority_food); - for (std::list::iterator k = available_dwarfs.begin(); k != available_dwarfs.end(); k++) + while (!available_dwarfs.empty() && priority_food > 0) { - dwarf_info_t* d = (*k); + std::list::iterator bestdwarf = available_dwarfs.begin(); + + int best_score = INT_MIN; - if (Units::isValidLabor(d->dwarf, df::unit_labor::HAUL_FOOD)) + for (std::list::iterator k = available_dwarfs.begin(); k != available_dwarfs.end(); k++) { - int score = score_labor(d, df::unit_labor::HAUL_FOOD); + dwarf_info_t* d = (*k); - if (score > best_score) + if (Units::isValidLabor(d->dwarf, df::unit_labor::HAUL_FOOD)) { - bestdwarf = k; - best_score = score; + int score = score_labor(d, df::unit_labor::HAUL_FOOD); + + if (score > best_score) + { + bestdwarf = k; + best_score = score; + } } } - } - if (best_score > INT_MIN) - { - if (print_debug) - out.print("LABORMANAGER: assign \"%s\" labor %s score=%d (priority food)\n", (*bestdwarf)->dwarf->name.first_name.c_str(), ENUM_KEY_STR(unit_labor, df::unit_labor::HAUL_FOOD).c_str(), best_score); - - FOR_ENUM_ITEMS(unit_labor, l) + if (best_score > INT_MIN) { - if (l == df::unit_labor::NONE) - continue; - if (Units::isValidLabor((*bestdwarf)->dwarf, l)) - set_labor(*bestdwarf, l, l == df::unit_labor::HAUL_FOOD); + if (print_debug) + out.print("LABORMANAGER: assign \"%s\" labor %s score=%d (priority food)\n", (*bestdwarf)->dwarf->name.first_name.c_str(), ENUM_KEY_STR(unit_labor, df::unit_labor::HAUL_FOOD).c_str(), best_score); + + FOR_ENUM_ITEMS(unit_labor, l) + { + if (l == df::unit_labor::NONE) + continue; + if (Units::isValidLabor((*bestdwarf)->dwarf, l)) + set_labor(*bestdwarf, l, l == df::unit_labor::HAUL_FOOD); + } + + available_dwarfs.erase(bestdwarf); + priority_food--; } + else + break; - available_dwarfs.erase(bestdwarf); - priority_food--; } - else - break; - + } + else + { + priority_food = 0; } if (print_debug) @@ -1786,12 +1798,11 @@ public: for (auto i = labor_needed.begin(); i != labor_needed.end(); i++) { df::unit_labor l = i->first; - if (l == df::unit_labor::NONE) + if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) continue; const int user_specified_max_dwarfs = labor_infos[l].maximum_dwarfs(); - // Allow values less than 0, they will disable this labor. if (user_specified_max_dwarfs != MAX_DWARFS_NONE && i->second > user_specified_max_dwarfs) { i->second = user_specified_max_dwarfs; @@ -1951,7 +1962,7 @@ public: FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE) + if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) continue; if (l == (*d)->using_labor) continue; @@ -2002,12 +2013,17 @@ public: } /* Also set the canary to remove constructions, because we have no way yet to tell if there are constructions needing removal */ - - set_labor(canary_dwarf, df::unit_labor::REMOVE_CONSTRUCTION, true); + if (!labor_infos[df::unit_labor::REMOVE_CONSTRUCTION].is_disabled()) + { + set_labor(canary_dwarf, df::unit_labor::REMOVE_CONSTRUCTION, true); + } /* Set HAUL_WATER so we can detect ponds that need to be filled ponds. */ - set_labor(canary_dwarf, df::unit_labor::HAUL_WATER, true); + if (!labor_infos[df::unit_labor::HAUL_WATER].is_disabled()) + { + set_labor(canary_dwarf, df::unit_labor::HAUL_WATER, true); + } if (print_debug) out.print("Setting %s as the hauling canary\n", canary_dwarf->dwarf->name.first_name.c_str()); @@ -2027,7 +2043,7 @@ public: { FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE) + if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) continue; if (Units::isValidLabor((*d)->dwarf, l)) @@ -2059,13 +2075,16 @@ public: } } - set_labor(*d, df::unit_labor::PULL_LEVER, true); + if (!labor_infos[df::unit_labor::PULL_LEVER].is_disabled()) + { + set_labor(*d, df::unit_labor::PULL_LEVER, true); + } if (any) continue; FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE) + if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) continue; if (to_assign[l] > 0 || l == df::unit_labor::CLEAN) @@ -2086,7 +2105,7 @@ public: FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE) + if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) continue; tools_enum t = default_labor_infos[l].tool; From 0809de2d56ca68a2fe88c286fc8a54a6ced166b4 Mon Sep 17 00:00:00 2001 From: ImgBotApp Date: Thu, 30 Aug 2018 06:18:07 +0000 Subject: [PATCH 32/66] [ImgBot] optimizes images *Total -- 141.35kb -> 100.12kb (29.17%) /reversing/doc/building-facing/screw/4.png -- 2.68kb -> 1.46kb (45.67%) /reversing/doc/building-facing/screw/2-windows.png -- 4.59kb -> 2.54kb (44.59%) /docs/images/hotkeys.png -- 56.84kb -> 31.62kb (44.38%) /reversing/doc/building-facing/screw/3.png -- 2.62kb -> 1.48kb (43.58%) /reversing/doc/building-facing/screw/2.png -- 2.68kb -> 1.53kb (43.18%) /reversing/doc/building-facing/screw/1.png -- 2.66kb -> 1.56kb (41.58%) /reversing/doc/building-facing/horizontal_axle/1.png -- 2.74kb -> 1.62kb (40.83%) /reversing/doc/building-facing/horizontal_axle/2.png -- 2.78kb -> 1.66kb (40.32%) /reversing/doc/building-facing/waterwheel/linux.png -- 3.94kb -> 2.76kb (29.89%) /reversing/doc/building-facing/horizontal_axle/2-windows.png -- 14.74kb -> 12.88kb (12.63%) /reversing/doc/building-facing/bridge/linux1.png -- 13.42kb -> 11.85kb (11.7%) /reversing/doc/building-facing/bridge/windows.png -- 15.11kb -> 13.71kb (9.32%) /reversing/doc/building-facing/waterwheel/windows.png -- 16.52kb -> 15.46kb (6.45%) --- docs/images/hotkeys.png | Bin 58207 -> 32376 bytes .../doc/building-facing/bridge/linux1.png | Bin 13739 -> 12132 bytes .../doc/building-facing/bridge/windows.png | Bin 15477 -> 14034 bytes .../doc/building-facing/horizontal_axle/1.png | Bin 2802 -> 1658 bytes .../horizontal_axle/2-windows.png | Bin 15097 -> 13191 bytes .../doc/building-facing/horizontal_axle/2.png | Bin 2847 -> 1699 bytes reversing/doc/building-facing/screw/1.png | Bin 2727 -> 1593 bytes .../doc/building-facing/screw/2-windows.png | Bin 4703 -> 2606 bytes reversing/doc/building-facing/screw/2.png | Bin 2749 -> 1562 bytes reversing/doc/building-facing/screw/3.png | Bin 2687 -> 1516 bytes reversing/doc/building-facing/screw/4.png | Bin 2746 -> 1492 bytes .../doc/building-facing/waterwheel/linux.png | Bin 4038 -> 2831 bytes .../building-facing/waterwheel/windows.png | Bin 16920 -> 15829 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/images/hotkeys.png b/docs/images/hotkeys.png index bdf9c76b8187d9254c801da9314c1bd0a1da4f3b..524ce9a52f45de4e5dbdc7e0a9e0cf708ee928b3 100644 GIT binary patch literal 32376 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 literal 58207 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 diff --git a/reversing/doc/building-facing/bridge/linux1.png b/reversing/doc/building-facing/bridge/linux1.png index aef0ffb98d0a02af191417eb60b10d461da1009c..0bf3b669b25012ed2a49cc5e849e027d3e3f1eab 100644 GIT binary patch literal 12132 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 literal 13739 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 diff --git a/reversing/doc/building-facing/bridge/windows.png b/reversing/doc/building-facing/bridge/windows.png index 38adf3d41b6fd019b78df399985f239d2e6d5536..916e5e21cb4c8b8377630d72808db2e4e08d2351 100644 GIT binary patch literal 14034 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

mvR=u@ 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 literal 15477 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 Kxip>(&H5KHA6>5i diff --git a/reversing/doc/building-facing/horizontal_axle/2-windows.png b/reversing/doc/building-facing/horizontal_axle/2-windows.png index 905e98be0a02428d46ddfe4a63e3a60847ae4e57..18643992e00684e4a53ec58d8f84ccae891a2e1d 100644 GIT binary patch literal 13191 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 literal 15097 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%0A*31Jsolqm+vI%fLQ6Gz%x5lxPSQe=Fm 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 diff --git a/reversing/doc/building-facing/screw/1.png b/reversing/doc/building-facing/screw/1.png index 216f050da9547c660e8773e40d3020924a16780c..3d7dac56d2ccd0f6ca4db5b9516b00f271ec537b 100644 GIT binary patch delta 1568 zcmZ`(dpOg382>2?jgTBAqH}7NOSa$061f!R^s~-pQjE}k9CBGM$*4JHQ%M(DOhaom zXUNKZ6X|v;PB~donp;^zE~lDG#?DUtb^bWd_kF*g=Y8ML=lMSG`##UN+*GW8c6q$^ zLI40(1^Z@bKs(yY-wOb4oI$E05SrL}-*%Ee0MJnYkd+MpUp1+$5dcWV0Kix{0Js(b zfEkS|A-ZV_hQB~$pPU?~TCLVZ|2m+)|Ci*f2DKu0Y}=}(Uf|GwZnYT$&`I(0_tAN+ zyK0d!D!-Ap5&#fO{kD3M5A{xz#OL#^jXV{)vsuVC1ABs}>1Pk=Jh064b|#eKGGVnZ zs+WFSE6jXiW=8zcH!XnDG-upoHmGv45)^KpsMA3_xom;f$*R2+mu`YFj{J2hDJ$u5 zi6v7#+U4VB5-lF@nZN{f!c z=Ms@5Qis*@B?Z;nkE8M%zo=khn3{W5~Vt*k=r{ zrL4QfISms{d?J)fEK*%eHjZBloSI^GSliPU*w6+lpd;nbP-%T_m?nk4xn& z;YK^_Dhj8=+dVm5o&LoYko9^SoYw0Z`+$94Yo?X#uz`x={&u%oZJJtjYL7`?WZwf z0m$Z;g7K}q?D%4I>F70q>L3PNO+dA;`8J0tX#Tmqlol~*eX~lWEbzOCyMm z=EHaPz%lZiV7vY4xO4eY^ay>Ai*TgJdnYqd(ZKNN3H8$q4uvJ`X^lg!XT0^aZbc@X zg_A~6D2wN>+3%{V5Jy+H8YEOguT-)IIc0V{Jz`{S+5X$^#jq=WQxtnL(>Q?(lM-&# zydC#SLl(pl$8L(I8M{_wBM5`qgc_)9uAlDBaVnJmOhBK%WgwgXG_|r`M&L{?Y9tAo z+uWNmpU?H%9=ontMBCvqFs5wV+l#hRrX7AEELkB7=F};|X!T%UwLBJ<7|X&q3C}`c zqaX0UnKU^DqSkaM3&1|Rpc|AV5oAGKfK|57&^#S>A2Y>poTe8&U&Q3CC z1FZ@QFes0!Fce-YsHv{>*-%n$d%Xo|706+QLnE?|IueR47*8Q7wwp9sZrsWF(l~Ur z0AE5s%}aKaPX3Xu=%O&<3&#c)DtHa~fnT=AHq?kii}=K6?mZ%ICBu*#jcC*hdPBNk z33t7-KhIaz0fhCIY^n0b+uaKQg2g6!uK5vhJ!uJ%58K3HF`o;#trEkh>pya%xvPZr{ z8a`uP2YI;vGU4tV{ep0wG;Hz0WQa63>%p2uIvJzYV>2qE<|kd7;%LhHn<>QZS!RFRI5glOVfk0??hbKJ*TGwa?pYwjOspR>=|dw=`){l4#acB-el zqlTKU8UzB-aCWluhCmc7!DrgmEnpj>&C&;N+i*@OJor6z^HT7 zm@Rx8JAG8$z7Qpurio~_JM%unzuvaX8;@HiM`+zmol*P}KlHj)zClw+GR?To4}USL zw=d(o|BhZJhPD@6(9<9Zp4ci|Cd%aP+$@HhhGQNJh&fA=X##Ewqy%R2YWQH^vv>g zL{tiucBJ)DkZExl&~^lHHOdJ!k<^4dS&7^cL4ehS2lO!ot4_REU$~8|k#c}9?b!%g ziE^u*Ygr1tJII?}fA>z8z-i-6T*Do)lYNeC=w(b;{L)y*J7CG8#Fo-wbP-^t4$Tfcn!yuO#*>^KwHx+NSOK4J4##BWLYW zi(^^%BIZOcU%S?q4qM!FLF)76_!s#6V;9OiSje;xOGl^Z_vR^@EMjw}!x_U%`*!w! zdN$Cpntr}5jM1Hcwd2;qa%02T>YZ-r9zAqBe~=-o&|}-u-ICO2A|Rfs*;~pfE(-mp z${|nZ`Lo$y-d2gkx+|nc? zaMG43E`|X-k8tN|16Ib&;K1@W$71FM4j>9XjP3+tkv@RegBINvSEztT`tF{3(tu@@ zH{n}5Z7u%O>PV!ouIe75CF7vUGkO$nv1o_SEb+ldGX;8(uj0RUe@?ArhoSQCg1h`3 zN99;QcL1k^XsrAO)9%Q7C3d$(F!F*{wTe=hLD#Q(^;yr0XVQacyP01|ZsMPu2wp57 zKh8&InXe-m8Y=;TkHa*Y38W)Kc)6j2sie74SrKO8I*6KT&gcDdrz8{K&2`<1=-2Th z$!D(?Nvj;4kYoY_1CQ6ce}$^dB?WUW5NCuL1{fwXy}Pa3NV+$CCE2A1Cb0{;($gyl zQPa$&yhY=v3bIo)<~tnq(;&)N9n78fw1d8UFUlW29j#=|5!9Q_DHnFirB=mRA@%}R z*N594b=igiss-42+ozQZC-weE@SB-kD!__93VpJaFr_97zQK*j?!ph5M!8a9X~I03 zQiPwKaqNOQ_Znuec;sQcOef3(k28|<5M&rPsJ1mf2An=~G?}}A8^(pGa*%2h+XZuQ01&{V) zoBZ1B*D>F51o3~AT>-k$e8QZ(W?-OqbrUe$R06kM&1Ywr!M8qd?=7h>mLTCp|^{io9sugFfTF3oEcj55*2!p?a?>p6lg(EuTd+nS~q3I&iatwzJ5x`azWKeCN-I=)@Y-?hwgQ%HT-Cb4XG_1DqX<9nylKXL3x;me6vGO+Vt3zTx_SAc>19_0h-vLjz z93<`>`>Rso>Z{7pNb861R)t1Tiepo*hwL8nQS;lCrBcX$PAn4rWqaa`!U%mgc=Cie M+q>IQPX{Ic3Oc)51^@s6 diff --git a/reversing/doc/building-facing/screw/2-windows.png b/reversing/doc/building-facing/screw/2-windows.png index 26e41d32710ffce532a168ab2b34cb6b6d458df9..ff24bc91d820559166ef67eb22089e7f2a46a9b0 100644 GIT binary patch literal 2606 zcmZ`*c{tQtAOE@6(u9O0!d0$4j6nu1)@);miI^#2#u|nZsbmQ?vW^C0E2TjgF3Jqq zFVom6YDlh(vQCVP3M1a1``&-vKi=~^-{-rZ=X*ZqIiKecoE@!2_si}F06^5%#?l1< z_zXcg%Ks}EaqyW$fQsMW%)tx*{>T*G_7(trMPC~i2LQOC0s!$z0I&sy;^zV28WaE) zuK<8?J^)DLiki=#0uvI>2&5GtEe)Ex;7%Pgpaz%Ax%CJz#OGsgZ7Hx3w!i=#2+qa> z4~{|D6F%n$iOOJ5DALx!N@#kYf}pqxv8nVZSjKN_X@@-R9PKd3tDpC4~K=&T2= z{fpj}ps(N9Ql7%oc@~{_csO?RxZJ%7_pc`($|24g9-N(SqUilP!`g< zN->Es9z2u-?bem+{^`I(79~BokCS+2eBXSWf(aU83)WGNktxHg&)fC$bn@4T5W%_=kTJR0WCicX`0*s3mJWJ5PEi^E_k)lq%H;$7KW$Le7OjL$u?G+ip6gEy!IH$ zL3kx`P~>hhY%6AC6KP{` z^EO-k2CHsI!sJt43nAqV!>v6LqtPkO2m0Ebn_Rhf$zn_iAbV|mena~X?k2M=t81QrzXdt9R-mghrnUzmeeWFe)!nU=vxh zok139lSb9?LZ9ep81@M%AYDVa#9)}j_PY`?Rng< z_khzf%7j?i@L6pCe5rh#HB7YQ(mlyGHS)Qs^}ACrramw#+TSj$orAF8P6$n<5(9%! zWb`50?c0s3zYpL<7`Urg4KhL7PG!O$+c#h-tvqsltsY}8*Z+V_2#r7LivE?Tt|v)% zqVbnovm==L3>=v}pHc!Qq%=n^!<79VqbBL%G(IL+|7R5O?}32Rk7(B={NO3R@LYtU zrSOFw9b85;Uwh`2sr>JqxePh2wq(#Z@5mna?X@BsFe{Mb$CwY@_33CdG=jvV+~w3Sq&5S zYOtK~A>(DS3wlrzuMCecPtuQ+J-#&5QfLsEDe`d0c(y=w7D?pelkIBxtZ2H>xAZyJ zBEGI)FuX^1)L1vqgKU0vE6Cq|s!RG?mPO|CoY1OppHOX~Ax;5#AF3YE+a4veaA2T-LrD52Dvp1)1x}w90rHcgm z>rUm={(LIQcJSeykLuJcLGPQ@#gcfj?xjQSaNG|g2D&_^n&!j)2HCS7(_Wyj{`YB2 zc##mUIwSoRZHR59&7kV~pNCsweq#ia;Mktf%=NaF@ep zlkdsn_rPP|RORrQ$#E9zg@s|sabg(hMffabuB*K#%9L}MF;T<*H2(JclxzllfxZ&v zRk?ht^MPu2`{|_*$lTW{aXcT*qCVmtVH^oX!sw!rZ%&o!bJH{EC>M{Ek@FjV8_`;% zr>J`I#i?nN7;=<23#DP-glyhjzeP;wccVmT*hji}+&;F=v(f0!{DSRbB6H<-2KVL? ziM|A52c*;Ope__zQg4A9?G&W@!ftazFIxGCx;uKj=I#4FS&8%Xx_aMbn{@iABM=#M z8Lc8PBR(^sl9lh;ku8glfl9C#p3dkuJ}6W_u3mm8wyYPekoMr)#N}`UVG0K4Uyb%Vs2nALU%Nomm+}f;95K^s7x2rhG^&m&d9JE|a{GjTV+SgU{OP^-B zCw^%g-!lsv7M)q)8eQHHNXDco?w^}GIVed=&N*3OMHldtDi97hAFQBB%}!K5zdpR! zma6ng$*Ul|Dhdr%4r>!w|1#K6!m+1ZP+I6!cTl{?zGjLnP$J;&7e?10G_DP7>Tq&2 zW(cHPULKPCNVRZeU{GgzsR>bzVLwIWgAwbT3?5JD!}YIB7QC(DDFHDvCY3XTe`d0Ms(CgtKW={Z_Qr3qFel99Q2!2_ZiAiM9z;dc3A#e!~N-jP^i-v}(I02ovkt_6i_=|Pdulg7G+#(Ho~DAX7VEoX&j|4&0m7$(p! X=KnXa?!PC34S=ncqb1e+O5%S2iO$`W literal 4703 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 pGw{w`uu=Ip2hSh+n-UNxO+ z0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000b7OjJex|Nj600RI300093n zN=6I-0004EOGiWihy@);ks%j<00(qQO+^Rd2p$FzCX%NE`4G?Do1KzmIUaPvO$|DF)mw+*c87E6^5F9M3p$a$_&? za^*&a$j3M{=ktH01K~%w>F3UH$rfM<^Jd=ckb;^T3Q|?20-bKHU(xA*)*d{lDwTqI zxUAv%o?p>D0kauE1B=BXNf0TO0z{NCd5+du=A1ta7ceHzrBue`xro5ay@Sqx*=)XD zCM4U%q8V|9v_gK6$GD&G;98i?7K>)Ho6Y9UK1mRfI<4|NRVk9nDbD)VpW+IsPjSAp z8O&x2_M2qBTP&K*xH^-6L#Y&JUpBxYDq7u$Ym#I}h?7#8cW_F*f=jmZ?XuY=yLq!@ z*jZJjRl)ktI^Nkn*x8yo+}Txo@5gw;{RV>CH^*Z9U~IASiG{t!0r>6lg323V2CSZ{Td}-^AJWk&etc?|a<^f?6i8~{1YXpnK6(uGv}Z`=67bCfwHx3U)}5qN<`Qs6kc7V+>f&g=4&b8nV`jpcsmbV+EOGi{}C7 z;O!ziK9)HOYK%M&7>1tgrDOD+Zk=0w1a}nFXq1u)ky2p_`M3g39vY2;diEV=c9t_71@NluLM1$iO0r%uP?QmYlg8JO* z4hNk%d`~}o*`uI7hx3Qtc6je&L46hnPUC%crJ&R>g4_0Vnw4%RK~1kSgkc+!5DIQFvdWf0tQ?(W*|RQ zWrPxcRT)8R{kQdx=nU&0!I(5J_yd#k5RF3W(I}&!wqt@yjmbr+8j}lJXHU)@$ZU%{ zfH8R`r6Dh*j3&u5P7@Tzo-D14N-3r4qC)E|TeZEq(D+B zsxU!0+fPL{;l5l@-#^siRTOGXp7Ibi0%-r41cj7}N@1dDXre*Qi#Xhf`zDA|`8lp1 z2bZ1&bs6VJ+(VvXOs+80kv@GOsEatwG4dcLtAQ;r-oqYF#6UoWnz?}$ce2p~wG`ykMYRrpdYC53ulw_V0kQ1;X-&#BJ^%m!C3HntbYx+4WjbSWWnpw>05UK! zI4v+ZEi*7wFg7|dH###oD=;uRFfgaqZ7u)+03~!qSaf7zbY(hiZ)9m^c>ppnF*q$S nI4v_UR4_I=F*iChI4dwPIxsNSi`9}000000NkvXXu0mjfaqGcJ literal 2749 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 literal 2687 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 I&w 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 VJ3LS8zYID6&JO#C9K!L0e*lh+{Gb2; literal 4038 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 N7fmeAR~WfP{U6I|&a(gj diff --git a/reversing/doc/building-facing/waterwheel/windows.png b/reversing/doc/building-facing/waterwheel/windows.png index 8dbf1a4ce8e33a07719d6190b421b8cee146ad26..c29c082c54c379398ec41455e97d5adca5cf590a 100644 GIT binary patch literal 15829 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 H$p8NU(UOH3 From fefef2e121698fdb672a911cbffd7d13976fc3d8 Mon Sep 17 00:00:00 2001 From: billw2012 Date: Fri, 31 Aug 2018 20:53:06 +0100 Subject: [PATCH 33/66] Deprioritize dwarves with unmanged labors assigned, some renaming from disabled to unmanaged. --- plugins/labormanager/labormanager.cpp | 62 ++++++++++++++++----------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index a3fd7db4a..419432870 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -103,7 +103,7 @@ enum ConfigFlags { // Value of 0 for max dwarfs means uncapped. const int MAX_DWARFS_NONE = 0; // Value < 0 for max dwarfs means don't manager the labor. -const int MAX_DWARFS_DISABLE = -1; +const int MAX_DWARFS_UNMANAGED = -1; // Here go all the command declarations... @@ -398,7 +398,7 @@ struct labor_info int priority() const { return config.ival(1); } void set_priority(int priority) { config.ival(1) = priority; } - bool is_disabled() const { return maximum_dwarfs() == MAX_DWARFS_DISABLE; } + bool is_unmanaged() const { return maximum_dwarfs() == MAX_DWARFS_UNMANAGED; } int maximum_dwarfs() const { return config.ival(2); } void set_maximum_dwarfs(int maximum_dwarfs) { config.ival(2) = maximum_dwarfs; } @@ -530,10 +530,12 @@ struct dwarf_info_t bool has_children; bool armed; + int unmanaged_labors_assigned; + df::unit_labor using_labor; dwarf_info_t(df::unit* dw) : dwarf(dw), state(OTHER), - clear_all(false), high_skill(0), has_children(false), armed(false), using_labor(df::unit_labor::NONE) + clear_all(false), high_skill(0), has_children(false), armed(false), using_labor(df::unit_labor::NONE), unmanaged_labors_assigned(0) { for (int e = TOOL_NONE; e < TOOLS_MAX; e++) has_tool[e] = false; @@ -847,8 +849,11 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector \n" " Set max number of dwarves assigned to a labor.\n" + " labormanager max unmanaged\n" " labormanager max disable\n" - " Don't attempt to assign any dwarves to a labor.\n" + " Don't attempt to manage this labor.\n" + " Any dwarves with unmanaged labors assigned will be less\n" + " likely to have managed labors assigned to them.\n" " labormanager max none\n" " Unrestrict the number of dwarves assigned to a labor.\n" " labormanager priority \n" @@ -865,8 +870,8 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector = 0 && labor <= ENUM_LAST_ITEM(unit_labor) && !labor_infos[labor].is_disabled()) + if (labor >= 0 && labor <= ENUM_LAST_ITEM(unit_labor) && !labor_infos[labor].is_unmanaged()) { if (!Units::isValidLabor(dwarf->dwarf, labor)) { @@ -1016,7 +1021,7 @@ private: df::unit_labor labor = labor_mapper->find_job_labor(j); - if (labor != df::unit_labor::NONE && !labor_infos[labor].is_disabled()) + if (labor != df::unit_labor::NONE && !labor_infos[labor].is_unmanaged()) { labor_needed[labor]++; if (worker == -1) @@ -1143,7 +1148,7 @@ private: { df::item* item = *i; - if (item->flags.bits.dump && !labor_infos[df::unit_labor::HAUL_REFUSE].is_disabled()) + if (item->flags.bits.dump && !labor_infos[df::unit_labor::HAUL_REFUSE].is_unmanaged()) labor_needed[df::unit_labor::HAUL_REFUSE]++; if (item->flags.whole & bad_flags.whole) @@ -1389,6 +1394,8 @@ private: dwarf->state = state; + dwarf->unmanaged_labors_assigned = 0; + FOR_ENUM_ITEMS(unit_labor, l) { if (l == df::unit_labor::NONE) @@ -1396,6 +1403,8 @@ private: if (dwarf->dwarf->status.labors[l]) if (state == IDLE) labor_infos[l].idle_dwarfs++; + if (labor_infos[l].is_unmanaged()) + dwarf->unmanaged_labors_assigned++; } @@ -1443,7 +1452,7 @@ private: FOR_ENUM_ITEMS(unit_labor, labor) { - if (labor == df::unit_labor::NONE || labor_infos[labor].is_disabled()) + if (labor == df::unit_labor::NONE || labor_infos[labor].is_unmanaged()) continue; df::job_skill skill = labor_to_skill[labor]; @@ -1463,7 +1472,7 @@ private: { FOR_ENUM_ITEMS(unit_labor, labor) { - if (labor == unit_labor::NONE || labor_infos[labor].is_disabled()) + if (labor == unit_labor::NONE || labor_infos[labor].is_unmanaged()) continue; if (Units::isValidLabor(dwarf->dwarf, labor)) set_labor(dwarf, labor, false); @@ -1579,6 +1588,9 @@ private: score -= Units::computeMovementSpeed(d->dwarf); + // significantly disfavor dwarves who have unmanaged labors assigned + score -= 1000 * d->unmanaged_labors_assigned; + return score; } @@ -1707,7 +1719,7 @@ public: if (l == df::unit_labor::NONE) continue; - if (!labor_infos[l].is_disabled()) + if (!labor_infos[l].is_unmanaged()) { int before = labor_needed[l]; @@ -1726,7 +1738,7 @@ public: } /* assign food haulers for rotting food items */ - if (!labor_infos[df::unit_labor::HAUL_FOOD].is_disabled()) + if (!labor_infos[df::unit_labor::HAUL_FOOD].is_unmanaged()) { if (priority_food > 0 && labor_infos[df::unit_labor::HAUL_FOOD].idle_dwarfs > 0) priority_food = 1; @@ -1798,7 +1810,7 @@ public: for (auto i = labor_needed.begin(); i != labor_needed.end(); i++) { df::unit_labor l = i->first; - if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) + if (l == df::unit_labor::NONE || labor_infos[l].is_unmanaged()) continue; const int user_specified_max_dwarfs = labor_infos[l].maximum_dwarfs(); @@ -1962,7 +1974,7 @@ public: FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) + if (l == df::unit_labor::NONE || labor_infos[l].is_unmanaged()) continue; if (l == (*d)->using_labor) continue; @@ -2013,14 +2025,14 @@ public: } /* Also set the canary to remove constructions, because we have no way yet to tell if there are constructions needing removal */ - if (!labor_infos[df::unit_labor::REMOVE_CONSTRUCTION].is_disabled()) + if (!labor_infos[df::unit_labor::REMOVE_CONSTRUCTION].is_unmanaged()) { set_labor(canary_dwarf, df::unit_labor::REMOVE_CONSTRUCTION, true); } /* Set HAUL_WATER so we can detect ponds that need to be filled ponds. */ - if (!labor_infos[df::unit_labor::HAUL_WATER].is_disabled()) + if (!labor_infos[df::unit_labor::HAUL_WATER].is_unmanaged()) { set_labor(canary_dwarf, df::unit_labor::HAUL_WATER, true); } @@ -2043,7 +2055,7 @@ public: { FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) + if (l == df::unit_labor::NONE || labor_infos[l].is_unmanaged()) continue; if (Units::isValidLabor((*d)->dwarf, l)) @@ -2075,7 +2087,7 @@ public: } } - if (!labor_infos[df::unit_labor::PULL_LEVER].is_disabled()) + if (!labor_infos[df::unit_labor::PULL_LEVER].is_unmanaged()) { set_labor(*d, df::unit_labor::PULL_LEVER, true); } @@ -2084,7 +2096,7 @@ public: FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) + if (l == df::unit_labor::NONE || labor_infos[l].is_unmanaged()) continue; if (to_assign[l] > 0 || l == df::unit_labor::CLEAN) @@ -2105,7 +2117,7 @@ public: FOR_ENUM_ITEMS(unit_labor, l) { - if (l == df::unit_labor::NONE || labor_infos[l].is_disabled()) + if (l == df::unit_labor::NONE || labor_infos[l].is_unmanaged()) continue; tools_enum t = default_labor_infos[l].tool; @@ -2203,9 +2215,9 @@ void print_labor(df::unit_labor labor, color_ostream &out) for (int i = 0; i < 20 - (int)labor_name.length(); i++) out << ' '; const auto& labor_info = labor_infos[labor]; - if (labor_info.is_disabled()) + if (labor_info.is_unmanaged()) { - out << "DISABLED"; + out << "UNMANAGED"; } else { @@ -2296,8 +2308,8 @@ command_result labormanager(color_ostream &out, std::vector & para if (parameters[2] == "none") v = MAX_DWARFS_NONE; - else if (parameters[2] == "disable") - v = MAX_DWARFS_DISABLE; + else if (parameters[2] == "disable" || parameters[2] == "unmanaged") + v = MAX_DWARFS_UNMANAGED; else v = atoi(parameters[2].c_str()); From 368f8d05041d6253c1b12d4e62d532c8a308b487 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 24 Nov 2018 14:52:26 -0500 Subject: [PATCH 34/66] Remove and replace checks for OnBreak --- library/xml | 2 +- plugins/autohauler.cpp | 5 +---- plugins/autolabor.cpp | 10 +--------- plugins/dwarfmonitor.cpp | 10 +++++----- plugins/ruby/unit.rb | 4 ++-- plugins/search.cpp | 5 ++--- plugins/siege-engine.cpp | 2 +- scripts | 2 +- 8 files changed, 14 insertions(+), 26 deletions(-) diff --git a/library/xml b/library/xml index de83a453d..c588b17ed 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit de83a453d7e55aa48ffc92c8f4c147b1a1acd525 +Subproject commit c588b17edba27d4cada78bedf36ec45f427461a5 diff --git a/plugins/autohauler.cpp b/plugins/autohauler.cpp index c43ec110e..40d7452c7 100644 --- a/plugins/autohauler.cpp +++ b/plugins/autohauler.cpp @@ -879,11 +879,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out ) // Account for the military else if (ENUM_ATTR(profession, military, dwarfs[dwarf]->profession)) dwarf_info[dwarf].state = MILITARY; - // Account for dwarves on break or migrants - // DF leaves the OnBreak trait type on some dwarves while they're not actually on break - // Since they have no current job, they will default to IDLE + // Account for incoming migrants else if (is_migrant) - // Dwarf is unemployed with null job { dwarf_info[dwarf].state = OTHER; } diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp index 09a756642..0fb46a3b6 100644 --- a/plugins/autolabor.cpp +++ b/plugins/autolabor.cpp @@ -1202,14 +1202,6 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out ) for (int dwarf = 0; dwarf < n_dwarfs; dwarf++) { - bool is_on_break = false; - - for (auto p = dwarfs[dwarf]->status.misc_traits.begin(); p < dwarfs[dwarf]->status.misc_traits.end(); p++) - { - if ((*p)->id == misc_trait_type::Migrant || (*p)->id == misc_trait_type::OnBreak) - is_on_break = true; - } - if (Units::isBaby(dwarfs[dwarf]) || Units::isChild(dwarfs[dwarf]) || dwarfs[dwarf]->profession == profession::DRUNK) @@ -1220,7 +1212,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out ) dwarf_info[dwarf].state = MILITARY; else if (dwarfs[dwarf]->job.current_job == NULL) { - if (is_on_break) + if (Units::getMiscTrait(dwarfs[dwarf], misc_trait_type::Migrant)) dwarf_info[dwarf].state = OTHER; else if (dwarfs[dwarf]->specific_refs.size() > 0) dwarf_info[dwarf].state = OTHER; diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp index 471850025..29d0198b3 100644 --- a/plugins/dwarfmonitor.cpp +++ b/plugins/dwarfmonitor.cpp @@ -1742,11 +1742,11 @@ static void add_work_history(df::unit *unit, activity_type type) static bool is_at_leisure(df::unit *unit) { - for (auto p = unit->status.misc_traits.begin(); p < unit->status.misc_traits.end(); p++) - { - if ((*p)->id == misc_trait_type::Migrant || (*p)->id == misc_trait_type::OnBreak) - return true; - } + if (Units::getMiscTrait(unit, misc_trait_type::Migrant)) + return true; + + if (!unit->job.current_job && Units::getMainSocialActivity(unit)) + return true; return false; } diff --git a/plugins/ruby/unit.rb b/plugins/ruby/unit.rb index 13c01095d..848e0f471 100644 --- a/plugins/ruby/unit.rb +++ b/plugins/ruby/unit.rb @@ -252,8 +252,8 @@ module DFHack not u.specific_refs.find { |s| s.type == :ACTIVITY } and # filter soldiers (TODO check schedule) u.military.squad_id == -1 and - # filter 'on break' - not u.status.misc_traits.find { |t| t.id == :OnBreak } + # filter incoming migrants + not u.status.misc_traits.find { |t| t.id == :Migrant } end def unit_entitypositions(unit) diff --git a/plugins/search.cpp b/plugins/search.cpp index b43daa942..452e8cc23 100644 --- a/plugins/search.cpp +++ b/plugins/search.cpp @@ -1122,10 +1122,9 @@ private: return ""; for (auto p = unit->status.misc_traits.begin(); p < unit->status.misc_traits.end(); p++) { - if ((*p)->id == misc_trait_type::Migrant || (*p)->id == misc_trait_type::OnBreak) + if ((*p)->id == misc_trait_type::Migrant) { - int i = (*p)->value; - return ".on break"; + return ".new arrival.migrant"; } } diff --git a/plugins/siege-engine.cpp b/plugins/siege-engine.cpp index 3df9edf29..30a582c0d 100644 --- a/plugins/siege-engine.cpp +++ b/plugins/siege-engine.cpp @@ -1492,7 +1492,7 @@ static void releaseTiredWorker(EngineInfo *engine, df::job *job, df::unit *worke if (unit == worker || unit->job.current_job || !unit->status.labors[unit_labor::SIEGEOPERATE] || - !Units::isCitizen(unit) || Units::getMiscTrait(unit, misc_trait_type::OnBreak) || + !Units::isCitizen(unit) || Units::getMiscTrait(unit, misc_trait_type::Migrant) || isTired(unit) || !Maps::canWalkBetween(job->pos, unit->pos)) continue; diff --git a/scripts b/scripts index 87cc0fcad..7deb13c68 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 87cc0fcad57a3a8ff7b558be9f3523101ac2f69d +Subproject commit 7deb13c681b011d9a87782b9cdf9eec6e6acf7c1 From b913076451e886f69f06742ad66b1a90161cfb4b Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 24 Nov 2018 17:09:24 -0500 Subject: [PATCH 35/66] Update xml, stonesense, changelog Merged DFHack/df-structures#296 and (modified) attached changelog entry --- docs/changelog.txt | 11 +++++++++++ library/xml | 2 +- plugins/stonesense | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index fd53e4f4c..901ae8b67 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -63,6 +63,17 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Lua - ``utils``: new ``OrderedTable`` class +## Structures +- ``musical_form``: named voices field +- ``musical_form_instruments``: named minimum_required and maximum_permitted +- ``dance_form``: named musical_form_id and musical_written_content_id +- ``written_content``: named poetic_form +- ``activity_event_performancest``: renamed poem as written_content_id +- ``incident_sub6_performance``: made performance_event an enum +- ``incident_sub6_performance.participants``: named performance_event and role_index +- ``incident_sub6_performance``: named poetic_form_id, musical_form_id, and dance_form_id + + ================================================================================ # 0.44.12-r1 diff --git a/library/xml b/library/xml index c588b17ed..fa6e818b3 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit c588b17edba27d4cada78bedf36ec45f427461a5 +Subproject commit fa6e818b34235b9fe10abc37d06eba27a932c870 diff --git a/plugins/stonesense b/plugins/stonesense index 4a1953f27..4a0f63e04 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 4a1953f27c6acd1ceeb2d5447613c106e708c26c +Subproject commit 4a0f63e044d02532c948d67780dfd128fbd6d043 From 32aaa37070d88ed00e25371fc2e764d0c9c50233 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:54:28 +0100 Subject: [PATCH 36/66] Added coal search to embark-assistant --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index d87131be7..24120c2a2 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -44,6 +44,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices - added match indicator display on the right ("World") map - changed 'c'ancel to abort find if it's under way and clear results if not, allowing use of partial surveys. + - Added Coal as a search criterion, as well as a coal indication as current embark selection info. - `labormanager`: - stopped assigning labors to ineligible dwarves, pets, etc. - stopped assigning invalid labors From 5f6376e76e8c993f2df06bac274d1d9bffbc2638 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:55:16 +0100 Subject: [PATCH 37/66] Added coal search to embark-assistant --- plugins/embark-assistant/defs.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h index 43f2ddc0a..f7a9ed680 100644 --- a/plugins/embark-assistant/defs.h +++ b/plugins/embark-assistant/defs.h @@ -28,6 +28,7 @@ namespace embark_assist { bool clay = false; bool sand = false; bool flux = false; + bool coal = false; int8_t soil_depth; int8_t offset; int16_t elevation; @@ -51,6 +52,7 @@ namespace embark_assist { uint16_t clay_count = 0; uint16_t sand_count = 0; uint16_t flux_count = 0; + uint16_t coal_count = 0; uint8_t min_region_soil = 10; uint8_t max_region_soil = 0; bool waterfall = false; @@ -90,6 +92,7 @@ namespace embark_assist { bool clay_absent = true; bool sand_absent = true; bool flux_absent = true; + bool coal_absent = true; std::vector possible_metals; std::vector possible_economics; std::vector possible_minerals; @@ -113,6 +116,7 @@ namespace embark_assist { bool clay; bool sand; bool flux; + bool coal; std::vector metals; std::vector economics; std::vector minerals; @@ -253,6 +257,7 @@ namespace embark_assist { present_absent_ranges clay; present_absent_ranges sand; present_absent_ranges flux; + present_absent_ranges coal; soil_ranges soil_min; all_present_ranges soil_min_everywhere; soil_ranges soil_max; From efeb0504ccd112eb8fb9d19941560d183aa4d2d0 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:55:59 +0100 Subject: [PATCH 38/66] Added coal search to embark-assistant --- plugins/embark-assistant/finder_ui.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index 5578150ea..5c7cc9046 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -44,6 +44,7 @@ namespace embark_assist { clay, sand, flux, + coal, soil_min, soil_min_everywhere, soil_max, @@ -508,6 +509,7 @@ namespace embark_assist { case fields::clay: case fields::sand: case fields::flux: + case fields::coal: { embark_assist::defs::present_absent_ranges k = embark_assist::defs::present_absent_ranges::NA; while (true) { @@ -993,6 +995,10 @@ namespace embark_assist { state->finder_list.push_back({ "Flux", static_cast(i) }); break; + case fields::coal: + state->finder_list.push_back({ "Coal", static_cast(i) }); + break; + case fields::soil_min: state->finder_list.push_back({ "Min Soil", static_cast(i) }); break; @@ -1228,6 +1234,11 @@ namespace embark_assist { static_cast(state->ui[static_cast(i)]->current_value); break; + case fields::coal: + finder.coal = + static_cast(state->ui[static_cast(i)]->current_value); + break; + case fields::soil_min: finder.soil_min = static_cast(state->ui[static_cast(i)]->current_value); From 1ef7f0746caa76544ce7a5455c99b46e7db0a471 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:56:55 +0100 Subject: [PATCH 39/66] Added coal search to embark-assistant --- plugins/embark-assistant/help_ui.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/embark-assistant/help_ui.cpp b/plugins/embark-assistant/help_ui.cpp index 395cbc25f..e92ae67c0 100644 --- a/plugins/embark-assistant/help_ui.cpp +++ b/plugins/embark-assistant/help_ui.cpp @@ -257,14 +257,13 @@ namespace embark_assist{ help_text.push_back("- The geo information is gathered by code which is essentially a"); help_text.push_back(" copy of parts of prospector's code adapted for this plugin."); help_text.push_back("- Clay determination is made by finding the reaction MAKE_CLAY_BRICKS."); - help_text.push_back(" Flux determination is made by finding the reaction PIG_IRON_MAKING."); - help_text.push_back("- Right world map overlay not implemented as author has failed to"); - help_text.push_back(" emulate the sizing logic exactly."); + help_text.push_back("- Flux determination is made by finding the reaction PIG_IRON_MAKING."); + help_text.push_back("- Coal is detected by finding COAL producing reactions on minerals."); help_text.push_back("- There's currently a DF bug (#0010267) that causes adamantine spires"); help_text.push_back(" reaching caverns that have been removed at world gen to fail to be"); help_text.push_back(" generated at all. It's likely this bug also affects magma pools."); help_text.push_back(" This plugin does not address this but scripts can correct it."); - help_text.push_back("Version 0.7 2018-08-18"); + help_text.push_back("Version 0.8 2018-12-04"); break; } From 8f9cbfeafdf46a6bd2ff01e47dc8ffb5446a3b1c Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:57:23 +0100 Subject: [PATCH 40/66] Added coal search to embark-assistant --- plugins/embark-assistant/matcher.cpp | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp index b2509336b..7b3d385cb 100644 --- a/plugins/embark-assistant/matcher.cpp +++ b/plugins/embark-assistant/matcher.cpp @@ -46,6 +46,7 @@ namespace embark_assist { bool clay_found = false; bool sand_found = false; bool flux_found = false; + bool coal_found = false; uint8_t max_soil = 0; bool uneven = false; int16_t min_temperature = survey_results->at(x).at(y).min_temperature[mlt->at(start_x).at(start_y).biome_offset]; @@ -174,6 +175,12 @@ namespace embark_assist { flux_found = true; } + // Coal + if (mlt->at(i).at(k).coal) { + if (finder->coal == embark_assist::defs::present_absent_ranges::Absent) return false; + coal_found = true; + } + // Min Soil if (finder->soil_min != embark_assist::defs::soil_ranges::NA && mlt->at(i).at(k).soil_depth < static_cast(finder->soil_min) && @@ -335,6 +342,9 @@ namespace embark_assist { // Flux if (finder->flux == embark_assist::defs::present_absent_ranges::Present && !flux_found) return false; + // Coal + if (finder->coal == embark_assist::defs::present_absent_ranges::Present && !coal_found) return false; + // Min Soil if (finder->soil_min != embark_assist::defs::soil_ranges::NA && finder->soil_min_everywhere == embark_assist::defs::all_present_ranges::Present && @@ -571,6 +581,7 @@ namespace embark_assist { case embark_assist::defs::present_absent_ranges::Present: if (tile->clay_count == 0) return false; break; + case embark_assist::defs::present_absent_ranges::Absent: if (tile->clay_count > 256 - embark_size) return false; break; @@ -584,6 +595,7 @@ namespace embark_assist { case embark_assist::defs::present_absent_ranges::Present: if (tile->sand_count == 0) return false; break; + case embark_assist::defs::present_absent_ranges::Absent: if (tile->sand_count > 256 - embark_size) return false; break; @@ -597,11 +609,26 @@ namespace embark_assist { case embark_assist::defs::present_absent_ranges::Present: if (tile->flux_count == 0) return false; break; + case embark_assist::defs::present_absent_ranges::Absent: if (tile->flux_count > 256 - embark_size) return false; break; } + // Coal + switch (finder->coal) { + case embark_assist::defs::present_absent_ranges::NA: + break; // No restriction + + case embark_assist::defs::present_absent_ranges::Present: + if (tile->coal_count == 0) return false; + break; + + case embark_assist::defs::present_absent_ranges::Absent: + if (tile->coal_count > 256 - embark_size) return false; + break; + } + // Soil Min switch (finder->soil_min) { case embark_assist::defs::soil_ranges::NA: @@ -1027,6 +1054,7 @@ namespace embark_assist { case embark_assist::defs::present_absent_ranges::Present: if (tile->clay_count == 0) return false; break; + case embark_assist::defs::present_absent_ranges::Absent: if (tile->clay_count == 256) return false; break; @@ -1040,6 +1068,7 @@ namespace embark_assist { case embark_assist::defs::present_absent_ranges::Present: if (tile->sand_count == 0) return false; break; + case embark_assist::defs::present_absent_ranges::Absent: if (tile->sand_count == 256) return false; break; @@ -1053,11 +1082,26 @@ namespace embark_assist { case embark_assist::defs::present_absent_ranges::Present: if (tile->flux_count == 0) return false; break; + case embark_assist::defs::present_absent_ranges::Absent: if (tile->flux_count == 256) return false; break; } + // Coal + switch (finder->coal) { + case embark_assist::defs::present_absent_ranges::NA: + break; // No restriction + + case embark_assist::defs::present_absent_ranges::Present: + if (tile->coal_count == 0) return false; + break; + + case embark_assist::defs::present_absent_ranges::Absent: + if (tile->coal_count == 256) return false; + break; + } + // Soil Min switch (finder->soil_min) { case embark_assist::defs::soil_ranges::NA: From 0916d69373df6e02ef00cb11d427698e76d0f202 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:57:44 +0100 Subject: [PATCH 41/66] Added coal search to embark-assistant --- plugins/embark-assistant/overlay.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp index 75e6258a3..c25859ccb 100644 --- a/plugins/embark-assistant/overlay.cpp +++ b/plugins/embark-assistant/overlay.cpp @@ -339,6 +339,10 @@ void embark_assist::overlay::set_embark(embark_assist::defs::site_infos *site_in state->embark_info.push_back({ Screen::Pen(' ', COLOR_RED), "Clay" }); } + if (site_info->coal) { + state->embark_info.push_back({ Screen::Pen(' ', COLOR_GREY), "Coal" }); + } + state->embark_info.push_back({ Screen::Pen(' ', COLOR_BROWN), "Soil " + std::to_string(site_info->min_soil) + " - " + std::to_string(site_info->max_soil) }); if (site_info->flat) { From ef57295c028870ae9d4e1946bbdf869a314eb29e Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Tue, 4 Dec 2018 14:58:10 +0100 Subject: [PATCH 42/66] Added coal search to embark-assistant --- plugins/embark-assistant/survey.cpp | 60 +++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp index 4071d78b3..f19f3cd4a 100644 --- a/plugins/embark-assistant/survey.cpp +++ b/plugins/embark-assistant/survey.cpp @@ -10,6 +10,7 @@ #include "modules/Materials.h" #include "DataDefs.h" +#include "df/builtin_mats.h" #include "df/coord2d.h" #include "df/creature_interaction_effect.h" #include "df/creature_interaction_effect_display_symbolst.h" @@ -34,6 +35,9 @@ #include "df/interaction_target_materialst.h" #include "df/material_common.h" #include "df/reaction.h" +#include "df/reaction_product.h" +#include "df/reaction_product_itemst.h" +#include "df/reaction_product_type.h" #include "df/region_map_entry.h" #include "df/syndrome.h" #include "df/viewscreen.h" @@ -66,6 +70,7 @@ namespace embark_assist { struct states { uint16_t clay_reaction = -1; uint16_t flux_reaction = -1; + std::vector coals; uint16_t x; uint16_t y; uint8_t local_min_x; @@ -104,6 +109,19 @@ namespace embark_assist { out.printerr("The reaction 'PIG_IRON_MAKING' was not found, so flux can't be identified.\n"); } + for (uint16_t i = 0; i < world->raws.inorganics.size(); i++) { + for (uint16_t k = 0; k < world->raws.inorganics[i]->economic_uses.size(); k++) { + for (uint16_t l = 0; l < world->raws.reactions.reactions[world->raws.inorganics[i]->economic_uses[k]]->products.size(); l++) { + df::reaction_product_itemst *product = static_cast(world->raws.reactions.reactions[world->raws.inorganics[i]->economic_uses[k]]->products[l]); + + if (product->mat_type == df::builtin_mats::COAL) { + state->coals.push_back(i); + break; + } + } + } + } + for (uint16_t i = 0; i < world_data->geo_biomes.size(); i++) { geo_summary->at(i).possible_metals.resize(state->max_inorganic); geo_summary->at(i).possible_economics.resize(state->max_inorganic); @@ -154,6 +172,13 @@ namespace embark_assist { } } + for (uint16_t l = 0; l < state->coals.size(); l++) { + if (layer->mat_index == state->coals[l]) { + geo_summary->at(i).coal_absent = false; + break; + } + } + size = (uint16_t)layer->vein_mat.size(); for (uint16_t l = 0; l < size; l++) { @@ -176,6 +201,14 @@ namespace embark_assist { geo_summary->at(i).flux_absent = false; } } + + for (uint16_t m = 0; m < state->coals.size(); m++) { + if (vein== state->coals[m]) { + geo_summary->at(i).coal_absent = false; + break; + } + } + } } @@ -531,6 +564,7 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat results.clay_count = 0; results.sand_count = 0; results.flux_count = 0; + results.coal_count = 0; results.min_region_soil = 10; results.max_region_soil = 0; results.waterfall = false; @@ -576,6 +610,7 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat if (!geo_summary->at(geo_index).clay_absent) results.clay_count++; if (!geo_summary->at(geo_index).sand_absent) results.sand_count++; if (!geo_summary->at(geo_index).flux_absent) results.flux_count++; + if (!geo_summary->at(geo_index).coal_absent) results.coal_count++; if (geo_summary->at(geo_index).soil_size < results.min_region_soil) results.min_region_soil = geo_summary->at(geo_index).soil_size; @@ -614,6 +649,8 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat if (results.clay_count == offset_count) results.clay_count = 256; if (results.sand_count == offset_count) results.sand_count = 256; if (results.flux_count == offset_count) results.flux_count = 256; + if (results.coal_count == offset_count) results.coal_count = 256; + for (uint8_t l = 0; l < 3; l++) { if (results.savagery_count[l] == offset_count) results.savagery_count[l] = 256; if (results.evilness_count[l] == offset_count) results.evilness_count[l] = 256; @@ -776,6 +813,8 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data mlt->at(i).at(k).clay = false; mlt->at(i).at(k).sand = false; mlt->at(i).at(k).flux = false; + mlt->at(i).at(k).coal = false; + if (max_soil_depth == 0) { mlt->at(i).at(k).soil_depth = 0; } @@ -869,6 +908,13 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data mlt->at(i).at(k).flux = true; } } + + for (uint16_t m = 0; m < state->coals.size(); m++) { + if (layer->mat_index == state->coals [m]) { + mlt->at(i).at(k).coal = true; + break; + } + } } end_check_m = static_cast(layer->vein_mat.size()); @@ -895,6 +941,13 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data mlt->at(i).at(k).flux = true; } } + + for (uint16_t n = 0; n < state->coals.size(); n++) { + if (layer->vein_mat [m] == state->coals[n]) { + mlt->at(i).at(k).coal = true; + break; + } + } } } @@ -911,6 +964,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data survey_results->at(x).at(y).clay_count = 0; survey_results->at(x).at(y).sand_count = 0; survey_results->at(x).at(y).flux_count = 0; + survey_results->at(x).at(y).coal_count = 0; survey_results->at(x).at(y).min_region_soil = 10; survey_results->at(x).at(y).max_region_soil = 0; survey_results->at(x).at(y).savagery_count[0] = 0; @@ -929,6 +983,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data if (mlt->at(i).at(k).clay) { survey_results->at(x).at(y).clay_count++; } if (mlt->at(i).at(k).sand) { survey_results->at(x).at(y).sand_count++; } if (mlt->at(i).at(k).flux) { survey_results->at(x).at(y).flux_count++; } + if (mlt->at(i).at(k).coal) { survey_results->at(x).at(y).coal_count++; } if (mlt->at(i).at(k).soil_depth < survey_results->at(x).at(y).min_region_soil) { survey_results->at(x).at(y).min_region_soil = mlt->at(i).at(k).soil_depth; @@ -1170,6 +1225,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles * site_info->clay = false; site_info->sand = false; site_info->flux = false; + site_info->coal = false; site_info->metals.clear(); site_info->economics.clear(); site_info->metals.clear(); @@ -1222,6 +1278,10 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles * site_info->flux = true; } + if (mlt->at(i).at(k).coal) { + site_info->coal = true; + } + for (uint16_t l = 0; l < state->max_inorganic; l++) { metals[l] = metals[l] || mlt->at(i).at(k).metals[l]; economics[l] = economics[l] || mlt->at(i).at(k).economics[l]; From dfbb2416d9c5f0964202564d6abe0f30a076390f Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 20 Dec 2018 21:29:48 -0500 Subject: [PATCH 43/66] Update docs for nestboxes (#1395) --- docs/Plugins.rst | 8 ++++++++ docs/changelog.txt | 3 +++ 2 files changed, 11 insertions(+) diff --git a/docs/Plugins.rst b/docs/Plugins.rst index 62ddf29e6..ee2c56e02 100644 --- a/docs/Plugins.rst +++ b/docs/Plugins.rst @@ -1728,6 +1728,14 @@ Subcommands: :import NAME: Imports manager orders from a file named ``dfhack-config/orders/NAME.json``. :clear: Deletes all manager orders in the current embark. +.. _nestboxes: + +nestboxes +========= + +Automatically scan for and forbid fertile eggs incubating in a nestbox. +Toggle status with `enable` or `disable`. + ================ Map modification ================ diff --git a/docs/changelog.txt b/docs/changelog.txt index 901ae8b67..586d21311 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -37,6 +37,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ================================================================================ # Future +## New Plugins +- `nestboxes`: automatically scan for and forbid fertile eggs incubating in a nestbox + ## Fixes - `building-hacks`: fixed error when dealing with custom animation tables - `devel/test-perlin`: fixed Lua error (``math.pow()``) From 0ccfc8be35aec38313932f6967bc4cd4806c4b60 Mon Sep 17 00:00:00 2001 From: Lethosor Date: Thu, 27 Dec 2018 16:21:24 -0500 Subject: [PATCH 44/66] Fix a few typos in docs and reorganize a bit --- docs/Plugins.rst | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/Plugins.rst b/docs/Plugins.rst index bbeeb813a..6eb6326bb 100644 --- a/docs/Plugins.rst +++ b/docs/Plugins.rst @@ -396,28 +396,24 @@ Otherwise somewhat similar to `gui/quickcmd`. debug ===== -Manager DFHack runtime debug prints. Debug prints are grouped by plugin name, +Manager for DFHack runtime debug prints. Debug prints are grouped by plugin name, category name and print level. Levels are ``trace``, ``debug``, ``info``, ``warning`` and ``error``. -The runtime message printing is controlled using filters. Filters set minimum -visible message to all matching categories. Matching uses regular expression -that allows listing multiple alternative matches or partial name matches. -Persistent filters are stored in ``dfhack-config/runtime-debug.json``. +The runtime message printing is controlled using filters. Filters set the +visible messages of all matching categories. Matching uses regular expression syntax, +which allows listing multiple alternative matches or partial name matches. +This syntax is a C++ version of the ECMA-262 grammar (Javascript regular expressions). +Details of differences can be found at +https://en.cppreference.com/w/cpp/regex/ecmascript +Persistent filters are stored in ``dfhack-config/runtime-debug.json``. Oldest filters are applied first. That means a newer filter can override the older printing level selection. Usage: ``debugfilter [subcommand] [parameters...]`` -Following subcommands are supported. - -Regular expression syntax -------------------------- - -Syntax is C++ version of ECMA-262 grammar (Javascript regular expression). -Deails of differences can be found from -https://en.cppreference.com/w/cpp/regex/ecmascript +The following subcommands are supported: help ---- @@ -466,7 +462,7 @@ Level is the minimum debug printing level to show in log. * ``info``: Important state changes that happen rarely during normal execution -* ``warining``: Enabled by default. Shows warnings about unexpected events which code managed to handle correctly. +* ``warning``: Enabled by default. Shows warnings about unexpected events which code managed to handle correctly. * ``error``: Enabled by default. Shows errors which code can't handle without user intervention. From 32edeffc3fec6a04ec45b75fe9540e4c4970c576 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 27 Dec 2018 16:31:57 -0500 Subject: [PATCH 45/66] Remove unused find_package(Threads) --- plugins/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 6eb4ae6ff..284922cc1 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,7 +1,5 @@ INCLUDE(Plugins.cmake) -find_package(Threads) - OPTION(BUILD_STONESENSE "Build stonesense (needs a checkout first)." OFF) if(BUILD_STONESENSE) add_subdirectory (stonesense) From e74946f62e7a0f7509a4c4a76bc9a3b7ca79cc79 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 27 Dec 2018 17:37:13 -0500 Subject: [PATCH 46/66] Update xml and related changelog entries --- docs/changelog.txt | 37 ++++++++++++++++++++++++++++++++----- library/xml | 2 +- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 380636198..d6853be31 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -45,12 +45,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `building-hacks`: fixed error when dealing with custom animation tables - `devel/test-perlin`: fixed Lua error (``math.pow()``) - `embark-assistant`: fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices +- `embark-skills`: fixed missing ``skill_points_remaining`` field - `labormanager`: - stopped assigning labors to ineligible dwarves, pets, etc. - stopped assigning invalid labors - added support for crafting jobs that use pearl - `prospector`: (also affected `embark-tools`) - fixed a crash when prospecting an unusable site (ocean, mountains, etc.) with a large default embark size in d_init.txt (e.g. 16x16) - `siege-engine`: fixed a few Lua errors (``math.pow()``, ``unit.relationship_ids``) +- `tweak`: fixed ``hotkey-clear`` ## Misc Improvements - `devel/export-dt-ini`: added viewscreen offsets for DT 40.1.2 @@ -72,14 +74,39 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - ``utils``: new ``OrderedTable`` class ## Structures -- ``musical_form``: named voices field -- ``musical_form_instruments``: named minimum_required and maximum_permitted -- ``dance_form``: named musical_form_id and musical_written_content_id -- ``written_content``: named poetic_form +- Win32: added missing vtables for ``viewscreen_storesst`` and ``squad_order_rescue_hfst`` - ``activity_event_performancest``: renamed poem as written_content_id -- ``incident_sub6_performance``: made performance_event an enum +- ``dance_form``: named musical_form_id and musical_written_content_id - ``incident_sub6_performance.participants``: named performance_event and role_index +- ``incident_sub6_performance``: made performance_event an enum - ``incident_sub6_performance``: named poetic_form_id, musical_form_id, and dance_form_id +- ``musical_form_instruments``: named minimum_required and maximum_permitted +- ``musical_form``: named voices field +- ``poetic_form``: identified many fields and related enum/bitfield types +- ``setup_character_info``: identified ``skill_points_remaining`` (for `embark-skills`) +- ``unit_thought_type``: added new expulsion thoughts from 0.44.12 +- ``viewscreen_layer_militaryst``: identified ``equip.assigned.assigned_items`` +- ``world_data``: added ``mountain_peak_flags`` type, including ``is_volcano`` +- ``written_content``: named poetic_form +- ``unit_action.attack``: identified ``attack_skill`` +- ``unit_action.attack``: added ``lightly_tap`` and ``spar_report`` flags +- ``misc_trait_type``: removed ``LikesOutdoors``, ``Hardened``, ``TimeSinceBreak``, ``OnBreak`` (all unused by DF) +- ``unit_personality``: identified ``stress_drain``, ``stress_boost``, ``likes_outdoors``, ``combat_hardened`` +- ``plant_tree_tile``: gave connection bits more meaningful names (e.g. ``connection_east`` instead of ``thick_branches_1``) +- ``plant_tree_info``: identified ``extent_east``, etc. +- ``ui``: fixed alignment of ``main`` and ``squads`` (fixes `tweak` hotkey-clear and DF-AI) +- ``ui.main``: identified ``fortress_site`` +- ``ui.squads``: identified ``kill_rect_targets_scroll`` +- ``world_site``: identified names and/or types of some fields +- ``world_history``: identified names and/or types of some fields +- ``viewscreen_setupadventurest``: identified some nemesis and personality fields, and ``page.ChooseHistfig`` +- ``unit_storage_status``: newly identified type, stores noble holdings information (used in ``viewscreen_layer_noblelistst``) +- ``viewscreen_layer_noblelistst``: identified ``storage_status`` (see ``unit_storage_status`` type) +- ``viewscreen_layer_arena_creaturest``: identified item- and name-related fields +- ``viewscreen_new_regionst``: identified ``rejection_msg``, ``raw_folder``, ``load_world_params`` +- ``viewscreen_new_regionst``: changed many ``int8_t`` fields to ``bool`` +- ``unit_flags3``: identified ``marked_for_gelding`` +- ``body_part_status``: identified ``gelded`` ## API - New debug features related to `debug` plugin: diff --git a/library/xml b/library/xml index fa6e818b3..44215836d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit fa6e818b34235b9fe10abc37d06eba27a932c870 +Subproject commit 44215836d5b57c3722b126aaf481f652385f3a23 From f8dd215012534a8d6527bc01772f2365a4048fdf Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 27 Dec 2018 17:57:55 -0500 Subject: [PATCH 47/66] Update scripts and related changelog entries --- docs/changelog.txt | 29 ++++++++++++++++++++++++++++- scripts | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index d6853be31..d99eabb7f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -41,11 +41,25 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `debug`: manages runtime debug print category filtering - `nestboxes`: automatically scan for and forbid fertile eggs incubating in a nestbox +## New Scripts +- `devel/query`: searches for field names in DF objects +- `extinguish`: puts out fires +- `tame`: sets tamed/trained status of animals + ## Fixes - `building-hacks`: fixed error when dealing with custom animation tables - `devel/test-perlin`: fixed Lua error (``math.pow()``) - `embark-assistant`: fixed crash when entering finder with a 16x16 embark selected, and added 16 to dimension choices - `embark-skills`: fixed missing ``skill_points_remaining`` field +- `full-heal`: + - stopped wagon resurrection + - fixed a minor issue with post-resurrection hostility +- `gui/companion-order`: + - fixed issues with printing coordinates + - fixed issues with move command + - fixed cheat commands (and removed "Power up", which was broken) +- `gui/gm-editor`: fixed reinterpret cast (``r``) +- `gui/pathable`: fixed error when sidebar is hidden with ``Tab`` - `labormanager`: - stopped assigning labors to ineligible dwarves, pets, etc. - stopped assigning invalid labors @@ -55,12 +69,25 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `tweak`: fixed ``hotkey-clear`` ## Misc Improvements -- `devel/export-dt-ini`: added viewscreen offsets for DT 40.1.2 +- `armoks-blessing`: improved documentation to list all available arguments +- `devel/export-dt-ini`: + - added viewscreen offsets for DT 40.1.2 + - added item base flags offset + - added needs offsets - `embark-assistant`: - added match indicator display on the right ("World") map - changed 'c'ancel to abort find if it's under way and clear results if not, allowing use of partial surveys. - added Coal as a search criterion, as well as a coal indication as current embark selection info. +- `full-heal`: + - added ``-all``, ``-all_civ`` and ``-all_citizens`` arguments + - added module support + - now removes historical figure death dates and ghost data +- `growcrops`: added ``all`` argument to grow all crops +- `gui/load-screen`: improved documentation - `labormanager`: now takes nature value into account when assigning jobs +- `open-legends`: added warning about risk of save corruption and improved related documentation +- `points`: added support when in ``viewscreen_setupdwarfgamest`` and improved error messages +- `siren`: removed break handling (relevant ``misc_trait_type`` was no longer used - see "Structures" section) ## Internals - Linux/macOS: changed recommended build backend from Make to Ninja (Make builds will be significantly slower now) diff --git a/scripts b/scripts index 7deb13c68..a242a7cd8 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 7deb13c681b011d9a87782b9cdf9eec6e6acf7c1 +Subproject commit a242a7cd81ae7046146f86c3103360449e1d9ca8 From 9fe24e1b3fe01fcbb15e982967464971b3921b85 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 27 Dec 2018 19:39:43 -0500 Subject: [PATCH 48/66] Update changelog and bump version to r2 --- CMakeLists.txt | 2 +- docs/Authors.rst | 2 ++ docs/changelog.txt | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e05e5cf2b..689618637 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ endif() # set up versioning. set(DF_VERSION "0.44.12") -set(DFHACK_RELEASE "r1") +set(DFHACK_RELEASE "r2") set(DFHACK_PRERELEASE FALSE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") diff --git a/docs/Authors.rst b/docs/Authors.rst index 7233e558a..ba3a00b35 100644 --- a/docs/Authors.rst +++ b/docs/Authors.rst @@ -23,6 +23,7 @@ Bearskie Bearskie belal jimhester Ben Lubar BenLubar Ben Rosser TC01 +billw2012 billw2012 brndd brndd burneddi Bumber Bumber64 Caldfir caldfir @@ -68,6 +69,7 @@ Kromtec Kromtec Kurik Amudnil Lethosor lethosor Mason11987 Mason11987 +Matt Regul mattregul Matthew Cline Matthew Lindner mlindner Max maxthyme Max^TM diff --git a/docs/changelog.txt b/docs/changelog.txt index d99eabb7f..4db4072f0 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -37,6 +37,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ================================================================================ # Future +# 0.44.12-r2 + ## New Plugins - `debug`: manages runtime debug print category filtering - `nestboxes`: automatically scan for and forbid fertile eggs incubating in a nestbox @@ -64,6 +66,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - stopped assigning labors to ineligible dwarves, pets, etc. - stopped assigning invalid labors - added support for crafting jobs that use pearl + - fixed issues causing cleaning jobs to not be assigned + - added support for disabling management of specific labors - `prospector`: (also affected `embark-tools`) - fixed a crash when prospecting an unusable site (ocean, mountains, etc.) with a large default embark size in d_init.txt (e.g. 16x16) - `siege-engine`: fixed a few Lua errors (``math.pow()``, ``unit.relationship_ids``) - `tweak`: fixed ``hotkey-clear`` @@ -93,9 +97,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - Linux/macOS: changed recommended build backend from Make to Ninja (Make builds will be significantly slower now) - Added a usable unit test framework for basic tests, and a few basic tests - Core: various thread safety and memory management improvements -- Fixed cmake build dependencies for generated header files +- Fixed CMake build dependencies for generated header files - Fixed custom ``CMAKE_CXX_FLAGS`` not being passed to plugins - Changed ``plugins/CMakeLists.custom.txt`` to be ignored by git and created (if needed) at build time instead +- Added ``CMakeSettings.json`` with intellisense support ## Lua - ``utils``: new ``OrderedTable`` class From 315852a2513679ca1afe0d53b34974cefd946f89 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 27 Dec 2018 19:46:36 -0500 Subject: [PATCH 49/66] labormanager: fix -Wreorder warning --- plugins/labormanager/labormanager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp index d779e036a..e416dcf63 100644 --- a/plugins/labormanager/labormanager.cpp +++ b/plugins/labormanager/labormanager.cpp @@ -535,7 +535,8 @@ struct dwarf_info_t df::unit_labor using_labor; dwarf_info_t(df::unit* dw) : dwarf(dw), state(OTHER), - clear_all(false), high_skill(0), has_children(false), armed(false), using_labor(df::unit_labor::NONE), unmanaged_labors_assigned(0) + clear_all(false), high_skill(0), has_children(false), armed(false), + unmanaged_labors_assigned(0), using_labor(df::unit_labor::NONE) { for (int e = TOOL_NONE; e < TOOLS_MAX; e++) has_tool[e] = false; @@ -2233,7 +2234,7 @@ void print_labor(df::unit_labor labor, color_ostream &out) else { out << "priority " << labor_info.priority(); - + if (labor_info.maximum_dwarfs() == MAX_DWARFS_NONE) out << ", no maximum"; else From af0d569afd9ad29a34631360e9968624695e34b3 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 29 Dec 2018 00:15:45 -0500 Subject: [PATCH 50/66] check-rpc: add -> append --- travis/check-rpc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/travis/check-rpc.py b/travis/check-rpc.py index 7b771ee67..ecddafa9f 100644 --- a/travis/check-rpc.py +++ b/travis/check-rpc.py @@ -67,9 +67,9 @@ for plugin_name in actual: io = methods[m] if m in expected[plugin_name]: if expected[plugin_name][m] != io: - wrong.add('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1]) + wrong.append('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1]) else: - missing.add('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1]) + missing.append('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1]) if len(missing) > 0: print('Incomplete documentation for ' + ('core' if plugin_name == '' else 'plugin "' + plugin_name + '"') + ' proto files. Add the following lines:') @@ -98,7 +98,7 @@ for plugin_name in expected: for m in methods: io = methods[m] if m not in actual[plugin_name]: - missing.add('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1]) + missing.append('// RPC ' + m + ' : ' + io[0] + ' -> ' + io[1]) if len(missing) > 0: print('Incorrect documentation for ' + ('core' if plugin_name == '' else 'plugin "' + plugin_name + '"') + ' proto files. Remove the following lines:') From b08ccd001ebe0edd8a2beea73be41f270a35ec7e Mon Sep 17 00:00:00 2001 From: lethosor Date: Sun, 30 Dec 2018 17:47:10 -0500 Subject: [PATCH 51/66] travis: Always clear DF folder --- .travis.yml | 6 ++---- travis/download-df.sh | 27 ++++++++++++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index c90276540..98534a11a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: - g++-4.8 before_install: - export DF_VERSION=$(sh travis/get-df-version.sh) -- export DF_FOLDER="$HOME/DF-travis/$DF_VERSION" +- export DF_FOLDER="$HOME/DF-travis/$DF_VERSION/df_linux" - pip install --user "sphinx==1.4" "requests[security]" - sh travis/build-lua.sh - sh travis/download-df.sh @@ -56,9 +56,7 @@ script: - python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt" before_cache: - cat "$DF_FOLDER/stderr.log" -- rm -rf "$DF_FOLDER/hack" -- rm -rf "$DF_FOLDER/dfhack-config" -- rm -f "$DF_FOLDER"/*.log +- rm -rf "$DF_FOLDER" notifications: email: false irc: diff --git a/travis/download-df.sh b/travis/download-df.sh index 20dc3dbd4..44426de54 100755 --- a/travis/download-df.sh +++ b/travis/download-df.sh @@ -15,26 +15,31 @@ cd "$DF_FOLDER" if [ -f receipt ]; then if [ "$selfmd5" != "$(cat receipt)" ]; then echo "download-df.sh changed; removing DF" + rm receipt else echo "Already downloaded $DF_VERSION" - exit 0 fi fi -rm -rif "$tardest" df_linux +if [ ! -f receipt ]; then + rm -f "$tardest" + minor=$(echo "$DF_VERSION" | cut -d. -f2) + patch=$(echo "$DF_VERSION" | cut -d. -f3) + url="http://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2" + echo Downloading + wget "$url" -O "$tardest" +fi -minor=$(echo "$DF_VERSION" | cut -d. -f2) -patch=$(echo "$DF_VERSION" | cut -d. -f3) -url="http://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2" +rm -rf df_linux +mkdir df_linux -echo Downloading -wget "$url" -O "$tardest" echo Extracting -tar xf "$tardest" --strip-components=1 +tar xf "$tardest" --strip-components=1 -C df_linux echo Changing settings -echo '' >> "$DF_FOLDER/data/init/init.txt" -echo '[PRINT_MODE:TEXT]' >> "$DF_FOLDER/data/init/init.txt" -echo '[SOUND:NO]' >> "$DF_FOLDER/data/init/init.txt" +echo '' >> "$DF_FOLDER/df_linux/data/init/init.txt" +echo '[PRINT_MODE:TEXT]' >> "$DF_FOLDER/df_linux/data/init/init.txt" +echo '[SOUND:NO]' >> "$DF_FOLDER/df_linux/data/init/init.txt" echo Done echo "$selfmd5" > receipt +ls From 8063717503a4d97c3b8bf90e543dc99b3122c8a5 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 2 Jan 2019 17:05:28 -0500 Subject: [PATCH 52/66] get-df-version: make filter more strict --- travis/get-df-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/get-df-version.sh b/travis/get-df-version.sh index 13d317d2e..24386252d 100755 --- a/travis/get-df-version.sh +++ b/travis/get-df-version.sh @@ -1,4 +1,4 @@ #!/bin/sh cd "$(dirname "$0")" cd .. -grep DF_VERSION CMakeLists.txt | perl -ne 'print "$&\n" if /[\d\.]+/' +grep -i 'set(DF_VERSION' CMakeLists.txt | perl -ne 'print "$&\n" if /[\d\.]+/' From 13dfa130d72a7370d0f1e0c17f9abf3a794c54cc Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 2 Jan 2019 17:34:08 -0500 Subject: [PATCH 53/66] Add more diagnostics to run-tests.py --- travis/run-tests.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/travis/run-tests.py b/travis/run-tests.py index ae48074b5..a66320f37 100644 --- a/travis/run-tests.py +++ b/travis/run-tests.py @@ -14,6 +14,9 @@ os.chdir(sys.argv[1]) if os.path.exists(test_stage): os.remove(test_stage) +print(os.getcwd()) +print(os.listdir('.')) + tries = 0 while True: tries += 1 @@ -33,3 +36,5 @@ while True: process = subprocess.Popen([dfhack], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) process.communicate() + if process.returncode != 0: + print('DF exited with ' + repr(process.returncode)) From 966389703796d497894288370d94b1533a869e3b Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 2 Jan 2019 18:40:34 -0500 Subject: [PATCH 54/66] Fix inconsistency resulting in nested df_linux folders --- travis/download-df.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/travis/download-df.sh b/travis/download-df.sh index 44426de54..cedb843b9 100755 --- a/travis/download-df.sh +++ b/travis/download-df.sh @@ -11,6 +11,8 @@ echo "DF_VERSION: $DF_VERSION" echo "DF_FOLDER: $DF_FOLDER" mkdir -p "$DF_FOLDER" cd "$DF_FOLDER" +# back out of df_linux +cd .. if [ -f receipt ]; then if [ "$selfmd5" != "$(cat receipt)" ]; then @@ -36,9 +38,9 @@ mkdir df_linux echo Extracting tar xf "$tardest" --strip-components=1 -C df_linux echo Changing settings -echo '' >> "$DF_FOLDER/df_linux/data/init/init.txt" -echo '[PRINT_MODE:TEXT]' >> "$DF_FOLDER/df_linux/data/init/init.txt" -echo '[SOUND:NO]' >> "$DF_FOLDER/df_linux/data/init/init.txt" +echo '' >> "df_linux/data/init/init.txt" +echo '[PRINT_MODE:TEXT]' >> "df_linux/data/init/init.txt" +echo '[SOUND:NO]' >> "df_linux/data/init/init.txt" echo Done echo "$selfmd5" > receipt From 703e1b8a0cc700ec45fe638582db20dd55338660 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 2 Jan 2019 19:15:19 -0500 Subject: [PATCH 55/66] Consolidate cd commands --- travis/download-df.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/travis/download-df.sh b/travis/download-df.sh index cedb843b9..4eae6f9b9 100755 --- a/travis/download-df.sh +++ b/travis/download-df.sh @@ -10,9 +10,8 @@ cd "$(dirname "$0")" echo "DF_VERSION: $DF_VERSION" echo "DF_FOLDER: $DF_FOLDER" mkdir -p "$DF_FOLDER" -cd "$DF_FOLDER" # back out of df_linux -cd .. +cd "$DF_FOLDER/.." if [ -f receipt ]; then if [ "$selfmd5" != "$(cat receipt)" ]; then From 17d60c5a1ffdfee32babbd299eae4932374a48d5 Mon Sep 17 00:00:00 2001 From: lethosor Date: Fri, 4 Jan 2019 10:51:54 -0500 Subject: [PATCH 56/66] Mention custom profession folder and clean up docs a bit --- docs/Plugins.rst | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/Plugins.rst b/docs/Plugins.rst index 5fc30fa65..4d122bb51 100644 --- a/docs/Plugins.rst +++ b/docs/Plugins.rst @@ -561,16 +561,19 @@ directly to the main dwarf mode screen. Professions ----------- -The manipulator plugin supports saving Professions: a named set of Labors labors that can be -quickly applied to one or multiple Dwarves. +The manipulator plugin supports saving professions: a named set of labors that can be +quickly applied to one or multiple dwarves. -To save a Profession highlight a Dwarf and press :kbd:`P`. The Profession will be saved using -the Custom Profession Name of the Dwarf, or the default for that Dwarf if no Custom Profession -Name has been set. +To save a profession, highlight a dwarf and press :kbd:`P`. The profession will be saved using +the custom profession name of the dwarf, or the default for that dwarf if no custom profession +name has been set. -To apply a Profession either highlight a single Dwarf, or select multiple with :kbd:`x`, and press -:kbd:`p` to select the Profession to apply. All labors for the selected Dwarves will be reset to -the labors of the chosen Profession. +To apply a profession, either highlight a single dwarf or select multiple with +:kbd:`x`, and press :kbd:`p` to select the profession to apply. All labors for +the selected dwarves will be reset to the labors of the chosen profession. + +Professions are saved as human-readable text files in the "professions" folder +within the DF folder, and can be edited or deleted there. .. comment - the link target "search" is reserved for the Sphinx search page .. _search-plugin: From 6c266075de0bcf53d3bb7fb3c7582acf9c684da0 Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 15 Jan 2019 21:06:49 -0500 Subject: [PATCH 57/66] Console-posix: fix crash with prompts longer than screen width Also add an extra fallback check around substr Fixes #1425 --- library/Console-posix.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/library/Console-posix.cpp b/library/Console-posix.cpp index da786aaac..696672861 100644 --- a/library/Console-posix.cpp +++ b/library/Console-posix.cpp @@ -480,7 +480,7 @@ namespace DFHack { char seq[64]; int cols = get_columns(); - int plen = prompt.size(); + int plen = prompt.size() % cols; int len = raw_buffer.size(); int begin = 0; int cooked_cursor = raw_cursor; @@ -493,7 +493,15 @@ namespace DFHack } if (plen+len > cols) len -= plen+len - cols; - std::string mbstr = toLocaleMB(raw_buffer.substr(begin,len)); + std::string mbstr; + try { + mbstr = toLocaleMB(raw_buffer.substr(begin,len)); + } + catch (std::out_of_range&) { + // fallback check in case begin is still out of range + // (this behaves badly but at least doesn't crash) + mbstr = toLocaleMB(raw_buffer); + } /* Cursor to left edge */ snprintf(seq,64,"\x1b[1G"); if (::write(STDIN_FILENO,seq,strlen(seq)) == -1) return; From 3a9fea9c52b70997ed2a1185759cf2b9819d507d Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 28 Mar 2019 11:09:46 -0400 Subject: [PATCH 58/66] Update stonesense --- docs/Authors.rst | 1 + docs/changelog.txt | 3 +++ plugins/stonesense | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/Authors.rst b/docs/Authors.rst index ba3a00b35..963d65fde 100644 --- a/docs/Authors.rst +++ b/docs/Authors.rst @@ -51,6 +51,7 @@ gchristopher gchristopher grubsteak grubsteak Harlan Playford playfordh Hayati Ayguen hayguen +Herwig Hochleitner bendlas IndigoFenix James Logsdon jlogsdon Japa JapaMala diff --git a/docs/changelog.txt b/docs/changelog.txt index 4db4072f0..17c766f75 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -37,6 +37,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ================================================================================ # Future +## Internals +- Fixed some OpenGL build issues with `stonesense` + # 0.44.12-r2 ## New Plugins diff --git a/plugins/stonesense b/plugins/stonesense index 4a0f63e04..c5333b176 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 4a0f63e044d02532c948d67780dfd128fbd6d043 +Subproject commit c5333b1762328be83b9f21f5956c06ffc15d426b From c11f2b5ffa7434afca44e9ad44ea61d2f1aec37c Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 28 Mar 2019 14:01:20 -0400 Subject: [PATCH 59/66] Update stonesense (fix non-Linux builds) --- plugins/stonesense | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/stonesense b/plugins/stonesense index c5333b176..6b4df3995 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit c5333b1762328be83b9f21f5956c06ffc15d426b +Subproject commit 6b4df3995f53e0579fc590a78d68e54fc2ca2b81 From 9c403f509dbe6bfefca7a03c5734d424215054dc Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 15 Apr 2019 16:21:54 -0700 Subject: [PATCH 60/66] [Release] cxxrandom v2.0.1 --- plugins/lua/cxxrandom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/lua/cxxrandom.lua b/plugins/lua/cxxrandom.lua index 1521c4c9e..4d2d59da9 100644 --- a/plugins/lua/cxxrandom.lua +++ b/plugins/lua/cxxrandom.lua @@ -188,7 +188,7 @@ function num_sequence:new(a,b) else error("Invalid arguments - a: " .. tostring(a) .. " and b: " .. tostring(b)) end - print("seqID:"..o.seqID) + --print("seqID:"..o.seqID) setmetatable(o,self) return o end From e5eade1ad7a0acc924e4e7390986dd5fb99f8c94 Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 30 Apr 2019 16:53:09 -0400 Subject: [PATCH 61/66] Make gui.dwarfmode.{get_movement_delta,get_hotkey_target} public --- library/lua/gui/dwarfmode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua index fa2d41410..886e0c4df 100644 --- a/library/lua/gui/dwarfmode.lua +++ b/library/lua/gui/dwarfmode.lua @@ -226,7 +226,7 @@ MOVEMENT_KEYS = { CURSOR_UP_Z_AUX = { 0, 0, 1 }, CURSOR_DOWN_Z_AUX = { 0, 0, -1 }, } -local function get_movement_delta(key, delta, big_step) +function get_movement_delta(key, delta, big_step) local info = MOVEMENT_KEYS[key] if info then if info[4] then @@ -243,7 +243,7 @@ for i,v in ipairs(df.global.ui.main.hotkeys) do HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v end -local function get_hotkey_target(key) +function get_hotkey_target(key) local hk = HOTKEY_KEYS[key] if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then return xyz2pos(hk.x, hk.y, hk.z) From 32a0ab967946aa4a15f80470bd91c87b45de4789 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 11 May 2019 23:34:59 -0400 Subject: [PATCH 62/66] Update submodules --- library/xml | 2 +- scripts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xml b/library/xml index 44215836d..2be1fc4af 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 44215836d5b57c3722b126aaf481f652385f3a23 +Subproject commit 2be1fc4afea4d3345b9b76d0f27f56087ac9b6e0 diff --git a/scripts b/scripts index a242a7cd8..c8394fa75 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit a242a7cd81ae7046146f86c3103360449e1d9ca8 +Subproject commit c8394fa75ff20abcdcdbe975dbf157d21882172e From f2bd697d64a13233889b8d0b6aa9cc716e14ab60 Mon Sep 17 00:00:00 2001 From: lethosor Date: Mon, 13 May 2019 19:21:57 -0400 Subject: [PATCH 63/66] mousequery: give explicit feedback when enabling/disabling sub-features The behavior of this plugin is somewhat unintuitive - "mousequery edge" disables the edge-scrolling feature instead of enabling it. This should avoid confusion without breaking compatibility with existing init scripts. --- plugins/mousequery.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp index d9bba78b6..5aab0b584 100644 --- a/plugins/mousequery.cpp +++ b/plugins/mousequery.cpp @@ -836,26 +836,35 @@ static command_result mousequery_cmd(color_ostream &out, vector & param else if (cmd[0] == 'p') { plugin_enabled = (state == "enable"); + out << "mousequery: plugin " << (plugin_enabled ? "enabled" : "disabled") << endl; } else if (cmd[0] == 'r') { rbutton_enabled = (state == "enable"); + out << "mousequery: rbutton " << (rbutton_enabled ? "enabled" : "disabled") << endl; } else if (cmd[0] == 't') { tracking_enabled = (state == "enable"); - if (!tracking_enabled) + if (!tracking_enabled) { + out << "mousequery: edge scrolling disabled" << endl; active_scrolling = false; + } + out << "mousequery: tracking " << (tracking_enabled ? "enabled" : "disabled") << endl; } else if (cmd[0] == 'e') { active_scrolling = (state == "enable"); - if (active_scrolling) + if (active_scrolling) { + out << "mousequery: tracking enabled" << endl; tracking_enabled = true; + } + out << "mousequery: edge scrolling " << (active_scrolling ? "enabled" : "disabled") << endl; } else if (cmd[0] == 'l') { live_view = (state == "enable"); + out << "mousequery: live view " << (live_view ? "enabled" : "disabled") << endl; } else if (cmd == "drag") { From dd9c433f17bbeab7415ad8e7c5c75d24c88ea025 Mon Sep 17 00:00:00 2001 From: lethosor Date: Mon, 13 May 2019 19:38:24 -0400 Subject: [PATCH 64/66] Use BYPRODUCTS to keep ninja builds from re-running codegen every time This partially reverts f02466de8a783be0c5c06f42485a42f5266693aa, but behavior should be the same under MSVC, which that commit attempted to fix. From https://cmake.org/cmake/help/v3.14/command/add_custom_command.html: > The `BYPRODUCTS` option is ignored on non-Ninja generators except to mark > byproducts `GENERATED`. Since `$GENERATED_HDRS` are already marked generated, this change should have no effect on non-Ninja generators. --- library/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index a9255ae00..d64b7429f 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -264,10 +264,14 @@ FILE(GLOB GENERATE_INPUT_SCRIPTS ${dfapi_SOURCE_DIR}/xml/*.pm ${dfapi_SOURCE_DIR FILE(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/df.*.xml) set(CODEGEN_OUT ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml) -LIST(APPEND CODEGEN_OUT ${GENERATED_HDRS}) +IF(NOT("${CMAKE_GENERATOR}" STREQUAL Ninja)) + # use BYPRODUCTS instead under Ninja to avoid rebuilds + LIST(APPEND CODEGEN_OUT ${GENERATED_HDRS}) +ENDIF() ADD_CUSTOM_COMMAND( OUTPUT ${CODEGEN_OUT} + BYPRODUCTS ${GENERATED_HDRS} COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xml/codegen.pl ${CMAKE_CURRENT_SOURCE_DIR}/xml ${CMAKE_CURRENT_SOURCE_DIR}/include/df From c3b06b81c7b672b0c9fb56a19a6b845d082f28e5 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 16 May 2019 23:22:11 -0400 Subject: [PATCH 65/66] mousequery: use map dimensions to determine edge scrolling locations TWBT modifies the map dimensions, so using the window dimensions to handle edge scrolling produces the wrong behavior when using a larger map tileset than text tileset. --- plugins/mousequery.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp index 5aab0b584..fb6c1e4c5 100644 --- a/plugins/mousequery.cpp +++ b/plugins/mousequery.cpp @@ -572,12 +572,11 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest static decltype(enabler->clock) last_t = 0; auto dims = Gui::getDwarfmodeViewDims(); - auto right_margin = (dims.menu_x1 > 0) ? dims.menu_x1 : gps->dimx; int32_t mx, my; auto mpos = get_mouse_pos(mx, my); bool mpos_valid = mpos.x != -30000 && mpos.y != -30000 && mpos.z != -30000; - if (mx < 1 || mx > right_margin - 2 || my < 1 || my > gps->dimy - 2) + if (mx < 1 || mx > dims.map_x2 || my < 1 || my > dims.map_y2) mpos_valid = false; // Check if in lever binding mode @@ -683,7 +682,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest return; } - if (mx > right_margin - scroll_buffer) + if (mx > dims.map_x2 - scroll_buffer) { sendKey(interface_key::CURSOR_RIGHT); return; @@ -695,7 +694,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest return; } - if (my > gps->dimy - scroll_buffer) + if (my > dims.map_y2 - scroll_buffer) { sendKey(interface_key::CURSOR_DOWN); return; From 92717a7f71335b4b17c54bab034a3da861957b94 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 16 May 2019 23:30:03 -0400 Subject: [PATCH 66/66] mousequery: Fix some more instances of map boundary checks --- plugins/mousequery.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp index fb6c1e4c5..618252ad3 100644 --- a/plugins/mousequery.cpp +++ b/plugins/mousequery.cpp @@ -369,8 +369,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest // Can't check limits earlier as we must be sure we are in query or default mode // (so we can clear the button down flag) auto dims = Gui::getDwarfmodeViewDims(); - int right_bound = (dims.menu_x1 > 0) ? dims.menu_x1 - 2 : gps->dimx - 2; - if (mx < 1 || mx > right_bound || my < 1 || my > gps->dimy - 2) + if (mx < 1 || mx > dims.map_x2 || my < 1 || my > dims.map_y2) return false; if (ui->main.mode == df::ui_sidebar_mode::Zones || @@ -435,13 +434,13 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest if (mx < scroll_trigger_x) sendKey(interface_key::CURSOR_LEFT_FAST); - if (mx > ((dims.menu_x1 > 0) ? dims.menu_x1 : gps->dimx) - scroll_trigger_x) + if (mx > dims.map_x2 - scroll_trigger_x) sendKey(interface_key::CURSOR_RIGHT_FAST); if (my < scroll_trigger_y) sendKey(interface_key::CURSOR_UP_FAST); - if (my > gps->dimy - scroll_trigger_y) + if (my > dims.map_y2 - scroll_trigger_y) sendKey(interface_key::CURSOR_DOWN_FAST); } @@ -731,9 +730,9 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest if (shouldTrack()) { if (delta_t <= scroll_delay && (mx < scroll_buffer || - mx > dims.menu_x1 - scroll_buffer || + mx > dims.map_x2 - scroll_buffer || my < scroll_buffer || - my > gps->dimy - scroll_buffer)) + my > dims.map_y2 - scroll_buffer)) { return; }