From ff6fe62da431396b042126dd2e4af9cf3b635ca9 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 23 Feb 2021 04:15:37 +0900
Subject: [PATCH] Better service workaround for Visual Studio.

---
 src/common/Service.cpp            | 16 ++++++++++++
 src/common/Service.h              | 41 ++++++++++++++++++++-----------
 src/scripts/ScriptLoader.cpp.in   |  4 ++-
 src/world/Script/ScriptLoader.cpp |  5 ++--
 src/world/mainGameServer.cpp      |  1 +
 5 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 src/common/Service.cpp

diff --git a/src/common/Service.cpp b/src/common/Service.cpp
new file mode 100644
index 00000000..1894d5e2
--- /dev/null
+++ b/src/common/Service.cpp
@@ -0,0 +1,16 @@
+#include <Service.h>
+
+namespace Sapphire::Common
+{
+  ServiceContainer* ServiceContainer::pSvcContainer = nullptr;
+
+  std::shared_ptr< void > ServiceContainer::get( size_t id )
+  {
+    return serviceTable[ id ];
+  }
+  
+  void ServiceContainer::set( size_t id, std::shared_ptr< void > svc )
+  {
+    serviceTable[ id ] = std::move( svc );
+  }
+}
\ No newline at end of file
diff --git a/src/common/Service.h b/src/common/Service.h
index 8cbb43a1..01d4053b 100644
--- a/src/common/Service.h
+++ b/src/common/Service.h
@@ -4,22 +4,26 @@
 #include <memory>
 #include <utility>
 #include <cassert>
+#include <unordered_map>
 
 // stolen from: https://github.com/skypjack/entt/blob/master/src/entt/locator/locator.hpp
 
 namespace Sapphire::Common
 {
   /**
-   * @brief Service locator, nothing more.
-   *
-   * A service locator can be used to do what it promises: locate services.<br/>
-   * Usually service locators are tightly bound to the services they expose and
-   * thus it's hard to define a general purpose class to do that. This template
-   * based implementation tries to fill the gap and to get rid of the burden of
-   * defining a different specific locator for each application.
-   *
-   * @tparam SvcType Type of service managed by the locator.
+   * @brief Replacement of Sapphire's Service locator which is not working when compiling under Visual Studio, keeping its api.
    */
+
+  class ServiceContainer
+  {
+  private:
+    std::unordered_map< size_t, std::shared_ptr< void > > serviceTable;
+  public:
+    std::shared_ptr< void > get( size_t id );
+    void set( size_t id, std::shared_ptr< void > svc );
+    static ServiceContainer* pSvcContainer;
+  };
+
   template< typename SvcType >
   struct Service
   {
@@ -38,6 +42,8 @@ namespace Sapphire::Common
      */
     static bool empty() noexcept
     {
+      auto id = typeid( SvcType ).hash_code();
+      auto service = ServiceContainer::pSvcContainer->get( id );
       return !static_cast< bool >( service );
     }
 
@@ -53,6 +59,8 @@ namespace Sapphire::Common
      */
     static std::weak_ptr< SvcType > get() noexcept
     {
+      auto id = typeid( SvcType ).hash_code();
+      auto service = std::reinterpret_pointer_cast< SvcType >( ServiceContainer::pSvcContainer->get( id ) );
       return service;
     }
 
@@ -72,6 +80,8 @@ namespace Sapphire::Common
      */
     static SvcType& ref() noexcept
     {
+      auto id = typeid( SvcType ).hash_code();
+      auto service = std::reinterpret_pointer_cast< SvcType >( ServiceContainer::pSvcContainer->get( id ) );
       return *service;
     }
 
@@ -84,7 +94,9 @@ namespace Sapphire::Common
     template< typename Impl = SvcType, typename... Args >
     static void set( Args&& ... args )
     {
-      service = std::make_shared< Impl >( std::forward< Args >( args )... );
+      auto id = typeid( SvcType ).hash_code();
+      std::shared_ptr< SvcType > ptr = std::make_shared< Impl >( std::forward< Args >( args )... );
+      ServiceContainer::pSvcContainer->set( id, std::move( ptr ) );
     }
 
     /**
@@ -94,7 +106,8 @@ namespace Sapphire::Common
     static void set( std::shared_ptr< SvcType > ptr )
     {
       assert( static_cast< bool >( ptr ) );
-      service = std::move( ptr );
+      auto id = typeid( SvcType ).hash_code();
+      ServiceContainer::pSvcContainer->set( id, std::move( ptr ) );
     }
 
     /**
@@ -104,11 +117,9 @@ namespace Sapphire::Common
      */
     static void reset()
     {
-      service.reset();
+      auto id = typeid( SvcType ).hash_code();
+      ServiceContainer::pSvcContainer->set( id, nullptr );
     }
-
-  private:
-    inline static std::shared_ptr< SvcType > service = nullptr;
   };
 }
 
diff --git a/src/scripts/ScriptLoader.cpp.in b/src/scripts/ScriptLoader.cpp.in
index c68d5f5d..d23c98f4 100644
--- a/src/scripts/ScriptLoader.cpp.in
+++ b/src/scripts/ScriptLoader.cpp.in
@@ -1,4 +1,5 @@
 #include <Script/NativeScriptApi.h>
+#include <Service.h>
 
 @ScriptIncludes@
 
@@ -8,7 +9,8 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    nullptr
 };
 
-extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts( Sapphire::Common::ServiceContainer* pSc )
 {
+   Sapphire::Common::ServiceContainer::pSvcContainer = pSc;
    return ptrs;
 }
diff --git a/src/world/Script/ScriptLoader.cpp b/src/world/Script/ScriptLoader.cpp
index 93759aa3..67ccad2b 100644
--- a/src/world/Script/ScriptLoader.cpp
+++ b/src/world/Script/ScriptLoader.cpp
@@ -4,6 +4,7 @@
 #include <Config/ConfigMgr.h>
 #include <Util/Util.h>
 #include "ServerMgr.h"
+#include "Service.h"
 
 #include <filesystem>
 
@@ -95,7 +96,7 @@ Sapphire::Scripting::ScriptInfo* Sapphire::Scripting::ScriptLoader::loadModule(
 
 Sapphire::ScriptAPI::ScriptObject** Sapphire::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
 {
-  using getScripts = Sapphire::ScriptAPI::ScriptObject** ( * )();
+  using getScripts = Sapphire::ScriptAPI::ScriptObject** ( * )( Common::ServiceContainer* );
 
 #ifdef _WIN32
   getScripts func = reinterpret_cast< getScripts >( GetProcAddress( handle, "getScripts" ) );
@@ -105,7 +106,7 @@ Sapphire::ScriptAPI::ScriptObject** Sapphire::Scripting::ScriptLoader::getScript
 
   if( func )
   {
-    auto ptr = func();
+    auto ptr = func( Common::ServiceContainer::pSvcContainer );
 
     return ptr;
   }
diff --git a/src/world/mainGameServer.cpp b/src/world/mainGameServer.cpp
index a8f29f3d..e569690c 100644
--- a/src/world/mainGameServer.cpp
+++ b/src/world/mainGameServer.cpp
@@ -15,6 +15,7 @@ int main( int32_t argc, char* argv[] )
 {
   auto pServer = std::make_shared< ServerMgr >( "world.ini" );
 
+  Common::ServiceContainer::pSvcContainer = new Common::ServiceContainer();
   Common::Service< ServerMgr >::set( pServer );
 
   pServer->run( argc, argv );