Skip to content
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

Use RTLD_NOW for faster backend initialization. #2528

Merged
merged 11 commits into from
Sep 19, 2019
+3 −3
Merged

Use RTLD_NOW for faster backend initialization. #2528

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
61e997c
Merge pull request #2269 from fireice-uk/dev
fireice-uk Mar 3, 2019
56d2770
Merge pull request #2285 from fireice-uk/dev
fireice-uk Mar 7, 2019
a861bc5
Merge pull request #2328 from fireice-uk/dev
fireice-uk Mar 11, 2019
1fa4626
Merge pull request #2349 from fireice-uk/dev
fireice-uk Mar 15, 2019
d27e3a6
Merge pull request #2379 from fireice-uk/dev
fireice-uk Mar 28, 2019
2cd84c8
Merge pull request #2381 from fireice-uk/dev
fireice-uk Mar 28, 2019
a5b8fb7
Merge pull request #2392 from fireice-uk/dev
fireice-uk Apr 1, 2019
b846a6f
Merge pull request #2449 from fireice-uk/dev
fireice-uk Jun 9, 2019
5869b9e
Merge pull request #2485 from fireice-uk/dev
fireice-uk Jul 21, 2019
fd19a5d
Merge pull request #2498 from fireice-uk/dev
fireice-uk Jul 31, 2019
54dae74
Faster xmrstak_backend initialization, prevents unsupported binary in…
ddobreff Sep 12, 2019
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
6 changes: 3 additions & 3 deletions xmrstak/backend/plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ struct plugin
fileExtension = ".dylib";
#endif
// search library in working directory
libBackend = dlopen(("./lib" + libName + fileExtension).c_str(), RTLD_LAZY);
libBackend = dlopen(("./lib" + libName + fileExtension).c_str(), RTLD_NOW | RTLD_LAZY | RTLD_GLOBAL);
// fallback to binary directory
if(!libBackend)
libBackend = dlopen((params::inst().executablePrefix + "lib" + libName + fileExtension).c_str(), RTLD_LAZY);
libBackend = dlopen((params::inst().executablePrefix + "lib" + libName + fileExtension).c_str(), RTLD_NOW | RTLD_LAZY | RTLD_GLOBAL);
// try use LD_LIBRARY_PATH
if(!libBackend)
libBackend = dlopen(("lib" + libName + fileExtension).c_str(), RTLD_LAZY);
libBackend = dlopen(("lib" + libName + fileExtension).c_str(), RTLD_NOW | RTLD_LAZY | RTLD_GLOBAL);
if(!libBackend)
{
std::cerr << "WARNING: " << m_backendName << " cannot load backend library: " << dlerror() << std::endl;
Expand Down