XPlane/HardwareAdapter
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

make ringbuffer thread safety optional

Browse Source
This commit is contained in:
damage
2025-05-25 15:27:00 +02:00
parent 52e2c96e0e
commit 11146fb632
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controller/controller.c
View File

@ -1,3 +1,5 @@
#define RINGBUFFER_THREAD_SAFE
#include <linux/i2c-dev.h> #include <linux/i2c-dev.h>
#include <i2c/smbus.h> #include <i2c/smbus.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -9,7 +11,6 @@
#include <stdint.h> #include <stdint.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <pthread.h>
#include "global.h" #include "global.h"
#include "ringbuffer.h" #include "ringbuffer.h"

19
controller/ringbuffer.c
View File

@ -1,9 +1,12 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifdef RINGBUFFER_THREAD_SAFE
#include <pthread.h>
#endif
#include "ringbuffer.h" #include "ringbuffer.h"
void _ringBufferIncReader(struct ringBuffer *buf) { void _ringBufferIncReader(struct ringBuffer *buf) {
@ -34,32 +37,46 @@ void ringBufferCreate(int blocks, size_t blockSize, struct ringBuffer *out) {
out->blockSize = blockSize; out->blockSize = blockSize;
out->reader = out->buffer; out->reader = out->buffer;
out->writer = out->buffer; out->writer = out->buffer;
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_init(&out->mutex, NULL); pthread_mutex_init(&out->mutex, NULL);
#endif
} }
void ringBufferDestroy(struct ringBuffer *buf) { void ringBufferDestroy(struct ringBuffer *buf) {
free(buf->buffer); free(buf->buffer);
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_destroy(&buf->mutex); pthread_mutex_destroy(&buf->mutex);
#endif
} }
int ringBufferRead(struct ringBuffer *buf, void *out) { int ringBufferRead(struct ringBuffer *buf, void *out) {
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_lock(&buf->mutex); pthread_mutex_lock(&buf->mutex);
#endif
if (buf->reader != buf->writer) { if (buf->reader != buf->writer) {
// we have data to read // we have data to read
memcpy(out, buf->reader, buf->blockSize); memcpy(out, buf->reader, buf->blockSize);
_ringBufferIncReader(buf); _ringBufferIncReader(buf);
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_unlock(&buf->mutex); pthread_mutex_unlock(&buf->mutex);
#endif
return 0; return 0;
} else { } else {
// nothing to read // nothing to read
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_unlock(&buf->mutex); pthread_mutex_unlock(&buf->mutex);
#endif
return 1; return 1;
} }
} }
void ringBufferWrite(struct ringBuffer *buf, void *in) { void ringBufferWrite(struct ringBuffer *buf, void *in) {
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_lock(&buf->mutex); pthread_mutex_lock(&buf->mutex);
#endif
memcpy(buf->writer, in, buf->blockSize); memcpy(buf->writer, in, buf->blockSize);
_ringBufferIncWriter(buf); _ringBufferIncWriter(buf);
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_unlock(&buf->mutex); pthread_mutex_unlock(&buf->mutex);
#endif
} }

2
controller/ringbuffer.h
View File

@ -6,7 +6,9 @@ struct ringBuffer {
size_t blockSize; size_t blockSize;
void *reader; void *reader;
void *writer; void *writer;
#ifdef RINGBUFFER_THREAD_SAFE
pthread_mutex_t mutex; pthread_mutex_t mutex;
#endif
}; };
void ringBufferCreate(int blocks, size_t blockSize, struct ringBuffer *out); void ringBufferCreate(int blocks, size_t blockSize, struct ringBuffer *out);