From 34c676aad4bce133f64b8234180fd4014ee76377 Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 17 Aug 2018 10:56:46 +0200 Subject: [PATCH] Remove stack logs (#321) * Remove stack logs * Fix --- .../Types/ExecutionContext.cs | 43 ------------- .../Types/ExecutionEngine.cs | 41 ------------- src/NeoSharp.VM/Enums/ELogVerbosity.cs | 28 +-------- .../Types/ExecutionEngineLogger.cs | 60 ------------------- 4 files changed, 1 insertion(+), 171 deletions(-) diff --git a/src/NeoSharp.VM.Interop/Types/ExecutionContext.cs b/src/NeoSharp.VM.Interop/Types/ExecutionContext.cs index 25f291b2..69e3b955 100644 --- a/src/NeoSharp.VM.Interop/Types/ExecutionContext.cs +++ b/src/NeoSharp.VM.Interop/Types/ExecutionContext.cs @@ -1,5 +1,4 @@ using System; -using NeoSharp.VM.Interop.Extensions; using NeoSharp.VM.Interop.Types.Collections; using Newtonsoft.Json; @@ -101,48 +100,6 @@ internal ExecutionContext(ExecutionEngine engine, IntPtr handle) : base(engine) _AltStack = new StackItemStack(Engine, altHandle); _EvaluationStack = new StackItemStack(Engine, evHandle); - - if (engine.Logger == null) return; - - if (engine.Logger.Verbosity.HasFlag(ELogVerbosity.AltStackChanges)) - { - _InternalOnAltStackChange = new NeoVM.OnStackChangeCallback(InternalOnAltStackChange); - NeoVM.StackItems_AddLog(altHandle, _InternalOnAltStackChange); - } - - if (engine.Logger.Verbosity.HasFlag(ELogVerbosity.EvaluationStackChanges)) - { - _InternalOnEvaluationStackChange = new NeoVM.OnStackChangeCallback(InternalOnEvaluationStackChange); - NeoVM.StackItems_AddLog(evHandle, _InternalOnEvaluationStackChange); - } - } - - /// - /// Internal callback for OnAltStackChange - /// - /// Item - /// Index - /// Operation - void InternalOnAltStackChange(IntPtr item, int index, byte operation) - { - using (var it = Engine.ConvertFromNative(item)) - { - Engine.Logger.RaiseOnAltStackChange(_AltStack, it, index, (ELogStackOperation)operation); - } - } - - /// - /// Internal callback for OnEvaluationStackChange - /// - /// Item - /// Index - /// Operation - void InternalOnEvaluationStackChange(IntPtr item, int index, byte operation) - { - using (var it = Engine.ConvertFromNative(item)) - { - Engine.Logger.RaiseOnEvaluationStackChange(_EvaluationStack, it, index, (ELogStackOperation)operation); - } } #region IDisposable Support diff --git a/src/NeoSharp.VM.Interop/Types/ExecutionEngine.cs b/src/NeoSharp.VM.Interop/Types/ExecutionEngine.cs index 1b5ce349..7377fd86 100644 --- a/src/NeoSharp.VM.Interop/Types/ExecutionEngine.cs +++ b/src/NeoSharp.VM.Interop/Types/ExecutionEngine.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Numerics; using System.Runtime.InteropServices; -using NeoSharp.VM.Interop.Extensions; using NeoSharp.VM.Interop.Types.Collections; using NeoSharp.VM.Interop.Types.StackItems; @@ -109,18 +108,6 @@ public ExecutionEngine(ExecutionEngineArgs e) : base(e) _InternalOnStepInto = new NeoVM.OnStepIntoCallback(InternalOnStepInto); NeoVM.ExecutionEngine_AddLog(Handle, _InternalOnStepInto); } - - if (Logger.Verbosity.HasFlag(ELogVerbosity.ExecutionContextStackChanges)) - { - _InternalOnExecutionContextChange = new NeoVM.OnStackChangeCallback(InternalOnExecutionContextChange); - NeoVM.ExecutionContextStack_AddLog(invHandle, _InternalOnExecutionContextChange); - } - - if (Logger.Verbosity.HasFlag(ELogVerbosity.ResultStackChanges)) - { - _InternalOnResultStackChange = new NeoVM.OnStackChangeCallback(InternalOnResultStackChange); - NeoVM.StackItems_AddLog(resHandle, _InternalOnResultStackChange); - } } } @@ -136,34 +123,6 @@ void InternalOnStepInto(IntPtr it) } } - /// - /// Internal callback for OnExecutionContextChange - /// - /// Item - /// Index - /// Operation - void InternalOnExecutionContextChange(IntPtr it, int index, byte operation) - { - using (var context = new ExecutionContext(this, it)) - { - Logger.RaiseOnExecutionContextChange(_InvocationStack, context, index, (ELogStackOperation)operation); - } - } - - /// - /// Internal callback for OnResultStackChange - /// - /// Item - /// Index - /// Operation - void InternalOnResultStackChange(IntPtr item, int index, byte operation) - { - using (var it = this.ConvertFromNative(item)) - { - Logger.RaiseOnResultStackChange(_ResultStack, it, index, (ELogStackOperation)operation); - } - } - /// /// Get message callback /// diff --git a/src/NeoSharp.VM/Enums/ELogVerbosity.cs b/src/NeoSharp.VM/Enums/ELogVerbosity.cs index 93357f60..02e29558 100644 --- a/src/NeoSharp.VM/Enums/ELogVerbosity.cs +++ b/src/NeoSharp.VM/Enums/ELogVerbosity.cs @@ -13,32 +13,6 @@ public enum ELogVerbosity : byte /// /// Enable step into logs /// - StepInto = 0x01, - - /// - /// ExecutionContextStack changes - /// - ExecutionContextStackChanges = 0x02, - /// - /// EvaluationStack changes - /// - EvaluationStackChanges = 0x04, - /// - /// AltStack changes - /// - AltStackChanges = 0x08, - /// - /// ResultStack changes - /// - ResultStackChanges = 0x10, - - /// - /// All - /// - All = StepInto | ExecutionContextStackChanges | EvaluationStackChanges | AltStackChanges| ResultStackChanges, - /// - /// Stack changes - /// - StackChanges = ExecutionContextStackChanges | EvaluationStackChanges | AltStackChanges | ResultStackChanges, + StepInto = 0x01 } } \ No newline at end of file diff --git a/src/NeoSharp.VM/Types/ExecutionEngineLogger.cs b/src/NeoSharp.VM/Types/ExecutionEngineLogger.cs index fdeae0c7..e7bfe4a7 100644 --- a/src/NeoSharp.VM/Types/ExecutionEngineLogger.cs +++ b/src/NeoSharp.VM/Types/ExecutionEngineLogger.cs @@ -17,22 +17,6 @@ public class ExecutionEngineLogger /// On StepInto /// public event delOnStepInto OnStepInto; - /// - /// On ExecutionContextChange - /// - public event delOnExecutionContextStackChange OnExecutionContextChange; - /// - /// On AltStackChange - /// - public event delOnStackItemsStackChange OnAltStackChange; - /// - /// On EvaluationStackChange - /// - public event delOnStackItemsStackChange OnEvaluationStackChange; - /// - /// On ResultStackChange - /// - public event delOnStackItemsStackChange OnResultStackChange; #endregion @@ -59,50 +43,6 @@ public virtual void RaiseOnStepInto(IExecutionContext context) { OnStepInto?.Invoke(context); } - /// - /// Raise OnExecutionContextChange - /// - /// Stack - /// Item - /// Index - /// Operation - public virtual void RaiseOnExecutionContextChange(IStack stack, IExecutionContext item, int index, ELogStackOperation operation) - { - OnExecutionContextChange?.Invoke(stack, item, index, operation); - } - /// - /// Raise OnResultStackChange - /// - /// Stack - /// Item - /// Index - /// Operation - public virtual void RaiseOnResultStackChange(IStackItemsStack stack, IStackItem item, int index, ELogStackOperation operation) - { - OnResultStackChange?.Invoke(stack, item, index, operation); - } - /// - /// Raise OnAltStackChange - /// - /// Stack - /// Item - /// Index - /// Operation - public virtual void RaiseOnAltStackChange(IStackItemsStack stack, IStackItem item, int index, ELogStackOperation operation) - { - OnAltStackChange?.Invoke(stack, item, index, operation); - } - /// - /// Raise OnEvaluationStackChange - /// - /// Stack - /// Item - /// Index - /// Operation - public virtual void RaiseOnEvaluationStackChange(IStackItemsStack stack, IStackItem item, int index, ELogStackOperation operation) - { - OnEvaluationStackChange?.Invoke(stack, item, index, operation); - } #endregion }