Skip to content

Commit c9aa041

Browse files
committed
mdns: replace atomic boolean with regular boolean for cancellation flag in Mdns struct
1 parent fcc02f1 commit c9aa041

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/ship/mdns/ship_mdns_bonjour.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
// txtvers=1 id=NIBE-06920619238006 register=false model=nibe-n type=ControlBox brand=NIBE
7070

7171
#include <errno.h>
72-
#include <stdatomic.h>
7372
#ifdef _WIN32
7473
// clang-format off
7574
#include <winsock2.h>
@@ -149,7 +148,7 @@ struct Mdns {
149148
Vector* active_resolves;
150149
Vector* found_entries;
151150

152-
atomic_bool cancel;
151+
bool cancel;
153152
};
154153

155154
#define MDNS(obj) ((Mdns*)(obj))
@@ -262,7 +261,7 @@ void MdnsConstruct(
262261
self->found_entries = VectorCreateWithDeallocator(MdnsEntryDeallocator);
263262
self->active_resolves = VectorCreateWithDeallocator(MdnsActiveResolveEntryDeallocator);
264263

265-
atomic_store(&self->cancel, false);
264+
self->cancel = false;
266265

267266
// Seed random number generator
268267
srand((int)time(NULL));
@@ -725,7 +724,7 @@ static void* MdnsBrowserLoop(void* parameters) {
725724

726725
MdnsBrowseServices(mdns);
727726

728-
while (!atomic_load(&mdns->cancel)) {
727+
while (!mdns->cancel) {
729728
if (mdns->dns_service_browser_ref == NULL) {
730729
MDNS_DEBUG_PRINTF("No browse ref to process!\n");
731730
break;
@@ -886,14 +885,15 @@ static void DeregisterService(ShipMdnsObject* self) {
886885
static void Stop(ShipMdnsObject* self) {
887886
Mdns* const mdns = MDNS(self);
888887

889-
atomic_store(&mdns->cancel, true);
888+
mdns->cancel = true;
890889

891-
DeregisterService(self);
892890
if (mdns->thread != NULL) {
893891
EEBUS_THREAD_JOIN(mdns->thread);
894892
EebusThreadDelete(mdns->thread);
895893
mdns->thread = NULL;
896894
}
895+
896+
DeregisterService(self);
897897
}
898898

899899
static void SetAutoaccept(ShipMdnsObject* self, bool autoaccept) {

0 commit comments

Comments
 (0)