stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

Fix UDPC destruct order when using thread

Browse source
This commit is contained in:
Stephen Seo 2019-03-07 12:16:03 +09:00
parent c82fd10470
commit 05ece7c626
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/UDPConnection.c
View file

@ -157,6 +157,20 @@ UDPC_Context* UDPC_init_threaded_update(uint16_t listenPort, uint32_t listenAddr
void UDPC_destroy(UDPC_Context *ctx) void UDPC_destroy(UDPC_Context *ctx)
{ {
if(ctx->isThreaded != 0)
{
mtx_lock(&ctx->tflagsMtx);
ctx->threadFlags |= 0x1;
mtx_unlock(&ctx->tflagsMtx);
cnd_broadcast(&ctx->threadCV);
thrd_join(ctx->threadHandle, NULL);
mtx_destroy(&ctx->tCVMtx);
mtx_destroy(&ctx->tflagsMtx);
cnd_destroy(&ctx->threadCV);
}
CleanupSocket(ctx->socketHandle); CleanupSocket(ctx->socketHandle);
UDPC_HashMap_itercall(ctx->conMap, UDPC_INTERNAL_destroy_conMap, NULL); UDPC_HashMap_itercall(ctx->conMap, UDPC_INTERNAL_destroy_conMap, NULL);
UDPC_HashMap_destroy(ctx->conMap); UDPC_HashMap_destroy(ctx->conMap);
@ -172,20 +186,6 @@ void UDPC_destroy(UDPC_Context *ctx)
} }
UDPC_Deque_destroy(ctx->receivedPackets); UDPC_Deque_destroy(ctx->receivedPackets);
if(ctx->isThreaded != 0)
{
mtx_lock(&ctx->tflagsMtx);
ctx->threadFlags |= 0x1;
mtx_unlock(&ctx->tflagsMtx);
cnd_broadcast(&ctx->threadCV);
thrd_join(ctx->threadHandle, NULL);
mtx_destroy(&ctx->tCVMtx);
mtx_destroy(&ctx->tflagsMtx);
cnd_destroy(&ctx->threadCV);
}
free(ctx); free(ctx);
} }