Deukhoofd
/
PorygonSharp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix static delegate functions being garbage collected

This commit is contained in:
Deukhoofd 2019-09-22 12:30:08 +02:00
parent b6934d153a
commit 601fec8048
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PorygonSharp/EvalValues/DelegateEvalValue.cs
View File

@ -5,21 +5,21 @@ using PorygonSharp.Utilities;
namespace PorygonSharp.EvalValues
{
public class DelegateEvalValue
public class DelegateEvalValue : EvalValue
{
private delegate IntPtr InvokeDelegate(IntPtr _, IntPtr options,
[MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)]IntPtr[] parameters, int parameterCount);
private readonly Delegate _delegate;
private readonly InvokeDelegate _handler;
public readonly IntPtr Pointer;
private readonly IntPtr _funcPtr;
public DelegateEvalValue(Delegate del)
{
_delegate = del;
_handler = Invoke;
var funcPtr = Marshal.GetFunctionPointerForDelegate(_handler);
Pointer = EvalValueCreator.CreateFunctionEvalValue(funcPtr, IntPtr.Zero);
_funcPtr = Marshal.GetFunctionPointerForDelegate(_handler);
Handle = EvalValueCreator.CreateFunctionEvalValue(_funcPtr, IntPtr.Zero);
}
private IntPtr Invoke(IntPtr _, IntPtr options, IntPtr[] parPtrs, int parameterCount)
@ -35,7 +35,5 @@ namespace PorygonSharp.EvalValues
var result = _delegate.DynamicInvoke(parameters);
return EvalValueCreator.CreateValue(result).GetPointer();
}
}
}

32
PorygonSharp/EvalValues/EvalValue.cs
View File

@ -6,49 +6,51 @@ namespace PorygonSharp.EvalValues
{
public class EvalValue : IDisposable
{
private IntPtr _handle;
protected IntPtr Handle;
public EvalValue(IntPtr handle)
{
_handle = handle;
Handle = handle;
}
protected EvalValue(){}
public void Dispose()
{
if (_handle != IntPtr.Zero)
if (Handle != IntPtr.Zero)
{
Marshal.FreeHGlobal(_handle);
_handle = IntPtr.Zero;
Marshal.FreeHGlobal(Handle);
Handle = IntPtr.Zero;
}
}
public TypeClass GetTypeClass()
{
return (TypeClass)GetTypeClass(_handle);
return (TypeClass)GetTypeClass(Handle);
}
public long EvaluateInteger()
{
return EvaluateInteger(_handle);
return EvaluateInteger(Handle);
}
public double EvaluateFloat()
{
return EvaluateFloat(_handle);
return EvaluateFloat(Handle);
}
public bool EvaluateBool()
{
return EvaluateBool(_handle) == 1;
return EvaluateBool(Handle) == 1;
}
public string EvaluateString()
{
var stringLength = GetStringLength(_handle);
var stringLength = GetStringLength(Handle);
// The library uses 16 bit chars for strings, so create a byte array of twice the length given.
var byteArr = new byte[stringLength * 2];
var result = EvaluateString(_handle, byteArr, stringLength);
var result = EvaluateString(Handle, byteArr, stringLength);
if (result != 0)
{
throw new Exception("Something went wrong while evaluating a string.");
@ -59,13 +61,13 @@ namespace PorygonSharp.EvalValues
private object EvaluateGenericObject()
{
var ptr = EvaluateUserDataObj(_handle);
var ptr = EvaluateUserDataObj(Handle);
return GCHandle.FromIntPtr(ptr).Target;
}
public object GetObjectValue()
{
if (_handle == IntPtr.Zero)
if (Handle == IntPtr.Zero)
return null;
switch (GetTypeClass())
{
@ -80,7 +82,7 @@ namespace PorygonSharp.EvalValues
case TypeClass.UserData:
return EvaluateGenericObject();
case TypeClass.Table:
var val = new TableEvalValue(_handle);
var val = new TableEvalValue(Handle);
return val.EvaluateNumericalTable();
default:
throw new ArgumentOutOfRangeException();
@ -89,7 +91,7 @@ namespace PorygonSharp.EvalValues
internal IntPtr GetPointer()
{
return _handle;
return Handle;
}
[DllImport("PorygonLang", EntryPoint = "GetEvalValueTypeClass", CallingConvention = CallingConvention.Cdecl)]

3
PorygonSharp/EvalValues/EvalValueCreator.cs
View File

@ -80,8 +80,7 @@ namespace PorygonSharp.EvalValues
private static EvalValue CreateDelegateEvalValue(Delegate del)
{
var val = new DelegateEvalValue(del);
return new EvalValue(val.Pointer);
return new DelegateEvalValue(del);
}
[DllImport("PorygonLang", EntryPoint = "CreateNilEvalValue",CallingConvention = CallingConvention.Cdecl)]

2
PorygonSharp/StaticScope.cs
View File

@ -10,6 +10,7 @@ namespace PorygonSharp
public static class StaticScope
{
private static List<object> _variables = new List<object>();
private static List<EvalValue> _evalValues = new List<EvalValue>();
public static void RegisterStaticVariable(string name, object o)
{
var type = o.GetType();
@ -19,6 +20,7 @@ namespace PorygonSharp
var hash = name.ScriptHash();
var value = EvalValueCreator.CreateValue(o);
_variables.Add(o);
_evalValues.Add(value);
RegisterStaticVariable(hash, scriptType.Value, value.GetPointer());
}

1
PorygonSharp/Utilities/Caster.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using PorygonSharp.EvalValues;
namespace PorygonSharp.Utilities