debug Destructor #131

dotnetcore · Nov 15, 2019 · 7d1f9b1 · 7d1f9b1
1 parent 6a606a8
commit 7d1f9b1
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 98 deletions.
diff --git a/FreeSql.DbContext/DbContext/DbContext.cs b/FreeSql.DbContext/DbContext/DbContext.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Threading;
 
 namespace FreeSql
 {
@@ -200,11 +201,10 @@ internal class ExecCommandInfo
         #endregion
 
         ~DbContext() => this.Dispose();
-        bool _isdisposed = false;
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
-            _isdisposed = true;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             try
             {
                 _actions.Clear();

diff --git a/FreeSql.DbContext/DbSet/DbSet.cs b/FreeSql.DbContext/DbSet/DbSet.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Threading;
 
 namespace FreeSql
 {
@@ -36,11 +37,10 @@ protected virtual ISelect<TEntity> OrmSelect(object dywhere)
         }
 
         ~DbSet() => this.Dispose();
-        bool _isdisposed = false;
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
-            _isdisposed = true;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             try
             {
                 this._dicUpdateTimes.Clear();

diff --git a/FreeSql.DbContext/Repository/DataFilter/DataFilter.cs b/FreeSql.DbContext/Repository/DataFilter/DataFilter.cs
@@ -144,10 +144,7 @@ public bool IsEnabled(string filterName)
             return _filters.TryGetValue(filterName, out var tryfi) ? tryfi.IsEnabled : false;
         }
 
-        ~DataFilter()
-        {
-            this.Dispose();
-        }
+        ~DataFilter() => this.Dispose();
         public void Dispose()
         {
             _filters.Clear();
@@ -169,10 +166,7 @@ public class FluentDataFilter : IDisposable
             return this;
         }
 
-        ~FluentDataFilter()
-        {
-            this.Dispose();
-        }
+        ~FluentDataFilter() => this.Dispose();
         public void Dispose()
         {
             _filters.Clear();

diff --git a/FreeSql.DbContext/Repository/Repository/BaseRepository.cs b/FreeSql.DbContext/Repository/Repository/BaseRepository.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FreeSql
@@ -42,11 +43,10 @@ protected BaseRepository(IFreeSql fsql, Expression<Func<TEntity, bool>> filter,
         }
 
         ~BaseRepository() => this.Dispose();
-        bool _isdisposed = false;
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
-            _isdisposed = true;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             try
             {
                 _dbsetPriv?.Dispose();

diff --git a/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs b/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs
@@ -105,18 +105,20 @@ public void Rollback()
 
         public DbContext.EntityChangeReport EntityChangeReport { get; } = new DbContext.EntityChangeReport();
 
-        ~UnitOfWork()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~UnitOfWork() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
-            _isdisposed = true;
-            this.Rollback();
-            this.Close();
-            GC.SuppressFinalize(this);
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
+            try
+            {
+                this.Rollback();
+                this.Close();
+            }
+            finally
+            {
+                GC.SuppressFinalize(this);
+            }
         }
     }
 }
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderTransaction.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderTransaction.cs
@@ -120,14 +120,11 @@ public void Transaction(Action handler, TimeSpan timeout)
             }
         }
 
-        ~AdoProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~AdoProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             try
             {
                 Transaction2[] trans = null;

diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -10,6 +10,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FreeSql.Internal.CommonProvider
@@ -38,11 +39,10 @@ public abstract partial class Select0Provider<TSelect, T1> : ISelect0<TSelect, T
         protected List<LambdaExpression> _whereCascadeExpression = new List<LambdaExpression>();
         protected List<GlobalFilter.Item> _whereGlobalFilter;
 
-        bool _isDisponse = false;
+        int _disposeCounter;
         ~Select0Provider()
         {
-            if (_isDisponse) return;
-            _isDisponse = false;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             _where.Clear();
             _params.Clear();
             _tables.Clear();

diff --git a/Providers/FreeSql.Provider.MySql/MySqlProvider.cs b/Providers/FreeSql.Provider.MySql/MySqlProvider.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq.Expressions;
+using System.Threading;
 
 namespace FreeSql.MySql
 {
@@ -73,14 +74,11 @@ public MySqlProvider(string masterConnectionString, string[] slaveConnectionStri
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~MySqlProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~MySqlProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }

diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcProvider.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcProvider.cs
@@ -1,10 +1,11 @@
 using FreeSql.Internal;
 using FreeSql.Internal.CommonProvider;
+using FreeSql.Odbc.Default;
 using System;
-using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Linq;
-using FreeSql.Odbc.Default;
+using System.Threading;
 
 namespace FreeSql.Odbc.Default
 {
@@ -86,14 +87,11 @@ public OdbcProvider(string masterConnectionString, string[] slaveConnectionStrin
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~OdbcProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~OdbcProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             try
             {
                 (this.Ado as AdoProvider)?.Dispose();

diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlProvider.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlProvider.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq.Expressions;
+using System.Threading;
 
 namespace FreeSql.Odbc.MySql
 {
@@ -51,14 +52,11 @@ public OdbcMySqlProvider(string masterConnectionString, string[] slaveConnection
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~OdbcMySqlProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~OdbcMySqlProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }

diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleProvider.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleProvider.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Threading;
 
 namespace FreeSql.Odbc.Oracle
 {
@@ -52,14 +53,11 @@ public OdbcOracleProvider(string masterConnectionString, string[] slaveConnectio
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~OdbcOracleProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~OdbcOracleProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }

diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLProvider.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLProvider.cs
@@ -2,6 +2,7 @@
 using FreeSql.Internal.CommonProvider;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace FreeSql.Odbc.PostgreSQL
 {
@@ -49,14 +50,11 @@ public OdbcPostgreSQLProvider(string masterConnectionString, string[] slaveConne
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~OdbcPostgreSQLProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~OdbcPostgreSQLProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }

diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerProvider.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerProvider.cs
@@ -2,6 +2,7 @@
 using FreeSql.Internal.CommonProvider;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace FreeSql.Odbc.SqlServer
 {
@@ -57,14 +58,11 @@ public OdbcSqlServerProvider(string masterConnectionString, string[] slaveConnec
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~OdbcSqlServerProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~OdbcSqlServerProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }

diff --git a/Providers/FreeSql.Provider.Oracle/OracleProvider.cs b/Providers/FreeSql.Provider.Oracle/OracleProvider.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Threading;
 
 namespace FreeSql.Oracle
 {
@@ -47,14 +48,11 @@ public OracleProvider(string masterConnectionString, string[] slaveConnectionStr
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~OracleProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~OracleProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }

diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLProvider.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLProvider.cs
@@ -11,6 +11,7 @@
 using System.Linq.Expressions;
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Threading;
 
 namespace FreeSql.PostgreSQL
 {
@@ -100,14 +101,11 @@ public PostgreSQLProvider(string masterConnectionString, string[] slaveConnectio
 
         public GlobalFilter GlobalFilter { get; } = new GlobalFilter();
 
-        ~PostgreSQLProvider()
-        {
-            this.Dispose();
-        }
-        bool _isdisposed = false;
+        ~PostgreSQLProvider() => this.Dispose();
+        int _disposeCounter;
         public void Dispose()
         {
-            if (_isdisposed) return;
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
             (this.Ado as AdoProvider)?.Dispose();
         }
     }