Skip to content

Use libc iso libdl on newer glibc versions #1612

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

Merged
merged 1 commit into from
Dec 10, 2022
Merged

Use libc iso libdl on newer glibc versions #1612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 52 additions & 12 deletions Src/IronPython.Modules/_ctypes/NativeFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,72 @@ public static void MemCopy(IntPtr destination, IntPtr source, IntPtr length) {
}

// unix entry points, VM needs to map the filenames.
[DllImport("libdl")]
[DllImport("libc")]
private static extern IntPtr dlopen(string filename, int flags);

[DllImport("libdl")]
[DllImport("libdl", EntryPoint = "dlopen")]
private static extern IntPtr dlopen_dl(string filename, int flags);

[DllImport("libc")]
private static extern IntPtr dlsym(IntPtr handle, string symbol);

[DllImport("libdl", EntryPoint = "dlsym")]
private static extern IntPtr dlsym_dl(IntPtr handle, string symbol);

[DllImport("libc")]
private static extern IntPtr gnu_get_libc_version();

private static bool GetGNULibCVersion(out int major, out int minor) {
major = minor = 0;
try {
string ver = Marshal.PtrToStringAnsi(gnu_get_libc_version());
int dot = ver.IndexOf('.');
if (dot < 0) dot = ver.Length;
if (!int.TryParse(ver.Substring(0, dot), out major)) return false;
if (dot + 1 < ver.Length) {
if (!int.TryParse(ver.Substring(dot + 1), out minor)) return false;
}
} catch {
return false;
}
return true;
}

private const int RTLD_NOW = 2;

private static bool UseLibDL() {
if (!_useLibDL.HasValue) {
bool success = GetGNULibCVersion(out int major, out int minor);
_useLibDL = !success || major < 2 || (major == 2 && minor < 34);
}
return _useLibDL.Value;
}
private static bool? _useLibDL;

public static IntPtr LoadDLL(string filename, int flags) {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
if (flags == 0)
flags = RTLD_NOW;
return dlopen(filename, flags);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
return LoadLibrary(filename);
}

if (flags == 0) flags = RTLD_NOW;

if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && UseLibDL()) {
return dlopen_dl(filename, flags);
}

return LoadLibrary(filename);
return dlopen(filename, flags);
}

public static IntPtr LoadFunction(IntPtr module, string functionName) {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
return dlsym(module, functionName);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
return GetProcAddress(module, functionName);
}

if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && UseLibDL()) {
return dlsym_dl(module, functionName);
}

return GetProcAddress(module, functionName);
return dlsym(module, functionName);
}

public static IntPtr LoadFunction(IntPtr module, IntPtr ordinal) {
Expand Down