std::atomic для dwReference в smem_value

Author: joye-ramone

ogsr_engine/xrCore/xrsharedmem.cpp

@@ -82,12 +82,15 @@ void smem_container::clean()
 
 void smem_container::dump()
 {
+    string_path fname;
+    FS.update_path(fname, fsgame::app_data_root, "$smem_container_dump$.txt");
+
     cs.Enter();
     cdb::iterator it = container.begin();
     cdb::iterator end = container.end();
-    FILE* F = fopen("x:\\$smem_dump$.txt", "w");
-    for (; it != end; it++)
-        fprintf(F, "%4u : crc[%6x], %u bytes\n", (*it)->dwReference, (*it)->dwCRC, (*it)->dwSize);
+    FILE* F = fopen(fname, "w");
+    for (; it != end; ++it)
+        fprintf(F, "%4u : crc[%6x], %u bytes\n", (*it)->dwReference.load(), (*it)->dwCRC, (*it)->dwSize);
     fclose(F);
     cs.Leave();
 }

ogsr_engine/xrCore/xrsharedmem.h

@@ -5,10 +5,11 @@
 #pragma warning(disable : 4200)
 struct XRCORE_API smem_value
 {
-    u32 dwReference;
+    std::atomic<u32> dwReference{};
+
     u32 dwCRC;
     u32 dwSize; // size in bytes !!!
-    u32 _align_16;
+
     u8 value[];
 };
 
@@ -60,9 +61,10 @@ class ref_smem
     {
         if (0 == p_)
             return;
-        p_->dwReference--;
+        --p_->dwReference;
         if (0 == p_->dwReference)
         {
+            // Msg("ref_smem: deleting %d bytes of shared memory", p_->dwSize);
             if (g_pSharedMemoryContainer->disabled())
                 xr_free(p_);
 
@@ -74,8 +76,10 @@ class ref_smem
     void _set(ref_smem const& rhs)
     {
         smem_value* v = rhs.p_;
-        if (0 != v)
-            v->dwReference++;
+
+        if (v)
+            ++v->dwReference;
+
         _dec();
         p_ = v;
     }
@@ -94,8 +98,10 @@ class ref_smem
     void create(u32 dwLength, T* ptr)
     {
         smem_value* v = g_pSharedMemoryContainer->dock(dwLength * sizeof(T), ptr);
-        if (0 != v)
-            v->dwReference++;
+
+        if (v)
+            ++v->dwReference;
+
         _dec();
         p_ = v;
     }
@@ -104,7 +110,7 @@ class ref_smem
     ref_smem<T>& operator=(ref_smem<T> const& rhs)
     {
         _set(rhs);
-        return (ref_smem<T>&)*this;
+        return static_cast<ref_smem<T>&>(*this);
     }
     T* operator*() const { return p_ ? (T*)p_->value : 0; }
     bool operator!() const { return p_ == 0; }

ogsr_engine/xr_3da/xr_ioc_cmd.cpp

@@ -59,43 +59,6 @@ class CCC_Quit : public IConsole_Command
 };
 
 //-----------------------------------------------------------------------
-#ifdef DEBUG_MEMORY_MANAGER
-class CCC_MemStat : public IConsole_Command
-{
-public:
-    CCC_MemStat(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-    virtual void Execute(LPCSTR args)
-    {
-        string_path fn;
-        if (args && args[0])
-            xr_sprintf(fn, sizeof(fn), "%s.dump", args);
-        else
-            strcpy_s_s(fn, sizeof(fn), "x:\\$memory$.dump");
-        Memory.mem_statistic(fn);
-        //		g_pStringContainer->dump			();
-        //		g_pSharedMemoryContainer->dump		();
-    }
-};
-#endif // DEBUG_MEMORY_MANAGER
-
-#ifdef DEBUG_MEMORY_MANAGER
-class CCC_DbgMemCheck : public IConsole_Command
-{
-public:
-    CCC_DbgMemCheck(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-    virtual void Execute(LPCSTR args)
-    {
-        if (Memory.debug_mode)
-        {
-            Memory.dbg_check();
-        }
-        else
-        {
-            Msg("~ Run with -mem_debug options.");
-        }
-    }
-};
-#endif // DEBUG_MEMORY_MANAGER
 
 class CCC_DbgStrCheck : public IConsole_Command
 {
@@ -533,11 +496,6 @@ void CCC_Register()
     CMD1(CCC_MotionsStat, "stat_motions");
     CMD1(CCC_TexturesStat, "stat_textures");
 
-#ifdef DEBUG_MEMORY_MANAGER
-    CMD1(CCC_MemStat, "dbg_mem_dump");
-    CMD1(CCC_DbgMemCheck, "dbg_mem_check");
-#endif // DEBUG_MEMORY_MANAGER
-
 #ifdef DEBUG
     CMD3(CCC_Mask, "mt_particles", &psDeviceFlags, mtParticles);