detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-27 16:50:02 +02:00
Code Issues Actions Packages Releases Activity

pthread mutex works on blackfin

Browse Source
This commit is contained in:
maliakal_d 2020-07-16 16:18:40 +02:00
parent 3e87cfa5c1
commit 9a284f75c3
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorServers/slsDetectorServer/src/sharedMemory.c
View File

@ -6,7 +6,7 @@
#include <sys/ipc.h> #include <sys/ipc.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <unistd.h> #include <unistd.h>
#include <semaphore.h> #include <pthread.h>
#define SHM_NAME "sls_server_shared_memory" #define SHM_NAME "sls_server_shared_memory"
#define SHM_VERSION 0x200625 #define SHM_VERSION 0x200625
@ -15,7 +15,7 @@
typedef struct Memory { typedef struct Memory {
int version; int version;
sem_t sem; pthread_mutex_t lock;
enum runStatus scanStatus; // idle, running or error enum runStatus scanStatus; // idle, running or error
int scanStop; int scanStop;
#ifdef VIRTUAL #ifdef VIRTUAL
@ -81,11 +81,10 @@ int sharedMemory_create(int port) {
int sharedMemory_initialize() { int sharedMemory_initialize() {
shm->version = SHM_VERSION; shm->version = SHM_VERSION;
if (sem_init(&(shm->sem), 1, 1)) { if (pthread_mutex_init(&(shm->lock), NULL) != 0) {
LOG(logERROR, ("Failed to initialize semaphore for shared memory\n")); LOG(logERROR, ("Failed to initialize pthread lock for shared memory\n"));
LOG(logERROR, ("ERror: %s\n", strerror(errno)));
return FAIL; return FAIL;
} }
shm->scanStatus = IDLE; shm->scanStatus = IDLE;
shm->scanStop = 0; shm->scanStop = 0;
#ifdef VIRTUAL #ifdef VIRTUAL
@ -142,9 +141,9 @@ int sharedMemory_remove() {
return OK; return OK;
} }
void sharedMemory_lock() { sem_wait(&(shm->sem)); } void sharedMemory_lock() { pthread_mutex_lock(&(shm->lock)); }
void sharedMemory_unlock() { sem_post(&(shm->sem)); } void sharedMemory_unlock() { pthread_mutex_unlock(&(shm->lock)); }
#ifdef VIRTUAL #ifdef VIRTUAL
void sharedMemory_setStatus(enum runStatus s) { void sharedMemory_setStatus(enum runStatus s) {

1
slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
View File

@ -30,7 +30,6 @@ extern int phaseShift;
void error(char *msg) { perror(msg); } void error(char *msg) { perror(msg); }
void sigInterruptHandler(int p) { void sigInterruptHandler(int p) {
sharedMemory_detach();
sharedMemory_remove(); sharedMemory_remove();
exit(-1); exit(-1);
} }