Skip to content

Commit

Permalink
Use NativeLibrary for all OSes
Browse files Browse the repository at this point in the history
  • Loading branch information
@imnasnainaec @jasonleenaylor
imnasnainaec authored and jasonleenaylor committed Jun 26, 2024
1 parent fddc930 commit ae7b5bd
Showing 1 changed file with 58 additions and 88 deletions.
146 changes: 58 additions & 88 deletions source/icu.net/NativeMethods/NativeMethods.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@ static NativeMethods()
[DllImport(LIBDL_NAME, SetLastError = true)]
private static extern IntPtr dlsym(IntPtr handle, string name);

[DllImport(LIBDL_NAME, EntryPoint = "dlerror")]
private static extern IntPtr _dlerror();

private static string dlerror()
{
// Don't free the string returned from _dlerror()!
var ptr = _dlerror();
return Marshal.PtrToStringAnsi(ptr);
}

#endregion

#region Native methods for Windows
Expand Down Expand Up @@ -256,7 +246,7 @@ private static bool LocateIcuLibrary(string libraryName)
}

var arch = IsRunning64Bit ? "x64" : "x86";
var platform = IsWindows ? "win" : IsMac? "osx" : "linux";
var platform = IsWindows ? "win" : IsMac ? "osx" : "linux";

// Look for ICU binaries in lib/{win,osx,linux}-{x86,x64} subdirectory first
if (CheckDirectoryForIcuBinaries(
Expand Down Expand Up @@ -328,66 +318,55 @@ private static IntPtr GetIcuLibHandle(string basename, int icuVersion)
return IntPtr.Zero;

IntPtr handle;
string libPath;
int lastError;
string loadMethod;

var libName = IsWindows
? $"{basename}{icuVersion}.dll"
: IsMac
? $"lib{basename}.{icuVersion}.dylib"
: $"lib{basename}.so.{icuVersion}";
var libPath = string.IsNullOrEmpty(_IcuPath) ? libName : Path.Combine(_IcuPath, libName);

#if NET6_0_OR_GREATER
loadMethod = "NativeLibrary.Load";
try
{
handle = NativeLibrary.Load(libPath);
}
catch (DllNotFoundException)
{
handle = IntPtr.Zero;
}
#else
if (IsWindows)
{
loadMethod = nameof(LoadLibraryEx);
var libName = $"{basename}{icuVersion}.dll";
var isIcuPathSpecified = !string.IsNullOrEmpty(_IcuPath);
libPath = isIcuPathSpecified ? Path.Combine(_IcuPath, libName) : libName;

var loadLibraryFlags = LoadLibraryFlags.NONE;

if (isIcuPathSpecified) loadLibraryFlags |= LoadLibraryFlags.LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LoadLibraryFlags.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS;

var loadLibraryFlags = string.IsNullOrEmpty(_IcuPath)
? LoadLibraryFlags.NONE
: LoadLibraryFlags.LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LoadLibraryFlags.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS;
handle = LoadLibraryEx(libPath, IntPtr.Zero, loadLibraryFlags);
lastError = Marshal.GetLastWin32Error();

Trace.WriteLineIf(handle == IntPtr.Zero && lastError != 0, $"Unable to load [{libPath}]. Error: {new Win32Exception(lastError).Message}");
}
else if (IsMac)
{
loadMethod = "NativeLibrary.Load";
var libName = $"lib{basename}.{icuVersion}.dylib";
libPath = string.IsNullOrEmpty(_IcuPath) ? libName : Path.Combine(_IcuPath, libName);
#if NET6_0_OR_GREATER
try
{
handle = NativeLibrary.Load(libPath);
}
catch (DllNotFoundException)
{
handle = IntPtr.Zero;
}
lastError = Marshal.GetLastWin32Error();
Trace.WriteLineIf(handle == IntPtr.Zero && lastError != 0, $"Unable to load [{libPath}]. Error: {lastError}");
#else
loadMethod = "(no load method)";
handle = IntPtr.Zero;
lastError = 0;
Trace.WriteLine($"Unable to load [{libPath}] on macOS without .NET 6 or higher.");
#endif
}
else
{
loadMethod = nameof(dlopen);
var libName = $"lib{basename}.so.{icuVersion}";
libPath = string.IsNullOrEmpty(_IcuPath) ? libName : Path.Combine(_IcuPath, libName);

handle = dlopen(libPath, RTLD_NOW);
lastError = Marshal.GetLastWin32Error();

Trace.WriteLineIf(handle == IntPtr.Zero && lastError != 0, $"Unable to load [{libPath}]. Error: {lastError} ({dlerror()})");
}
#endif

if (handle != IntPtr.Zero)
{
IcuVersion = icuVersion;
return handle;
}

lastError = Marshal.GetLastWin32Error();
Trace.WriteLineIf(lastError != 0, $"Unable to load [{libPath}]. Error: {lastError}");
Trace.TraceWarning($"{loadMethod} of {libPath} failed with error {lastError}");
icuVersion -= 1;
}
Expand Down Expand Up @@ -421,29 +400,27 @@ internal static void Cleanup()
// ignore failures - can happen when running unit tests
}

#if NET6_0_OR_GREATER
if (_IcuCommonLibHandle != IntPtr.Zero)
NativeLibrary.Free(_IcuCommonLibHandle);
if (_IcuI18NLibHandle != IntPtr.Zero)
NativeLibrary.Free(_IcuI18NLibHandle);
#else
if (IsWindows)
{
if (_IcuCommonLibHandle != IntPtr.Zero)
FreeLibrary(_IcuCommonLibHandle);
if (_IcuI18NLibHandle != IntPtr.Zero)
FreeLibrary(_IcuI18NLibHandle);
}
else if (IsMac)
{
#if NET6_0_OR_GREATER
if (_IcuCommonLibHandle != IntPtr.Zero)
NativeLibrary.Free(_IcuCommonLibHandle);
if (_IcuI18NLibHandle != IntPtr.Zero)
NativeLibrary.Free(_IcuI18NLibHandle);
#endif
}
else
else if (!IsMac)
{
if (_IcuCommonLibHandle != IntPtr.Zero)
dlclose(_IcuCommonLibHandle);
if (_IcuI18NLibHandle != IntPtr.Zero)
dlclose(_IcuI18NLibHandle);
}
#endif
_IcuCommonLibHandle = IntPtr.Zero;
_IcuI18NLibHandle = IntPtr.Zero;
}
Expand All @@ -470,51 +447,44 @@ private static void ResetIcuVersionInfo()
// This method is thread-safe and idempotent
private static T GetMethod<T>(IntPtr handle, string methodName, bool missingInMinimal = false) where T : class
{
var versionedMethodName = $"{methodName}_{IcuVersion}";
IntPtr methodPointer;
if (IsWindows)
methodPointer = GetProcAddress(handle, versionedMethodName);
else if (IsMac)
{

var versionedMethodName = $"{methodName}_{IcuVersion}";
#if NET6_0_OR_GREATER
try
{
NativeLibrary.TryGetExport(handle, versionedMethodName, out methodPointer);
}
catch (DllNotFoundException)
{
methodPointer = IntPtr.Zero;
}
#else
try
{
NativeLibrary.TryGetExport(handle, versionedMethodName, out methodPointer);
}
catch (DllNotFoundException)
{
methodPointer = IntPtr.Zero;
#endif
}
else
methodPointer = dlsym(handle, versionedMethodName);
#else
methodPointer = IsWindows
? GetProcAddress(handle, versionedMethodName)
: IsMac
? IntPtr.Zero
: dlsym(handle, versionedMethodName);
#endif

// Some systems (eg. Tizen) don't use methods with IcuVersion suffix
if (methodPointer == IntPtr.Zero)
{
if (IsWindows)
methodPointer = GetProcAddress(handle, methodName);
else if (IsMac)
{
#if NET6_0_OR_GREATER
try
{
NativeLibrary.TryGetExport(handle, methodName, out methodPointer);
}
catch (DllNotFoundException)
{
methodPointer = IntPtr.Zero;
}
catch (DllNotFoundException) {};
#else
methodPointer = IntPtr.Zero;
methodPointer = IsWindows
? GetProcAddress(handle, methodName)
: IsMac
? IntPtr.Zero
: dlsym(handle, methodName);
#endif
}
else
methodPointer = dlsym(handle, methodName);
}

if (methodPointer != IntPtr.Zero)
{
// NOTE: Starting in .NET 4.5.1, Marshal.GetDelegateForFunctionPointer(IntPtr, Type) is obsolete.
Expand Down Expand Up @@ -680,7 +650,7 @@ private class MethodsContainer

[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
internal delegate void u_setDataDirectoryDelegate(
[MarshalAs(UnmanagedType.LPStr)]string directory);
[MarshalAs(UnmanagedType.LPStr)] string directory);

[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
internal delegate int u_charNameDelegate(
Expand Down Expand Up @@ -826,7 +796,7 @@ internal static IntPtr u_getDataDirectory()

/// <summary>Set the ICU data directory</summary>
internal static void u_setDataDirectory(
[MarshalAs(UnmanagedType.LPStr)]string directory)
[MarshalAs(UnmanagedType.LPStr)] string directory)
{
if (Methods.u_setDataDirectory == null)
Methods.u_setDataDirectory = GetMethod<MethodsContainer.u_setDataDirectoryDelegate>(IcuCommonLibHandle, "u_setDataDirectory");
Expand Down

0 comments on commit ae7b5bd

Please sign in to comment.