From: Torge Matthies tmatthies@codeweavers.com
Signed-off-by: Torge Matthies tmatthies@codeweavers.com --- dlls/msvcrt/concurrency.c | 225 +++++++++++++++++++++++++------------- 1 file changed, 150 insertions(+), 75 deletions(-)
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 8388150e6f7..4132db1de8e 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -68,6 +68,8 @@ typedef struct { unsigned int, (const Context*), (this)) #define call_Context_GetScheduleGroupId(this) CALL_VTBL_FUNC(this, 8, \ unsigned int, (const Context*), (this)) +#define call_Context_IsSynchronouslyBlocked(this) CALL_VTBL_FUNC(this, 12, \ + bool, (const Context*), (this)) #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ Context*, (Context*, unsigned int), (this, flags))
@@ -96,6 +98,7 @@ typedef struct { struct scheduler_list scheduler; unsigned int id; union allocator_cache_entry *allocator_cache[8]; + BOOL sync_blocked; } ExternalContextBase; extern const vtable_ptr ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); @@ -884,7 +887,7 @@ DEFINE_THISCALL_WRAPPER(_Context_IsSynchronouslyBlocked, 4) BOOL __thiscall _Context_IsSynchronouslyBlocked(const _Context *this) { TRACE("(%p)\n", this); - return FALSE; + return call_Context_IsSynchronouslyBlocked(this->context); } #endif
@@ -919,7 +922,7 @@ DEFINE_THISCALL_WRAPPER(ExternalContextBase_IsSynchronouslyBlocked, 4) bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const ExternalContextBase *this) { FIXME("(%p)->() stub\n", this); - return FALSE; + return this->sync_blocked; }
static void remove_scheduled_chores(Scheduler *scheduler, const ExternalContextBase *context) @@ -995,6 +998,7 @@ static void ExternalContextBase_ctor(ExternalContextBase *this) memset(this, 0, sizeof(*this)); this->context.vtable = &ExternalContextBase_vtable; this->id = InterlockedIncrement(&context_id); + this->sync_blocked = FALSE;
create_default_scheduler(); this->scheduler.scheduler = &default_scheduler->scheduler; @@ -2232,6 +2236,31 @@ void __thiscall _StructuredTaskCollection__Schedule( } }
+static inline void context_sync_block(Context *ctx) +{ + ExternalContextBase *context = (ExternalContextBase*)ctx; + if (context->context.vtable == &ExternalContextBase_vtable) + context->sync_blocked = TRUE; +} + +static void CALLBACK context_sync_unblock(BOOL normal, void *data) +{ + ExternalContextBase *context = data; + if (context->context.vtable == &ExternalContextBase_vtable) + context->sync_blocked = FALSE; +} + +#define SYNCHRONOUSLY_BLOCKED_START(ctx) \ + do { Context *__ctx = (Context*)(ctx); \ + __TRY { \ + context_sync_block(__ctx); \ + do { + +#define SYNCHRONOUSLY_BLOCKED_END() \ + } while (0); \ + } __FINALLY_CTX(context_sync_unblock, __ctx) \ + } while (0) + static void CALLBACK exception_ptr_rethrow_finally(BOOL normal, void *data) { exception_ptr *ep = data; @@ -2270,9 +2299,11 @@ _TaskCollectionStatus __stdcall _StructuredTaskCollection__RunAndWait( } }
- expected = this->count ? this->count : FINISHED_INITIAL; - while ((val = this->finished) != expected) - RtlWaitOnAddress((LONG*)&this->finished, &val, sizeof(val), NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + expected = this->count ? this->count : FINISHED_INITIAL; + while ((val = this->finished) != expected) + RtlWaitOnAddress((LONG*)&this->finished, &val, sizeof(val), NULL); + } SYNCHRONOUSLY_BLOCKED_END();
this->finished = 0; this->count = 0; @@ -2378,12 +2409,16 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) last = InterlockedExchangePointer(&cs->tail, q); if(last) { last->next = q; - NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + } SYNCHRONOUSLY_BLOCKED_END(); }
cs_set_head(cs, q); if(InterlockedCompareExchangePointer(&cs->tail, &cs->unk_active, q) != q) { - spin_wait_for_next_cs(q); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + spin_wait_for_next_cs(q); + } SYNCHRONOUSLY_BLOCKED_END(); cs->unk_active.next = q->next; } } @@ -2415,7 +2450,9 @@ bool __thiscall critical_section_try_lock(critical_section *this) if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { cs_set_head(this, &q); if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { - spin_wait_for_next_cs(&q); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + spin_wait_for_next_cs(&q); + } SYNCHRONOUSLY_BLOCKED_END(); this->unk_active.next = q.next; } return TRUE; @@ -2428,34 +2465,40 @@ bool __thiscall critical_section_try_lock(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_unlock, 4) void __thiscall critical_section_unlock(critical_section *this) { + BOOL skip_release = FALSE; + TRACE("(%p)\n", this);
this->unk_thread_id = 0; this->head = NULL; if(InterlockedCompareExchangePointer(&this->tail, NULL, &this->unk_active) == &this->unk_active) return; - spin_wait_for_next_cs(&this->unk_active); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + spin_wait_for_next_cs(&this->unk_active);
#if _MSVCR_VER >= 110 - while(1) { - cs_queue *next; + while(1) { + cs_queue *next;
- if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) - break; + if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) + break; + + next = this->unk_active.next; + if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) { + HeapFree(GetProcessHeap(), 0, next); + skip_release = TRUE; + break; + } + spin_wait_for_next_cs(next);
- next = this->unk_active.next; - if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) { + this->unk_active.next = next->next; HeapFree(GetProcessHeap(), 0, next); - return; } - spin_wait_for_next_cs(next); - - this->unk_active.next = next->next; - HeapFree(GetProcessHeap(), 0, next); - } #endif + } SYNCHRONOUSLY_BLOCKED_END();
- NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); + if (!skip_release) + NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); }
/* ?native_handle@critical_section@Concurrency@@QAEAAV12@XZ */ @@ -2475,6 +2518,7 @@ bool __thiscall critical_section_try_lock_for( critical_section *this, unsigned int timeout) { cs_queue *q, *last; + BOOL timed_out = FALSE;
TRACE("(%p %d)\n", this, timeout);
@@ -2487,32 +2531,39 @@ bool __thiscall critical_section_try_lock_for( if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) return critical_section_try_lock(this);
- last = InterlockedExchangePointer(&this->tail, q); - if(last) { - LARGE_INTEGER to; - NTSTATUS status; - FILETIME ft; - - last->next = q; - GetSystemTimeAsFileTime(&ft); - to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + - ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; - status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); - if(status == STATUS_TIMEOUT) { - if(!InterlockedExchange(&q->free, TRUE)) - return FALSE; - /* A thread has signaled the event and is block waiting. */ - /* We need to catch the event to wake the thread. */ - NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + last = InterlockedExchangePointer(&this->tail, q); + if(last) { + LARGE_INTEGER to; + NTSTATUS status; + FILETIME ft; + + last->next = q; + GetSystemTimeAsFileTime(&ft); + to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; + status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->free, TRUE)) { + timed_out = TRUE; + goto end; + } + /* A thread has signaled the event and is block waiting. */ + /* We need to catch the event to wake the thread. */ + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + } } - }
- cs_set_head(this, q); - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) { - spin_wait_for_next_cs(q); - this->unk_active.next = q->next; - } + cs_set_head(this, q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) { + spin_wait_for_next_cs(q); + this->unk_active.next = q->next; + } + end:; + } SYNCHRONOUSLY_BLOCKED_END();
+ if (timed_out) + return FALSE; HeapFree(GetProcessHeap(), 0, q); return TRUE; } @@ -2749,10 +2800,11 @@ static size_t evt_wait(thread_wait *wait, event **events, int count, bool wait_a if(!evt_transition(&wait->signaled, EVT_RUNNING, EVT_WAITING)) return evt_end_wait(wait, events, count);
- status = NtWaitForKeyedEvent(keyed_event, wait, 0, evt_timeout(&ntto, timeout)); - - if(status && !evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) - NtWaitForKeyedEvent(keyed_event, wait, 0, NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + status = NtWaitForKeyedEvent(keyed_event, wait, 0, evt_timeout(&ntto, timeout)); + if(status && !evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) + NtWaitForKeyedEvent(keyed_event, wait, 0, NULL); + } SYNCHRONOUSLY_BLOCKED_END();
return evt_end_wait(wait, events, count); } @@ -2939,8 +2991,10 @@ void __thiscall _Condition_variable_wait(_Condition_variable *this, critical_sec critical_section_unlock(&this->lock);
critical_section_unlock(cs); - while (q.next != CV_WAKE) - RtlWaitOnAddress(&q.next, &next, sizeof(next), NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + while (q.next != CV_WAKE) + RtlWaitOnAddress(&q.next, &next, sizeof(next), NULL); + } SYNCHRONOUSLY_BLOCKED_END(); critical_section_lock(cs); }
@@ -2954,6 +3008,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, NTSTATUS status; FILETIME ft; cv_queue *q, *next; + BOOL result = TRUE;
TRACE("(%p %p %d)\n", this, cs, timeout);
@@ -2967,23 +3022,24 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this,
critical_section_unlock(cs);
- GetSystemTimeAsFileTime(&ft); - to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + - ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; - while (q->next != CV_WAKE) { - status = RtlWaitOnAddress(&q->next, &next, sizeof(next), &to); - if(status == STATUS_TIMEOUT) { - if(!InterlockedExchange(&q->expired, TRUE)) { - critical_section_lock(cs); - return FALSE; + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + GetSystemTimeAsFileTime(&ft); + to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; + while (q->next != CV_WAKE) { + status = RtlWaitOnAddress(&q->next, &next, sizeof(next), &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->expired, TRUE)) + result = FALSE; + break; } - break; } - } + } SYNCHRONOUSLY_BLOCKED_END();
- operator_delete(q); + if (result) + operator_delete(q); critical_section_lock(cs); - return TRUE; + return result; }
/* ?notify_one@_Condition_variable@details@Concurrency@@QAEXXZ */ @@ -3109,18 +3165,25 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) last = InterlockedExchangePointer((void**)&this->writer_tail, &q); if (last) { last->next = &q; - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } SYNCHRONOUSLY_BLOCKED_END(); } else { this->writer_head = &q; - if (InterlockedOr(&this->count, WRITER_WAITING)) - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + if (InterlockedOr(&this->count, WRITER_WAITING)) { + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } SYNCHRONOUSLY_BLOCKED_END(); + } }
this->thread_id = GetCurrentThreadId(); this->writer_head = &this->active; this->active.next = NULL; if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &this->active, &q) != &q) { - spin_wait_for_next_rwl(&q); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + spin_wait_for_next_rwl(&q); + } SYNCHRONOUSLY_BLOCKED_END(); this->active.next = q.next; } } @@ -3151,8 +3214,10 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) while (!((count = this->count) & WRITER_WAITING)) if (InterlockedCompareExchange(&this->count, count+1, count) == count) break;
- if (count & WRITER_WAITING) - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + if (count & WRITER_WAITING) + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } SYNCHRONOUSLY_BLOCKED_END();
head = InterlockedExchangePointer((void**)&this->reader_head, NULL); while(head && head != &q) { @@ -3162,7 +3227,9 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) head = next; } } else { - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } SYNCHRONOUSLY_BLOCKED_END(); } }
@@ -3186,7 +3253,9 @@ bool __thiscall reader_writer_lock_try_lock(reader_writer_lock *this) this->writer_head = &this->active; this->active.next = NULL; if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &this->active, &q) != &q) { - spin_wait_for_next_rwl(&q); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + spin_wait_for_next_rwl(&q); + } SYNCHRONOUSLY_BLOCKED_END(); this->active.next = q.next; } return TRUE; @@ -3194,7 +3263,9 @@ bool __thiscall reader_writer_lock_try_lock(reader_writer_lock *this)
if (InterlockedCompareExchangePointer((void**)&this->writer_tail, NULL, &q) == &q) return FALSE; - spin_wait_for_next_rwl(&q); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + spin_wait_for_next_rwl(&q); + } SYNCHRONOUSLY_BLOCKED_END(); this->writer_head = q.next; if (!InterlockedOr(&this->count, WRITER_WAITING)) { this->thread_id = GetCurrentThreadId(); @@ -3330,7 +3401,9 @@ DEFINE_THISCALL_WRAPPER(_ReentrantBlockingLock__Acquire, 4) void __thiscall _ReentrantBlockingLock__Acquire(_ReentrantBlockingLock *this) { TRACE("(%p)\n", this); - EnterCriticalSection(&this->cs); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + EnterCriticalSection(&this->cs); + } SYNCHRONOUSLY_BLOCKED_END(); }
/* ?_Release@_ReentrantBlockingLock@details@Concurrency@@QAEXXZ */ @@ -3358,7 +3431,9 @@ void __cdecl Concurrency_wait(unsigned int time)
if (!once++) FIXME("(%d) stub!\n", time);
- Sleep(time); + SYNCHRONOUSLY_BLOCKED_START(get_current_context()) { + Sleep(time); + } SYNCHRONOUSLY_BLOCKED_END(); }
#if _MSVCR_VER>=110