test

Author: PolarGoose

src/DOpusScriptingExtensions/DOpusScriptingExtensions.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "DOpusScriptingExtensions/resource.h"
 #include "DOpusScriptingExtensions/DOpusScriptingExtensions_i.h"
+#include "DOpusScriptingExtensions/Utils/DebugLogger.h"
 #include "Shared/Utils/StringUtils.h"
 #include "Shared/Utils/Exceptions.h"
 #include "Shared/Utils/WinApiUtils.h"

src/DOpusScriptingExtensions/DOpusScriptingExtensions.vcxproj

@@ -124,6 +124,7 @@
     <ClInclude Include="UCharDet\UCharDet.h" />
     <ClInclude Include="UCharDet\UCharDetWrapper.h" />
     <ClInclude Include="utils\ComUtils.h" />
+    <ClInclude Include="Utils\DebugLogger.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DOpusScriptingExtensions.cpp" />

src/DOpusScriptingExtensions/DOpusScriptingExtensions.vcxproj.filters

@@ -85,6 +85,9 @@
     <ClInclude Include="FileLockingInfoProvider\LockedFilesDatabase.h">
       <Filter>FileLockingInfoProvider</Filter>
     </ClInclude>
+    <ClInclude Include="Utils\DebugLogger.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DOpusScriptingExtensions.cpp" />

src/DOpusScriptingExtensions/FileLockingInfoProvider/FileLockingInfoProvider.h

@@ -17,7 +17,7 @@ class ATL_NO_VTABLE CFileLockingInfoProvider :
   DECLARE_PROTECT_FINAL_CONSTRUCT()
 
   HRESULT FinalConstruct() try {
-    _lockedFilesDatabase.emplace(43786);
+    _lockedFilesDatabase = LockedFilesDatabase::GetInstance();
     return S_OK;
   } CATCH_ALL_EXCEPTIONS()
 
@@ -41,7 +41,7 @@ class ATL_NO_VTABLE CFileLockingInfoProvider :
   } CATCH_ALL_EXCEPTIONS()
 
 private:
-  std::optional<LockedFilesDatabase> _lockedFilesDatabase;
+  LockedFilesDatabase* _lockedFilesDatabase;
 };
 
 OBJECT_ENTRY_AUTO(__uuidof(FileLockingInfoProvider), CFileLockingInfoProvider)

src/DOpusScriptingExtensions/FileLockingInfoProvider/LockedFilesDatabase.h

@@ -5,9 +5,9 @@
 
 class LockedFilesDatabase final : private boost::noncopyable {
 public:
-  explicit LockedFilesDatabase(int connectionPort) {
-    _connection = ProcessHandlesService::ProcessHandlesServiceGrpc::NewStub(grpc::CreateChannel("127.0.0.1:" + std::to_string(connectionPort), grpc::InsecureChannelCredentials()));
-    _updateThread = std::thread(&LockedFilesDatabase::UpdateDatabaseThread, this);
+  static LockedFilesDatabase* GetInstance() {
+    static LockedFilesDatabase instance;
+    return &instance;
   }
 
   std::vector<ATL::CComPtr<IProcessInfo>> GetLockingProcesses(std::wstring path) const {
@@ -46,6 +46,11 @@ class LockedFilesDatabase final : private boost::noncopyable {
   }
 
 private:
+  LockedFilesDatabase() {
+    _connection = ProcessHandlesService::ProcessHandlesServiceGrpc::NewStub(grpc::CreateChannel("127.0.0.1:43786", grpc::InsecureChannelCredentials()));
+    _updateThread = std::thread(&LockedFilesDatabase::UpdateDatabaseThread, this);
+  }
+
   void UpdateDatabaseThread() {
     try {
       while (!_stopEvent.HasBeenNotified()) {

src/DOpusScriptingExtensions/Utils/DebugLogger.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#define LINE_INFO std::format(L"{}:{}:{}", \
+  std::filesystem::path(__builtin_FILE()).filename(), \
+  ToUtf16(__builtin_FUNCTION()), \
+  __builtin_LINE())
+
+#ifdef _DEBUG
+  #define DEBUG_LOG(...) \
+    do { \
+      OutputDebugStringW( \
+        std::format(L"DOpusScriptingExtensions(threadId={}):{}: {}", \
+           std::this_thread::get_id(), \
+           LINE_INFO, \
+           std::format(__VA_ARGS__).c_str()).c_str()); \
+    } while (0)
+#else
+  #define DEBUG_LOG(...) (void)(__VA_ARGS__)
+#endif

src/ProcessHandlesService/main.cpp

@@ -47,6 +47,8 @@ int main() {
                                                         /* filename      */ (boost::dll::this_line_location().parent_path() / "DOpusScriptingExtensions.ProcessHandlesService.log.txt").string(),
                                                         /* max_file_size */ 1024 * 1024, /* 1 MiB */
                                                         /* max_files     */ 2));
+  spdlog::flush_every(std::chrono::seconds(2));
+
   SPDLOG_INFO("Start GRPC server on port 43786");
   try {
     grpc::ServerBuilder builder;