[csharp,iOS] Fix callbacks on AOT #386

Closed
rmarinho wants to merge 6 commits from fix-logger-xamarinios into master
3 changed files with 61 additions and 23 deletions
Showing only changes of commit 7cbfecd6a9 - Show all commits

View File

@@ -8,17 +8,14 @@
*/ */
using System; using System;
using System.Runtime.InteropServices;
namespace Facebook.Yoga namespace Facebook.Yoga
{ {
internal static class YogaLogger internal static class YogaLogger
{ {
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void Func(YogaLogLevel level, string message); public delegate void Func(YogaLogLevel level, string message);
private static bool _initialized; private static bool _initialized;
private static Func _managedLogger = null;
public static Func Logger = null; public static Func Logger = null;
@@ -26,31 +23,16 @@ namespace Facebook.Yoga
{ {
if (!_initialized) if (!_initialized)
{ {
_managedLogger = (level, message) => {
if (Logger != null)
{
Logger(level, message);
}
if (level == YogaLogLevel.Error) Native.YGInteropSetLogger(LoggerInternal);
{
throw new InvalidOperationException(message);
}
};
#if __IOS__
Native.YGInteropSetLogger(ManagedLogger);
#else
Native.YGInteropSetLogger(_managedLogger);
#endif
_initialized = true; _initialized = true;
} }
} }
#if __IOS__ #if __IOS__
delegate void ManagedLoggerCallback(YogaLogLevel level, string message); [ObjCRuntime.MonoPInvokeCallback(typeof(Func))]
#endif
[ObjCRuntime.MonoPInvokeCallback(typeof(ManagedLoggerCallback))] public static void LoggerInternal(YogaLogLevel level, string message)
public static void ManagedLogger(YogaLogLevel level, string message)
{ {
if (Logger != null) if (Logger != null)
{ {
@@ -62,6 +44,6 @@ namespace Facebook.Yoga
throw new InvalidOperationException(message); throw new InvalidOperationException(message);
} }
} }
#endif
} }
} }