Skip to content

Add dlopen command. #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelcfanning wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add dlopen command. #774

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d027d
Add dlopen command.
michaelcfanning Jun 22, 2023
b67212b
Fix Linux loading Windows bin and Windows loading Linux bin
shaopeng-gh Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Src/RE2.Managed/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ static NativeMethods()
string platform =
RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "win" : "linux";

if (platform == "linux")
{
return;
}
bool isWindows = platform == "win";

// Strictly speaking we don't need any platform-specific code here. I leave
// it just in case we find out that we *do* need to perform the Linux
Expand All @@ -34,26 +31,26 @@ static NativeMethods()

if (File.Exists(filePath))
{
LoadLibrary(filePath);
if (isWindows) { LoadLibrary(filePath); } else { LinuxMethods.dlopen(filePath, LinuxMethods.RTLD_NOW); }
}
}
else if (platform == "win")
else
{
string driverDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

// Load if next to this binary
string dllAdjacent = Path.Combine(driverDirectory, dllName);
if (File.Exists(dllAdjacent))
{
LoadLibrary(dllAdjacent);
if (isWindows) { LoadLibrary(dllAdjacent); } else { LinuxMethods.dlopen(dllAdjacent, LinuxMethods.RTLD_NOW); }
}

// Load if in runtimes subdirectory
string runtimeFolder = Environment.Is64BitProcess ? @$"runtimes\{platform}-x64\native" : @$"runtimes\{platform}-x86\native";
string dllInRuntime = Path.Combine(driverDirectory, runtimeFolder, dllName);
if (File.Exists(dllInRuntime))
{
LoadLibrary(dllInRuntime);
if (isWindows) { LoadLibrary(dllInRuntime); } else { LinuxMethods.dlopen(dllInRuntime, LinuxMethods.RTLD_NOW); }
}
}
}
Expand Down Expand Up @@ -148,6 +145,12 @@ public static unsafe void MatchesCaptureGroupsDispose(MatchesCaptureGroupsOutput

private static class LinuxMethods
{
public const int RTLD_NOW = 0x002;

[SuppressUnmanagedCodeSecurity]
[DllImport("libdl", ExactSpelling = true)]
public static unsafe extern IntPtr dlopen(string fileName, int flags);

[SuppressUnmanagedCodeSecurity]
[DllImport("libre2.so", PreserveSig = true, CallingConvention = CallingConvention.Cdecl)]
public static unsafe extern int Test();
Expand Down