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

Use atomic_bool for auto-updating "flag"

Browse source
This commit is contained in:
Stephen Seo 2024-01-11 18:42:06 +09:00
parent 5d24c4b5e6
commit 74341e83d4
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/UDPC_Defines.hpp
View file

@ -225,13 +225,14 @@ public:
char recvBuf[UDPC_PACKET_MAX_SIZE]; char recvBuf[UDPC_PACKET_MAX_SIZE];
/* /*
* 0 - is threaded * 0 - UNUSED
* 1 - is client * 1 - is client
* 2 - libsodium enabled * 2 - libsodium enabled
*/ */
std::bitset<8> flags; std::bitset<8> flags;
std::atomic_bool isAcceptNewConnections; std::atomic_bool isAcceptNewConnections;
std::atomic_bool isReceivingEvents; std::atomic_bool isReceivingEvents;
std::atomic_bool isAutoUpdating;
std::atomic_uint32_t protocolID; std::atomic_uint32_t protocolID;
std::atomic_uint_fast8_t loggingType; std::atomic_uint_fast8_t loggingType;
// See UDPC_AuthPolicy enum in UDPC.h for possible values // See UDPC_AuthPolicy enum in UDPC.h for possible values

25
src/UDPConnection.cpp
View file

@ -222,6 +222,7 @@ _contextIdentifier(UDPC_CONTEXT_IDENTIFIER),
flags(), flags(),
isAcceptNewConnections(true), isAcceptNewConnections(true),
isReceivingEvents(false), isReceivingEvents(false),
isAutoUpdating(false),
protocolID(UDPC_DEFAULT_PROTOCOL_ID), protocolID(UDPC_DEFAULT_PROTOCOL_ID),
#ifndef NDEBUG #ifndef NDEBUG
loggingType(UDPC_DEBUG), loggingType(UDPC_DEBUG),
@ -261,9 +262,9 @@ atostrBufIndex(0)
std::memset(atostrBuf, 0, UDPC_ATOSTR_SIZE); std::memset(atostrBuf, 0, UDPC_ATOSTR_SIZE);
if(isThreaded) { if(isThreaded) {
flags.set(0); isAutoUpdating.store(true);
} else { } else {
flags.reset(0); isAutoUpdating.store(false);
} }
rng_engine.seed(std::chrono::system_clock::now().time_since_epoch().count()); rng_engine.seed(std::chrono::system_clock::now().time_since_epoch().count());
@ -2171,7 +2172,7 @@ UDPC_HContext UDPC_init_threaded_update(UDPC_ConnectionId listenId,
return nullptr; return nullptr;
} }
ctx->flags.set(0); ctx->isAutoUpdating.store(true);
ctx->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_DEFAULT); ctx->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_DEFAULT);
ctx->thread = std::thread(UDPC::threadedUpdate, ctx); ctx->thread = std::thread(UDPC::threadedUpdate, ctx);
@ -2189,7 +2190,7 @@ UDPC_HContext UDPC_init_threaded_update_ms(
return nullptr; return nullptr;
} }
ctx->flags.set(0); ctx->isAutoUpdating.store(true);
if(updateMS < UDPC_UPDATE_MS_MIN) { if(updateMS < UDPC_UPDATE_MS_MIN) {
ctx->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_MIN); ctx->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_MIN);
} else if(updateMS > UDPC_UPDATE_MS_MAX) { } else if(updateMS > UDPC_UPDATE_MS_MAX) {
@ -2206,11 +2207,11 @@ UDPC_HContext UDPC_init_threaded_update_ms(
int UDPC_enable_threaded_update(UDPC_HContext ctx) { int UDPC_enable_threaded_update(UDPC_HContext ctx) {
UDPC::Context *c = UDPC::verifyContext(ctx); UDPC::Context *c = UDPC::verifyContext(ctx);
if(!c || c->flags.test(0) || c->thread.joinable()) { if(!c || c->isAutoUpdating.load() || c->thread.joinable()) {
return 0; return 0;
} }
c->flags.set(0); c->isAutoUpdating.store(true);
c->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_DEFAULT); c->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_DEFAULT);
c->threadRunning.store(true); c->threadRunning.store(true);
c->thread = std::thread(UDPC::threadedUpdate, c); c->thread = std::thread(UDPC::threadedUpdate, c);
@ -2221,11 +2222,11 @@ int UDPC_enable_threaded_update(UDPC_HContext ctx) {
int UDPC_enable_threaded_update_ms(UDPC_HContext ctx, int updateMS) { int UDPC_enable_threaded_update_ms(UDPC_HContext ctx, int updateMS) {
UDPC::Context *c = UDPC::verifyContext(ctx); UDPC::Context *c = UDPC::verifyContext(ctx);
if(!c || c->flags.test(0) || c->thread.joinable()) { if(!c || c->isAutoUpdating.load() || c->thread.joinable()) {
return 0; return 0;
} }
c->flags.set(0); c->isAutoUpdating.store(true);
if(updateMS < UDPC_UPDATE_MS_MIN) { if(updateMS < UDPC_UPDATE_MS_MIN) {
c->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_MIN); c->threadedSleepTime = std::chrono::milliseconds(UDPC_UPDATE_MS_MIN);
} else if(updateMS > UDPC_UPDATE_MS_MAX) { } else if(updateMS > UDPC_UPDATE_MS_MAX) {
@ -2242,13 +2243,13 @@ int UDPC_enable_threaded_update_ms(UDPC_HContext ctx, int updateMS) {
int UDPC_disable_threaded_update(UDPC_HContext ctx) { int UDPC_disable_threaded_update(UDPC_HContext ctx) {
UDPC::Context *c = UDPC::verifyContext(ctx); UDPC::Context *c = UDPC::verifyContext(ctx);
if(!c || !c->flags.test(0) || !c->thread.joinable()) { if(!c || !c->isAutoUpdating.load() || !c->thread.joinable()) {
return 0; return 0;
} }
c->threadRunning.store(false); c->threadRunning.store(false);
c->thread.join(); c->thread.join();
c->flags.reset(0); c->isAutoUpdating.store(false);
UDPC_CHECK_LOG(c, UDPC_LoggingType::UDPC_INFO, "Stopped threaded update"); UDPC_CHECK_LOG(c, UDPC_LoggingType::UDPC_INFO, "Stopped threaded update");
return 1; return 1;
@ -2262,7 +2263,7 @@ void UDPC_destroy(UDPC_HContext ctx) {
UDPC::Context *UDPC_ctx = UDPC::verifyContext(ctx); UDPC::Context *UDPC_ctx = UDPC::verifyContext(ctx);
if(UDPC_ctx) { if(UDPC_ctx) {
// stop thread if threaded // stop thread if threaded
if(UDPC_ctx->flags.test(0)) { if(UDPC_ctx->isAutoUpdating.load()) {
UDPC_ctx->threadRunning.store(false); UDPC_ctx->threadRunning.store(false);
UDPC_ctx->thread.join(); UDPC_ctx->thread.join();
} }
@ -2277,7 +2278,7 @@ void UDPC_destroy(UDPC_HContext ctx) {
void UDPC_update(UDPC_HContext ctx) { void UDPC_update(UDPC_HContext ctx) {
UDPC::Context *c = UDPC::verifyContext(ctx); UDPC::Context *c = UDPC::verifyContext(ctx);
if(!c || c->flags.test(0)) { if(!c || c->isAutoUpdating.load()) {
// invalid or is threaded, update should not be called // invalid or is threaded, update should not be called
return; return;
} }