-
Notifications
You must be signed in to change notification settings - Fork 88
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.
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
port class 'dynamic_loader' to Windows #2278
Changes from 1 commit
3b11823
38024d3
e267b3f
1826c7a
410e3a7
86fd9a4
e31ed7d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2015-2022 Advanced Micro Devices, Inc. All rights reserved. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
#include <migraphx/dynamic_loader.hpp> | ||
#include <migraphx/errors.hpp> | ||
#include <migraphx/file_buffer.hpp> | ||
#include <migraphx/tmp_dir.hpp> | ||
#include <utility> | ||
|
||
// cppcheck-suppress definePrefix | ||
#define WIN32_LEAN_AND_MEAN | ||
#include <Windows.h> | ||
|
||
namespace migraphx { | ||
inline namespace MIGRAPHX_INLINE_NS { | ||
|
||
struct dynamic_loader_impl | ||
{ | ||
dynamic_loader_impl() = default; | ||
dynamic_loader_impl(const fs::path& p, std::shared_ptr<tmp_dir> t = nullptr) | ||
: handle(LoadLibrary(p.string().c_str())), temp(std::move(t)) | ||
{ | ||
if(handle == nullptr) | ||
{ | ||
MIGRAPHX_THROW("Error loading DLL: " + p.string() + " (" + | ||
std::to_string(GetLastError()) + ")"); | ||
} | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You need to add a move constructor and delete the copy constructor, and add an assignment operator. |
||
~dynamic_loader_impl() | ||
{ | ||
if(handle != nullptr) | ||
{ | ||
FreeLibrary(handle); | ||
} | ||
} | ||
static std::shared_ptr<dynamic_loader_impl> from_buffer(const char* image, std::size_t size) | ||
{ | ||
auto t = std::make_shared<tmp_dir>("migx-dynload"); | ||
auto f = t->path / "tmp.dll"; | ||
write_buffer(f.string(), image, size); | ||
return std::make_shared<dynamic_loader_impl>(f, t); | ||
} | ||
|
||
HMODULE handle = nullptr; | ||
std::shared_ptr<tmp_dir> temp = nullptr; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since the class is not copyable, then there is no reason to use |
||
}; | ||
|
||
dynamic_loader::dynamic_loader(const fs::path& p) : impl(std::make_shared<dynamic_loader_impl>(p)) | ||
{ | ||
} | ||
|
||
dynamic_loader::dynamic_loader(const char* image, std::size_t size) | ||
: impl(dynamic_loader_impl::from_buffer(image, size)) | ||
{ | ||
} | ||
|
||
dynamic_loader::dynamic_loader(const std::vector<char>& buffer) | ||
: impl(dynamic_loader_impl::from_buffer(buffer.data(), buffer.size())) | ||
{ | ||
} | ||
|
||
std::shared_ptr<void> dynamic_loader::get_symbol(const std::string& name) const | ||
{ | ||
FARPROC addr = GetProcAddress(impl->handle, name.c_str()); | ||
if(addr == nullptr) | ||
MIGRAPHX_THROW("Symbol not found: " + name + " (" + std::to_string(GetLastError()) + ")"); | ||
return {impl, reinterpret_cast<void*>(addr)}; | ||
} | ||
|
||
} // namespace MIGRAPHX_INLINE_NS | ||
} // namespace migraphx |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,6 +38,7 @@ struct dynamic_loader_impl; | |
|
||
struct MIGRAPHX_EXPORT dynamic_loader | ||
{ | ||
#ifndef _WIN32 | ||
template <class T> | ||
static fs::path path(T* address) | ||
{ | ||
|
@@ -46,6 +47,7 @@ struct MIGRAPHX_EXPORT dynamic_loader | |
static fs::path path(void* address); | ||
|
||
static optional<dynamic_loader> try_load(const fs::path& p); | ||
#endif | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this disabled on windows? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For some reason, on Windows, static analysis is showing the |
||
|
||
dynamic_loader() = default; | ||
|
||
|
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.
Put this in the same file.