RDOIBT-1838 - CefGlue: Duplicate key reference (#109)

Revert replacement of lock by Interlocked
OutSystems · Sep 22, 2023 · 393f0fb · 393f0fb
1 parent 5a52f85
commit 393f0fb
Show file tree

Hide file tree

Showing 60 changed files with 1,073 additions and 483 deletions.
diff --git a/CefGlue.Interop.Gen/make_interop.py b/CefGlue.Interop.Gen/make_interop.py
@@ -489,6 +489,8 @@ def make_handler_g_body(cls):
     # result.append('private bool _disposed;')
     result.append('')
 
+    result.append('protected object SyncRoot { get { return this; } }')
+    result.append('')
 
     if schema.is_reversible(cls):
         result.append('internal static %s FromNativeOrNull(%s* ptr)' % (csname, iname))
@@ -521,7 +523,7 @@ def make_handler_g_body(cls):
     result.append('protected %s()' % csname)
     result.append('{')
     result.append(indent + '_self = %s.Alloc();' % iname)
-    result.append('');
+    result.append('')
     for func in funcs:
         result.append(indent + '%(delegate_slot)s = new %(iname)s.%(delegate_type)s(%(csn_name)s);' % func)
         result.append(indent + '_self->%(field_name)s = Marshal.GetFunctionPointerForDelegate(%(delegate_slot)s);' % func)
@@ -558,35 +560,43 @@ def make_handler_g_body(cls):
     # todo: verify self pointer in debug
     result.append('private void add_ref(%s* self)' % iname)
     result.append('{')
-    result.append(indent + 'if (Interlocked.Increment(ref _refct) == 1)')
+    result.append(indent + 'lock (SyncRoot)')
     result.append(indent + '{')
-    result.append(indent + indent + 'lock (_roots) { _roots.Add((IntPtr)_self, this); }')
+    result.append(indent + indent + 'var result = ++_refct;')
+    result.append(indent + indent + 'if (result == 1)')
+    result.append(indent + indent + '{')
+    result.append(indent + indent + indent + 'lock (_roots) { _roots.Add((IntPtr)_self, this); }')
+    result.append(indent + indent + '}')
     result.append(indent + '}')
     result.append('}')
     result.append('')
 
     result.append('private int release(%s* self)' % iname)
     result.append('{')
-    result.append(indent + 'if (Interlocked.Decrement(ref _refct) == 0)')
+    result.append(indent + 'lock (SyncRoot)')
     result.append(indent + '{')
-    result.append(indent + indent + 'lock (_roots) { _roots.Remove((IntPtr)_self); }')
+    result.append(indent + indent + 'var result = --_refct;')
+    result.append(indent + indent + 'if (result == 0)')
+    result.append(indent + indent + '{')
+    result.append(indent + indent + indent + 'lock (_roots) { _roots.Remove((IntPtr)_self); }')
     if schema.is_autodispose(cls):
-        result.append(indent + indent + 'Dispose();')
-    result.append(indent + indent + 'return 1;')
+        result.append(indent + indent + indent + 'Dispose();')
+    result.append(indent + indent + indent + 'return 1;')
+    result.append(indent + indent + '}')
+    result.append(indent + indent + 'return 0;')
     result.append(indent + '}')
-    result.append(indent + 'return 0;')
     result.append('}')
     result.append('')
 
     result.append('private int has_one_ref(%s* self)' % iname)
     result.append('{')
-    result.append(indent + 'return _refct == 1 ? 1 : 0;')
+    result.append(indent + 'lock (SyncRoot) { return _refct == 1 ? 1 : 0; }')
     result.append('}')
     result.append('')
 
     result.append('private int has_at_least_one_ref(%s* self)' % iname)
     result.append('{')
-    result.append(indent + 'return _refct != 0 ? 1 : 0;')
+    result.append(indent + 'lock (SyncRoot) { return _refct != 0 ? 1 : 0; }')
     result.append('}')
     result.append('')
 

diff --git a/CefGlue/Classes.g/CefAccessibilityHandler.g.cs b/CefGlue/Classes.g/CefAccessibilityHandler.g.cs
@@ -18,6 +18,8 @@ public abstract unsafe partial class CefAccessibilityHandler
         private int _refct;
         private cef_accessibility_handler_t* _self;
 
+        protected object SyncRoot { get { return this; } }
+
         private cef_accessibility_handler_t.add_ref_delegate _ds0;
         private cef_accessibility_handler_t.release_delegate _ds1;
         private cef_accessibility_handler_t.has_one_ref_delegate _ds2;
@@ -59,30 +61,38 @@ protected virtual void Dispose(bool disposing)
 
         private void add_ref(cef_accessibility_handler_t* self)
         {
-            if (Interlocked.Increment(ref _refct) == 1)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                var result = ++_refct;
+                if (result == 1)
+                {
+                    lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                }
             }
         }
 
         private int release(cef_accessibility_handler_t* self)
         {
-            if (Interlocked.Decrement(ref _refct) == 0)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Remove((IntPtr)_self); }
-                return 1;
+                var result = --_refct;
+                if (result == 0)
+                {
+                    lock (_roots) { _roots.Remove((IntPtr)_self); }
+                    return 1;
+                }
+                return 0;
             }
-            return 0;
         }
 
         private int has_one_ref(cef_accessibility_handler_t* self)
         {
-            return _refct == 1 ? 1 : 0;
+            lock (SyncRoot) { return _refct == 1 ? 1 : 0; }
         }
 
         private int has_at_least_one_ref(cef_accessibility_handler_t* self)
         {
-            return _refct != 0 ? 1 : 0;
+            lock (SyncRoot) { return _refct != 0 ? 1 : 0; }
         }
 
         internal cef_accessibility_handler_t* ToNative()

diff --git a/CefGlue/Classes.g/CefApp.g.cs b/CefGlue/Classes.g/CefApp.g.cs
@@ -18,6 +18,8 @@ public abstract unsafe partial class CefApp
         private int _refct;
         private cef_app_t* _self;
 
+        protected object SyncRoot { get { return this; } }
+
         private cef_app_t.add_ref_delegate _ds0;
         private cef_app_t.release_delegate _ds1;
         private cef_app_t.has_one_ref_delegate _ds2;
@@ -68,30 +70,38 @@ protected virtual void Dispose(bool disposing)
 
         private void add_ref(cef_app_t* self)
         {
-            if (Interlocked.Increment(ref _refct) == 1)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                var result = ++_refct;
+                if (result == 1)
+                {
+                    lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                }
             }
         }
 
         private int release(cef_app_t* self)
         {
-            if (Interlocked.Decrement(ref _refct) == 0)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Remove((IntPtr)_self); }
-                return 1;
+                var result = --_refct;
+                if (result == 0)
+                {
+                    lock (_roots) { _roots.Remove((IntPtr)_self); }
+                    return 1;
+                }
+                return 0;
             }
-            return 0;
         }
 
         private int has_one_ref(cef_app_t* self)
         {
-            return _refct == 1 ? 1 : 0;
+            lock (SyncRoot) { return _refct == 1 ? 1 : 0; }
         }
 
         private int has_at_least_one_ref(cef_app_t* self)
         {
-            return _refct != 0 ? 1 : 0;
+            lock (SyncRoot) { return _refct != 0 ? 1 : 0; }
         }
 
         internal cef_app_t* ToNative()

diff --git a/CefGlue/Classes.g/CefAudioHandler.g.cs b/CefGlue/Classes.g/CefAudioHandler.g.cs
@@ -18,6 +18,8 @@ public abstract unsafe partial class CefAudioHandler
         private int _refct;
         private cef_audio_handler_t* _self;
 
+        protected object SyncRoot { get { return this; } }
+
         private cef_audio_handler_t.add_ref_delegate _ds0;
         private cef_audio_handler_t.release_delegate _ds1;
         private cef_audio_handler_t.has_one_ref_delegate _ds2;
@@ -68,30 +70,38 @@ protected virtual void Dispose(bool disposing)
 
         private void add_ref(cef_audio_handler_t* self)
         {
-            if (Interlocked.Increment(ref _refct) == 1)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                var result = ++_refct;
+                if (result == 1)
+                {
+                    lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                }
             }
         }
 
         private int release(cef_audio_handler_t* self)
         {
-            if (Interlocked.Decrement(ref _refct) == 0)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Remove((IntPtr)_self); }
-                return 1;
+                var result = --_refct;
+                if (result == 0)
+                {
+                    lock (_roots) { _roots.Remove((IntPtr)_self); }
+                    return 1;
+                }
+                return 0;
             }
-            return 0;
         }
 
         private int has_one_ref(cef_audio_handler_t* self)
         {
-            return _refct == 1 ? 1 : 0;
+            lock (SyncRoot) { return _refct == 1 ? 1 : 0; }
         }
 
         private int has_at_least_one_ref(cef_audio_handler_t* self)
         {
-            return _refct != 0 ? 1 : 0;
+            lock (SyncRoot) { return _refct != 0 ? 1 : 0; }
         }
 
         internal cef_audio_handler_t* ToNative()

diff --git a/CefGlue/Classes.g/CefBrowserProcessHandler.g.cs b/CefGlue/Classes.g/CefBrowserProcessHandler.g.cs
@@ -18,6 +18,8 @@ public abstract unsafe partial class CefBrowserProcessHandler
         private int _refct;
         private cef_browser_process_handler_t* _self;
 
+        protected object SyncRoot { get { return this; } }
+
         private cef_browser_process_handler_t.add_ref_delegate _ds0;
         private cef_browser_process_handler_t.release_delegate _ds1;
         private cef_browser_process_handler_t.has_one_ref_delegate _ds2;
@@ -65,30 +67,38 @@ protected virtual void Dispose(bool disposing)
 
         private void add_ref(cef_browser_process_handler_t* self)
         {
-            if (Interlocked.Increment(ref _refct) == 1)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                var result = ++_refct;
+                if (result == 1)
+                {
+                    lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                }
             }
         }
 
         private int release(cef_browser_process_handler_t* self)
         {
-            if (Interlocked.Decrement(ref _refct) == 0)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Remove((IntPtr)_self); }
-                return 1;
+                var result = --_refct;
+                if (result == 0)
+                {
+                    lock (_roots) { _roots.Remove((IntPtr)_self); }
+                    return 1;
+                }
+                return 0;
             }
-            return 0;
         }
 
         private int has_one_ref(cef_browser_process_handler_t* self)
         {
-            return _refct == 1 ? 1 : 0;
+            lock (SyncRoot) { return _refct == 1 ? 1 : 0; }
         }
 
         private int has_at_least_one_ref(cef_browser_process_handler_t* self)
         {
-            return _refct != 0 ? 1 : 0;
+            lock (SyncRoot) { return _refct != 0 ? 1 : 0; }
         }
 
         internal cef_browser_process_handler_t* ToNative()

diff --git a/CefGlue/Classes.g/CefClient.g.cs b/CefGlue/Classes.g/CefClient.g.cs
@@ -18,6 +18,8 @@ public abstract unsafe partial class CefClient
         private int _refct;
         private cef_client_t* _self;
 
+        protected object SyncRoot { get { return this; } }
+
         internal static CefClient FromNativeOrNull(cef_client_t* ptr)
         {
             CefClient value = null;
@@ -130,30 +132,38 @@ protected virtual void Dispose(bool disposing)
 
         private void add_ref(cef_client_t* self)
         {
-            if (Interlocked.Increment(ref _refct) == 1)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                var result = ++_refct;
+                if (result == 1)
+                {
+                    lock (_roots) { _roots.Add((IntPtr)_self, this); }
+                }
             }
         }
 
         private int release(cef_client_t* self)
         {
-            if (Interlocked.Decrement(ref _refct) == 0)
+            lock (SyncRoot)
             {
-                lock (_roots) { _roots.Remove((IntPtr)_self); }
-                return 1;
+                var result = --_refct;
+                if (result == 0)
+                {
+                    lock (_roots) { _roots.Remove((IntPtr)_self); }
+                    return 1;
+                }
+                return 0;
             }
-            return 0;
         }
 
         private int has_one_ref(cef_client_t* self)
         {
-            return _refct == 1 ? 1 : 0;
+            lock (SyncRoot) { return _refct == 1 ? 1 : 0; }
         }
 
         private int has_at_least_one_ref(cef_client_t* self)
         {
-            return _refct != 0 ? 1 : 0;
+            lock (SyncRoot) { return _refct != 0 ? 1 : 0; }
         }
 
         internal cef_client_t* ToNative()