From 38f5f2495236407da5c90c8fdb4c5535ef6eb2bc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 20 Aug 2018 13:49:44 -0400 Subject: [PATCH] ThreadSafeDisposable - add name property and check_not_disposed method --- src/client/spark_core/utils/AnonymousDisposable.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/client/spark_core/utils/AnonymousDisposable.cs b/src/client/spark_core/utils/AnonymousDisposable.cs index 0a684920f..547ad2769 100644 --- a/src/client/spark_core/utils/AnonymousDisposable.cs +++ b/src/client/spark_core/utils/AnonymousDisposable.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -138,13 +139,21 @@ namespace mbts class ThreadSafeDisposable : IDisposable { int _state = 0; readonly Action _dispose_once; + readonly string _name; - public ThreadSafeDisposable(Action dispose_once) => + public ThreadSafeDisposable(Action dispose_once, [CallerMemberName]string name = "Anonymous") { + _name = name; _dispose_once = dispose_once; + } public bool has_dispose_started => _state > 0; public bool has_dispose_finished { get; private set; } + public void check_not_disposed() { + if (has_dispose_finished) + throw new ObjectDisposedException($"{_name}'s {nameof(ThreadSafeDisposable)}"); + } + public void Dispose() { if (Interlocked.Increment(ref _state) == 1) { _dispose_once();