From 77499f086631d0f6eeb96a3e0391cf72eb40ff5e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Sat, 3 Aug 2019 16:35:02 +0200 Subject: [SERVER] Atomicize some global flags --- src/server/globals.h | 2 +- src/server/integrity.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/globals.h b/src/server/globals.h index 73eb563..7e5ff04 100644 --- a/src/server/globals.h +++ b/src/server/globals.h @@ -65,7 +65,7 @@ struct _dnbd3_connection dnbd3_host_t betterServer; // The better server uint8_t *recvBuffer; // Buffer for receiving payload uint32_t recvBufferLen; // Len of ^^ - volatile bool shutdown; // signal this thread to stop, must only be set from uplink_shutdown() or cleanup in uplink_mainloop() + atomic_bool shutdown; // signal this thread to stop, must only be set from uplink_shutdown() or cleanup in uplink_mainloop() bool replicatedLastBlock; // bool telling if the last block has been replicated yet bool cycleDetected; // connection cycle between proxies detected for current remote server int nextReplicationIndex; // Which index in the cache map we should start looking for incomplete blocks at diff --git a/src/server/integrity.c b/src/server/integrity.c index 8f17855..a66a364 100644 --- a/src/server/integrity.c +++ b/src/server/integrity.c @@ -29,7 +29,7 @@ static queue_entry checkQueue[CHECK_QUEUE_SIZE]; static pthread_mutex_t integrityQueueLock; static pthread_cond_t queueSignal; static int queueLen = -1; -static volatile bool bRunning = false; +static atomic_bool bRunning = false; static void* integrity_main(void *data); -- cgit v1.2.3-55-g7522