Stop using __Internal in our p/invoke calls
#4757
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1151,27 +1151,92 @@ MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err, [[m | |
| { | ||
| unsigned int dl_flags = monodroidRuntime.convert_dl_flags (flags); | ||
| bool libmonodroid_fallback = false; | ||
| bool name_is_full_path = false; | ||
| bool name_needs_free = false; | ||
| /* name is nullptr when we're P/Invoking __Internal, so remap to libxa-internal-api */ | ||
| if (name == nullptr || strstr (name, "xa-internal-api") != nullptr) { | ||
| #if defined (WINDOWS) | ||
| char *tmp_name = nullptr; | ||
|
|
||
| auto probe_dll_at = [&](const char *the_path) -> bool { | ||
| if (the_path == nullptr) { | ||
| return false; | ||
| } | ||
|
|
||
| const char *last_sep = strrchr (the_path, MONODROID_PATH_SEPARATOR_CHAR); | ||
| if (last_sep != nullptr) { | ||
| char *dir = utils.strdup_new (the_path, last_sep - the_path); | ||
| tmp_name = utils.string_concat (dir, MONODROID_PATH_SEPARATOR, API_DSO_NAME); | ||
| delete[] dir; | ||
| if (!utils.file_exists (tmp_name)) { | ||
| delete[] tmp_name; | ||
| tmp_name = nullptr; | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| }; | ||
|
|
||
| // | ||
| // First try to see if it exist at the path pointed to by `name`. With p/invokes, currently (Sep 2020), we can't | ||
| // really trust the path since it consists of *some* directory path + p/invoke library name and it does not | ||
| // point to the location where the native library is. However, we still need to check the location first, should | ||
| // it point to the right place in the future. | ||
|
Contributor
There was a problem hiding this comment. TODO (fix after current PR build completes): to link to: mono/mono#20295 (comment) |
||
| // | ||
| // Context: https://github.com/mono/mono/issues/20295#issuecomment-679271621 | ||
| // | ||
| bool found = probe_dll_at (name); | ||
| if (!found) { | ||
| // Next lets try the location of the XA runtime DLL, libxa-internal-api.dll should be next to it. | ||
| const char *path = get_my_location (false); | ||
| found = probe_dll_at (path); | ||
| if (path != nullptr) { | ||
| free (reinterpret_cast<void*>(const_cast<char*>(path))); | ||
|
Contributor
There was a problem hiding this comment. …cause this is just bizarre.
Contributor
Author
There was a problem hiding this comment. It is, but we have a no-warnings policy, so... :) |
||
| } | ||
|
|
||
| if (!found) { | ||
| log_warn (LOG_DEFAULT, "Failed to locate %s, using file name without the path", API_DSO_NAME); | ||
| name = API_DSO_NAME; | ||
| } else { | ||
| name = tmp_name; | ||
| name_is_full_path = true; | ||
| name_needs_free = true; | ||
| } | ||
| } | ||
| #else // ndef WINDOWS | ||
| name = API_DSO_NAME; | ||
| #endif // WINDOWS | ||
| libmonodroid_fallback = true; | ||
| } | ||
|
|
||
| void *h = nullptr; | ||
| if (!name_is_full_path) | ||
| h = androidSystem.load_dso_from_any_directories (name, dl_flags); | ||
|
|
||
| if (h != nullptr) { | ||
| return monodroid_dlopen_log_and_return (h, err, name, name_needs_free, libmonodroid_fallback); | ||
| } | ||
|
|
||
| if (libmonodroid_fallback) { | ||
| const char *full_name; | ||
| if (name_is_full_path) { | ||
| full_name = name; | ||
| } else { | ||
| if (name_needs_free) { | ||
| delete[] name; | ||
| } | ||
| full_name = utils.path_combine (AndroidSystem::SYSTEM_LIB_PATH, API_DSO_NAME); | ||
| name_needs_free = true; | ||
| } | ||
| h = androidSystem.load_dso (full_name, dl_flags, false); | ||
| return monodroid_dlopen_log_and_return (h, err, full_name, name_needs_free, true); | ||
| } | ||
|
|
||
| if (!utils.ends_with (name, ".dll.so") && !utils.ends_with (name, ".exe.so")) { | ||
| return monodroid_dlopen_log_and_return (h, err, name, name_needs_free); | ||
| } | ||
|
|
||
| char *basename_part = const_cast<char*> (strrchr (name, '/')); | ||
|
|
@@ -1186,6 +1251,10 @@ MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err, [[m | |
| if (h != nullptr && XA_UNLIKELY (utils.should_log (LOG_ASSEMBLY))) | ||
| log_info_nocheck (LOG_ASSEMBLY, "Loaded AOT image '%s'", static_cast<const char*>(basename)); | ||
|
|
||
| if (name_needs_free) { | ||
| delete[] name; | ||
| } | ||
|
|
||
| return h; | ||
| } | ||
|
|
||
|
|
@@ -1489,7 +1558,7 @@ MonodroidRuntime::typemap_managed_to_java (MonoReflectionType *type, const uint8 | |
|
|
||
| #if defined (WINDOWS) | ||
| const char* | ||
| MonodroidRuntime::get_my_location (bool remove_file_name) | ||
| { | ||
| HMODULE hm = NULL; | ||
|
|
||
|
|
@@ -1507,21 +1576,24 @@ MonodroidRuntime::get_my_location () | |
| return nullptr; | ||
| } | ||
|
|
||
| if (remove_file_name) | ||
| PathRemoveFileSpecW (path); | ||
|
|
||
| return utils.utf16_to_utf8 (path); | ||
| } | ||
| #elif defined (APPLE_OS_X) | ||
| const char* | ||
| MonodroidRuntime::get_my_location (bool remove_file_name) | ||
| { | ||
| Dl_info info; | ||
| if (dladdr (reinterpret_cast<const void*>(&MonodroidRuntime::get_my_location), &info) == 0) { | ||
| log_warn (LOG_DEFAULT, "Could not lookup library containing `MonodroidRuntime::get_my_location()`; dladdr failed: %s", dlerror ()); | ||
| return nullptr; | ||
| } | ||
|
|
||
| if (remove_file_name) | ||
| return utils.strdup_new (dirname (const_cast<char*>(info.dli_fname))); | ||
| return utils.strdup_new (info.dli_fname); | ||
| } | ||
| #endif // defined(WINDOWS) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this instead be
strstr (name, MONODROID_PATH_SEPARATOR "xa-internal-api") != nullptr, ensuring that we get e.g./xa-internal-api?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather not do that. We can't be sure we'll always be getting a path here. Right now we do get a path (which points to a location where there's no libraries we ship) but it may change and I'd rather be flexible.