Skip to content

Workaround for MSVC modules bug #1560

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
YexuanXiao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Workaround for MSVC modules bug #1560

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
29 changes: 16 additions & 13 deletions strings/base_coroutine_threadpool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,18 @@ namespace winrt::impl
return resume_apartment_sync(context.m_context, handle, failure);
}
}

using canceller_t = void(*)(void*);

struct unique_cancellation_lock
{
std::atomic<canceller_t>& m_canceller;

~unique_cancellation_lock()
{
m_canceller.store(nullptr, std::memory_order_release);
}
};
#endif
}

Expand All @@ -141,9 +153,7 @@ WINRT_EXPORT namespace winrt
{
struct cancellable_promise
{
using canceller_t = void(*)(void*);

void set_canceller(canceller_t canceller, void* context)
void set_canceller(impl::canceller_t canceller, void* context)
{
m_context = context;
m_canceller.store(canceller, std::memory_order_release);
Expand All @@ -160,14 +170,7 @@ WINRT_EXPORT namespace winrt
void cancel()
{
auto canceller = m_canceller.exchange(cancelling_ptr, std::memory_order_acquire);
struct unique_cancellation_lock
{
cancellable_promise* promise;
~unique_cancellation_lock()
{
promise->m_canceller.store(nullptr, std::memory_order_release);
}
} lock{ this };
impl::unique_cancellation_lock lock{ m_canceller };

if ((canceller != nullptr) && (canceller != cancelling_ptr))
{
Expand Down Expand Up @@ -196,9 +199,9 @@ WINRT_EXPORT namespace winrt
}

private:
static inline auto const cancelling_ptr = reinterpret_cast<canceller_t>(1);
static inline auto const cancelling_ptr = reinterpret_cast<impl::canceller_t>(1);

std::atomic<canceller_t> m_canceller{ nullptr };
std::atomic<impl::canceller_t> m_canceller{ nullptr };
void* m_context{ nullptr };
bool m_propagate_cancellation{ false };
bool m_originate_on_cancel{ true }; // By default, will call RoOriginateError before throwing a cancel error code.
Expand Down