Skip to content
This repository has been archived by the owner on Apr 6, 2020. It is now read-only.

Commit

Permalink
Remove stack logs (#321)
Browse files Browse the repository at this point in the history 
* Remove stack logs

* Fix
  • Loading branch information
@shargon
shargon committed Aug 17, 2018
1 parent a2b5950 commit 34c676a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 171 deletions.
43 changes: 0 additions & 43 deletions src/NeoSharp.VM.Interop/Types/ExecutionContext.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using NeoSharp.VM.Interop.Extensions;
using NeoSharp.VM.Interop.Types.Collections;
using Newtonsoft.Json;

Expand Down Expand Up @@ -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);
}
}

/// <summary>
/// Internal callback for OnAltStackChange
/// </summary>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
void InternalOnAltStackChange(IntPtr item, int index, byte operation)
{
using (var it = Engine.ConvertFromNative(item))
{
Engine.Logger.RaiseOnAltStackChange(_AltStack, it, index, (ELogStackOperation)operation);
}
}

/// <summary>
/// Internal callback for OnEvaluationStackChange
/// </summary>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
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
Expand Down
41 changes: 0 additions & 41 deletions src/NeoSharp.VM.Interop/Types/ExecutionEngine.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
}
}

Expand All @@ -136,34 +123,6 @@ void InternalOnStepInto(IntPtr it)
}
}

/// <summary>
/// Internal callback for OnExecutionContextChange
/// </summary>
/// <param name="it">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
void InternalOnExecutionContextChange(IntPtr it, int index, byte operation)
{
using (var context = new ExecutionContext(this, it))
{
Logger.RaiseOnExecutionContextChange(_InvocationStack, context, index, (ELogStackOperation)operation);
}
}

/// <summary>
/// Internal callback for OnResultStackChange
/// </summary>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
void InternalOnResultStackChange(IntPtr item, int index, byte operation)
{
using (var it = this.ConvertFromNative(item))
{
Logger.RaiseOnResultStackChange(_ResultStack, it, index, (ELogStackOperation)operation);
}
}

/// <summary>
/// Get message callback
/// </summary>
Expand Down
28 changes: 1 addition & 27 deletions src/NeoSharp.VM/Enums/ELogVerbosity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,6 @@ public enum ELogVerbosity : byte
/// <summary>
/// Enable step into logs
/// </summary>
StepInto = 0x01,

/// <summary>
/// ExecutionContextStack changes
/// </summary>
ExecutionContextStackChanges = 0x02,
/// <summary>
/// EvaluationStack changes
/// </summary>
EvaluationStackChanges = 0x04,
/// <summary>
/// AltStack changes
/// </summary>
AltStackChanges = 0x08,
/// <summary>
/// ResultStack changes
/// </summary>
ResultStackChanges = 0x10,

/// <summary>
/// All
/// </summary>
All = StepInto | ExecutionContextStackChanges | EvaluationStackChanges | AltStackChanges| ResultStackChanges,
/// <summary>
/// Stack changes
/// </summary>
StackChanges = ExecutionContextStackChanges | EvaluationStackChanges | AltStackChanges | ResultStackChanges,
StepInto = 0x01
}
}
60 changes: 0 additions & 60 deletions src/NeoSharp.VM/Types/ExecutionEngineLogger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,6 @@ public class ExecutionEngineLogger
/// On StepInto
/// </summary>
public event delOnStepInto OnStepInto;
/// <summary>
/// On ExecutionContextChange
/// </summary>
public event delOnExecutionContextStackChange OnExecutionContextChange;
/// <summary>
/// On AltStackChange
/// </summary>
public event delOnStackItemsStackChange OnAltStackChange;
/// <summary>
/// On EvaluationStackChange
/// </summary>
public event delOnStackItemsStackChange OnEvaluationStackChange;
/// <summary>
/// On ResultStackChange
/// </summary>
public event delOnStackItemsStackChange OnResultStackChange;

#endregion

Expand All @@ -59,50 +43,6 @@ public virtual void RaiseOnStepInto(IExecutionContext context)
{
OnStepInto?.Invoke(context);
}
/// <summary>
/// Raise OnExecutionContextChange
/// </summary>
/// <param name="stack">Stack</param>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
public virtual void RaiseOnExecutionContextChange(IStack<IExecutionContext> stack, IExecutionContext item, int index, ELogStackOperation operation)
{
OnExecutionContextChange?.Invoke(stack, item, index, operation);
}
/// <summary>
/// Raise OnResultStackChange
/// </summary>
/// <param name="stack">Stack</param>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
public virtual void RaiseOnResultStackChange(IStackItemsStack stack, IStackItem item, int index, ELogStackOperation operation)
{
OnResultStackChange?.Invoke(stack, item, index, operation);
}
/// <summary>
/// Raise OnAltStackChange
/// </summary>
/// <param name="stack">Stack</param>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
public virtual void RaiseOnAltStackChange(IStackItemsStack stack, IStackItem item, int index, ELogStackOperation operation)
{
OnAltStackChange?.Invoke(stack, item, index, operation);
}
/// <summary>
/// Raise OnEvaluationStackChange
/// </summary>
/// <param name="stack">Stack</param>
/// <param name="item">Item</param>
/// <param name="index">Index</param>
/// <param name="operation">Operation</param>
public virtual void RaiseOnEvaluationStackChange(IStackItemsStack stack, IStackItem item, int index, ELogStackOperation operation)
{
OnEvaluationStackChange?.Invoke(stack, item, index, operation);
}

#endregion
}
Expand Down

0 comments on commit 34c676a

Please sign in to comment.