moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-07-01 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix thread sanitizer warnings with C11 atomics

Browse Source
This commit is contained in:
Cameron Gutman 2020-12-06 00:49:10 -06:00
parent ce546b12b0
commit 5cbd555b14
9 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Connection.c
View File

@ -3,7 +3,7 @@
static int stage = STAGE_NONE; static int stage = STAGE_NONE;
static ConnListenerConnectionTerminated originalTerminationCallback; static ConnListenerConnectionTerminated originalTerminationCallback;
static bool alreadyTerminated; static atomic_bool alreadyTerminated;
static PLT_THREAD terminationCallbackThread; static PLT_THREAD terminationCallbackThread;
static int terminationCallbackErrorCode; static int terminationCallbackErrorCode;
@ -17,7 +17,7 @@ CONNECTION_LISTENER_CALLBACKS ListenerCallbacks;
DECODER_RENDERER_CALLBACKS VideoCallbacks; DECODER_RENDERER_CALLBACKS VideoCallbacks;
AUDIO_RENDERER_CALLBACKS AudioCallbacks; AUDIO_RENDERER_CALLBACKS AudioCallbacks;
int NegotiatedVideoFormat; int NegotiatedVideoFormat;
volatile bool ConnectionInterrupted; atomic_bool ConnectionInterrupted;
bool HighQualitySurroundSupported; bool HighQualitySurroundSupported;
bool HighQualitySurroundEnabled; bool HighQualitySurroundEnabled;
OPUS_MULTISTREAM_CONFIGURATION NormalQualityOpusConfig; OPUS_MULTISTREAM_CONFIGURATION NormalQualityOpusConfig;

8
src/ControlStream.c
View File

@ -33,9 +33,9 @@ static PLT_THREAD invalidateRefFramesThread;
static PLT_THREAD controlReceiveThread; static PLT_THREAD controlReceiveThread;
static PLT_EVENT invalidateRefFramesEvent; static PLT_EVENT invalidateRefFramesEvent;
static int lossCountSinceLastReport; static int lossCountSinceLastReport;
static int lastGoodFrame; static atomic_int lastGoodFrame;
static int lastSeenFrame; static atomic_int lastSeenFrame;
static bool stopping; static atomic_bool stopping;
static bool disconnectPending; static bool disconnectPending;
static int intervalGoodFrameCount; static int intervalGoodFrameCount;
@ -44,7 +44,7 @@ static uint64_t intervalStartTimeMs;
static int lastIntervalLossPercentage; static int lastIntervalLossPercentage;
static int lastConnectionStatusUpdate; static int lastConnectionStatusUpdate;
static bool idrFrameRequired; static atomic_bool idrFrameRequired;
static LINKED_BLOCKING_QUEUE invalidReferenceFrameTuples; static LINKED_BLOCKING_QUEUE invalidReferenceFrameTuples;
#define CONN_IMMEDIATE_POOR_LOSS_RATE 30 #define CONN_IMMEDIATE_POOR_LOSS_RATE 30

2
src/InputStream.c
View File

@ -8,7 +8,7 @@
static SOCKET inputSock = INVALID_SOCKET; static SOCKET inputSock = INVALID_SOCKET;
static unsigned char currentAesIv[16]; static unsigned char currentAesIv[16];
static bool initialized; static atomic_bool initialized;
static EVP_CIPHER_CTX* cipherContext; static EVP_CIPHER_CTX* cipherContext;
static bool cipherInitialized; static bool cipherInitialized;

2
src/Limelight-internal.h
View File

@ -19,7 +19,7 @@ extern CONNECTION_LISTENER_CALLBACKS ListenerCallbacks;
extern DECODER_RENDERER_CALLBACKS VideoCallbacks; extern DECODER_RENDERER_CALLBACKS VideoCallbacks;
extern AUDIO_RENDERER_CALLBACKS AudioCallbacks; extern AUDIO_RENDERER_CALLBACKS AudioCallbacks;
extern int NegotiatedVideoFormat; extern int NegotiatedVideoFormat;
extern volatile bool ConnectionInterrupted; extern atomic_bool ConnectionInterrupted;
extern bool HighQualitySurroundSupported; extern bool HighQualitySurroundSupported;
extern bool HighQualitySurroundEnabled; extern bool HighQualitySurroundEnabled;
extern OPUS_MULTISTREAM_CONFIGURATION NormalQualityOpusConfig; extern OPUS_MULTISTREAM_CONFIGURATION NormalQualityOpusConfig;

4
src/LinkedBlockingQueue.c
View File

@ -106,7 +106,7 @@ int LbqPeekQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
return LBQ_INTERRUPTED; return LBQ_INTERRUPTED;
} }
if (queueHead->head == NULL) { if (queueHead->currentSize == 0) {
return LBQ_NO_ELEMENT; return LBQ_NO_ELEMENT;
} }
@ -131,7 +131,7 @@ int LbqPollQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
return LBQ_INTERRUPTED; return LBQ_INTERRUPTED;
} }
if (queueHead->head == NULL) { if (queueHead->currentSize == 0) {
return LBQ_NO_ELEMENT; return LBQ_NO_ELEMENT;
} }

4
src/LinkedBlockingQueue.h
View File

@ -18,8 +18,8 @@ typedef struct _LINKED_BLOCKING_QUEUE {
PLT_MUTEX mutex; PLT_MUTEX mutex;
PLT_EVENT containsDataEvent; PLT_EVENT containsDataEvent;
int sizeBound; int sizeBound;
int currentSize; atomic_int currentSize;
bool shutdown; atomic_bool shutdown;
int lifetimeSize; int lifetimeSize;
PLINKED_BLOCKING_QUEUE_ENTRY head; PLINKED_BLOCKING_QUEUE_ENTRY head;
PLINKED_BLOCKING_QUEUE_ENTRY tail; PLINKED_BLOCKING_QUEUE_ENTRY tail;

1
src/Platform.h
View File

@ -3,6 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <stdatomic.h>
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

10
src/PlatformThreads.h
View File

@ -10,18 +10,18 @@ typedef HANDLE PLT_MUTEX;
typedef HANDLE PLT_EVENT; typedef HANDLE PLT_EVENT;
typedef struct _PLT_THREAD { typedef struct _PLT_THREAD {
HANDLE handle; HANDLE handle;
bool cancelled; atomic_bool cancelled;
} PLT_THREAD; } PLT_THREAD;
#elif defined(__vita__) #elif defined(__vita__)
typedef int PLT_MUTEX; typedef int PLT_MUTEX;
typedef struct _PLT_EVENT { typedef struct _PLT_EVENT {
int mutex; int mutex;
int cond; int cond;
bool signalled; atomic_bool signalled;
} PLT_EVENT; } PLT_EVENT;
typedef struct _PLT_THREAD { typedef struct _PLT_THREAD {
int handle; int handle;
int cancelled; atomic_bool cancelled;
void *context; void *context;
bool alive; bool alive;
} PLT_THREAD; } PLT_THREAD;
@ -30,11 +30,11 @@ typedef pthread_mutex_t PLT_MUTEX;
typedef struct _PLT_EVENT { typedef struct _PLT_EVENT {
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
bool signalled; atomic_bool signalled;
} PLT_EVENT; } PLT_EVENT;
typedef struct _PLT_THREAD { typedef struct _PLT_THREAD {
pthread_t thread; pthread_t thread;
bool cancelled; atomic_bool cancelled;
} PLT_THREAD; } PLT_THREAD;
#else #else
#error Unsupported platform #error Unsupported platform

2
src/VideoStream.c
View File

@ -22,7 +22,7 @@ static PLT_THREAD decoderThread;
static bool receivedDataFromPeer; static bool receivedDataFromPeer;
static uint64_t firstDataTimeMs; static uint64_t firstDataTimeMs;
static bool receivedFullFrame; static atomic_bool receivedFullFrame;
// We can't request an IDR frame until the depacketizer knows // We can't request an IDR frame until the depacketizer knows
// that a packet was lost. This timeout bounds the time that // that a packet was lost. This timeout bounds the time that