MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-09 20:13:56 +00:00
Code Issues Releases Wiki Activity

Fixed edge case bug, where EventLoopThread could be momentarily stalled on exit, on windows

Browse Source
This commit is contained in:
Bryan Roe
2020-04-24 14:22:13 -07:00
parent 669fa91083
commit de24ee7543
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
microscript/ILibDuktape_Helpers.c
View File

@@ -46,6 +46,8 @@ typedef struct Duktape_EventLoopDispatchData
uintptr_t nonce;
Duktape_EventLoopDispatch handler;
Duktape_EventLoopDispatch abortHandler;
ILibDuktape_ContextData *ctxd;
void *chain;
void *user;
}Duktape_EventLoopDispatchData;
@@ -78,6 +80,18 @@ void Duktape_RunOnEventLoop_Sink(void *chain, void *user)
}
ILibMemory_Free(tmp);
}
void __stdcall Duktape_RunOnEventLoop_SanityCheck(ULONG_PTR u)
{
if (!ILibMemory_CanaryOK((void*)u)) { return; }
Duktape_EventLoopDispatchData* d = (Duktape_EventLoopDispatchData*)((void**)u)[2];
if (ILibMemory_CanaryOK(d) && ILibMemory_CanaryOK(d->ctxd))
{
if ((d->ctxd->flags & duk_destroy_heap_in_progress) == duk_destroy_heap_in_progress)
{
if (d->abortHandler != NULL) { d->abortHandler(d->chain, d->user); }
}
}
}
void Duktape_RunOnEventLoop(void *chain, uintptr_t nonce, duk_context *ctx, Duktape_EventLoopDispatch handler, Duktape_EventLoopDispatch abortHandler, void *user)
{
Duktape_EventLoopDispatchData* tmp = (Duktape_EventLoopDispatchData*)ILibMemory_SmartAllocate(sizeof(Duktape_EventLoopDispatchData));
@@ -86,8 +100,11 @@ void Duktape_RunOnEventLoop(void *chain, uintptr_t nonce, duk_context *ctx, Dukt
tmp->handler = handler;
tmp->abortHandler = abortHandler;
tmp->user = user;
tmp->ctxd = duk_ctx_context_data(ctx);
tmp->chain = chain;
ILibChain_RunOnMicrostackThreadEx3(chain, Duktape_RunOnEventLoop_Sink, Duktape_RunOnEventLoop_AbortSink, tmp);
void *tobj = ILibChain_RunOnMicrostackThreadEx3(chain, Duktape_RunOnEventLoop_Sink, Duktape_RunOnEventLoop_AbortSink, tmp);
QueueUserAPC((PAPCFUNC)Duktape_RunOnEventLoop_SanityCheck, ILibChain_GetMicrostackThreadHandle(chain), (ULONG_PTR)tobj);
}
int ILibDuktape_GetReferenceCount(duk_context *ctx, duk_idx_t i)
@@ -665,7 +682,7 @@ void Duktape_SafeDestroyHeap(duk_context *ctx)
threadList[i++] = ILibLinkedList_GetDataFromNode(node);
ILibLinkedList_Remove(node);
}
WaitForMultipleObjects(i, threadList, TRUE, 5000);
while (WaitForMultipleObjectsEx(i, threadList, TRUE, 5000, TRUE) == WAIT_IO_COMPLETION);
ILibMemory_Free(threadList);
#else
int rv;