Merge pull request #5440 from ab9rf/remove-registerdata

Remove unused `RegisterData` API from Core

Author: myk002

docs/changelog.txt

@@ -77,6 +77,7 @@ Template for new versions:
 - ``script-manager``: new ``get_mod_info_metadata()`` function for getting information out of mod ``info.txt`` files
 
 ## Removed
+- removed historically unused ``Core::RegisterData``/``Core::GetData`` API and associated internal data structures
 
 # 51.11-r1.2
 

library/Core.cpp

@@ -1496,7 +1496,6 @@ Core::Core() :
     HotkeyCond{},
     alias_mutex{},
     started{false},
-    misc_data_mutex{},
     CoreSuspendMutex{},
     CoreWakeup{},
     ownerThread{},
@@ -1995,28 +1994,6 @@ void Core::printerr(const char *format, ...)
     va_end(args);
 }
 
-void Core::RegisterData( void *p, std::string key )
-{
-    std::lock_guard<std::mutex> lock(misc_data_mutex);
-    misc_data_map[key] = p;
-}
-
-void *Core::GetData( std::string key )
-{
-    std::lock_guard<std::mutex> lock(misc_data_mutex);
-    std::map<std::string,void*>::iterator it=misc_data_map.find(key);
-
-    if ( it != misc_data_map.end() )
-    {
-        void *p=it->second;
-        return p;
-    }
-    else
-    {
-        return 0;// or throw an error.
-    }
-}
-
 Core& Core::getInstance() {
     static Core instance;
     return instance;

library/include/Core.h

@@ -168,11 +168,6 @@ namespace DFHack
         /// removes the hotkey command and gives it to the caller thread
         std::string getHotkeyCmd( bool &keep_going );
 
-        /// adds a named pointer (for later or between plugins)
-        void RegisterData(void *p,std::string key);
-        /// returns a named pointer.
-        void *GetData(std::string key);
-
         command_result runCommand(color_ostream &out, const std::string &command, std::vector <std::string> &parameters, bool no_autocomplete = false);
         command_result runCommand(color_ostream &out, const std::string &command);
         bool loadScriptFile(color_ostream &out, std::filesystem::path fname, bool silent = false);
@@ -316,9 +311,6 @@ namespace DFHack
         // Additional state change scripts
         std::vector<StateChangeScript> state_change_scripts;
 
-        std::mutex misc_data_mutex;
-        std::map<std::string,void*> misc_data_map;
-
         /*!
          * \defgroup core_suspend CoreSuspender state handling serialization to
          * DF memory.