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

Merge branch 'shm' of github.com:slsdetectorgroup/slsDetectorPackage into shm

Browse Source
This commit is contained in:
maliakal_d 2020-07-01 13:13:18 +02:00
commit f224b7dadf
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@
#include <string.h> #include <string.h>
#include <sys/ipc.h> #include <sys/ipc.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <unistd.h>
#define SHM_NAME "sls_server_shared_memory" #define SHM_NAME "sls_server_shared_memory"
#define SHM_VERSION 0x200625 #define SHM_VERSION 0x200625
@ -47,24 +48,26 @@ int sharedMemory_create(int port) {
shmFd = shmFd =
shmget(SHM_KEY + port, sizeof(sharedMem), IPC_CREAT | IPC_EXCL | 0666); shmget(SHM_KEY + port, sizeof(sharedMem), IPC_CREAT | IPC_EXCL | 0666);
if (shmFd == -1 && errno == EEXIST) { if (shmFd == -1 && errno == EEXIST) {
LOG(logWARNING, ("Removing old shared memory\n")); char cmd[MAX_STR_LENGTH];
// cuz of unknown previous shm size, it has to be deleted like this memset(cmd, 0, MAX_STR_LENGTH);
system( sprintf(cmd, "ipcrm -M 0x%x", SHM_KEY + port);
"for i in seq `ipcs -m | cut -d ' ' -f1`; do ipcrm -M $i; done;"); system(cmd);
LOG(logWARNING,
("Removed old shared memory with id 0x%x\n", SHM_KEY + port));
shmFd = shmget(SHM_KEY + port, sizeof(sharedMem), shmFd = shmget(SHM_KEY + port, sizeof(sharedMem),
IPC_CREAT | IPC_EXCL | 0666); IPC_CREAT | IPC_EXCL | 0666);
} }
if (shmFd == -1) { if (shmFd == -1) {
sprintf(shmMess, "Create shared memory failed: %s\n", strerror(errno)); sprintf(shmMess, "Create shared memory failed: %s\n", strerror(errno));
LOG(logERROR, (shmMess)); LOG(logERROR, (shmMess));
return 0; return FAIL;
} }
LOG(logINFO, ("Shared memory created\n")); LOG(logINFO, ("Shared memory created\n"));
if (!sharedMemory_attach()) { if (sharedMemory_attach() == FAIL) {
return 0; return FAIL;
} }
sharedMemory_initialize(); sharedMemory_initialize();
return 1; return OK;
} }
void sharedMemory_initialize() { void sharedMemory_initialize() {
@ -83,10 +86,10 @@ int sharedMemory_open(int port) {
if (shmFd == -1) { if (shmFd == -1) {
sprintf(shmMess, "Open shared memory failed: %s\n", strerror(errno)); sprintf(shmMess, "Open shared memory failed: %s\n", strerror(errno));
LOG(logERROR, (shmMess)); LOG(logERROR, (shmMess));
return 0; return FAIL;
} }
if (!sharedMemory_attach()) { if (sharedMemory_attach() == FAIL) {
return 0; return FAIL;
} }
if (shm->version != SHM_VERSION) { if (shm->version != SHM_VERSION) {
sprintf(shmMess, sprintf(shmMess,
@ -95,7 +98,7 @@ int sharedMemory_open(int port) {
LOG(logERROR, (shmMess)); LOG(logERROR, (shmMess));
} }
LOG(logINFO, ("Shared memory opened\n")); LOG(logINFO, ("Shared memory opened\n"));
return 1; return OK;
} }
int sharedMemory_attach() { int sharedMemory_attach() {
@ -103,10 +106,10 @@ int sharedMemory_attach() {
if (shm == (void *)-1) { if (shm == (void *)-1) {
sprintf(shmMess, "could not attach: %s\n", strerror(errno)); sprintf(shmMess, "could not attach: %s\n", strerror(errno));
LOG(logERROR, (shmMess)); LOG(logERROR, (shmMess));
return 0; return FAIL;
} }
LOG(logINFO, ("Shared memory attached\n")); LOG(logINFO, ("Shared memory attached\n"));
return 1; return OK;
} }
int sharedMemory_detach() { int sharedMemory_detach() {
@ -114,10 +117,10 @@ int sharedMemory_detach() {
if (shmdt(shm) == -1) { if (shmdt(shm) == -1) {
sprintf(shmMess, "could not detach: %s\n", strerror(errno)); sprintf(shmMess, "could not detach: %s\n", strerror(errno));
LOG(logERROR, (shmMess)); LOG(logERROR, (shmMess));
return 0; return FAIL;
} }
LOG(logINFO, ("Shared memory detached\n")); LOG(logINFO, ("Shared memory detached\n"));
return 1; return OK;
} }
int sharedMemory_remove() { int sharedMemory_remove() {
@ -125,10 +128,10 @@ int sharedMemory_remove() {
if (shmctl(shmFd, IPC_RMID, NULL) == -1) { if (shmctl(shmFd, IPC_RMID, NULL) == -1) {
sprintf(shmMess, "could not remove: %s\n", strerror(errno)); sprintf(shmMess, "could not remove: %s\n", strerror(errno));
LOG(logERROR, (shmMess)); LOG(logERROR, (shmMess));
return 0; return FAIL;
} }
LOG(logINFO, ("Shared memory removed\n")); LOG(logINFO, ("Shared memory removed\n"));
return 1; return OK;
} }
void sharedMemory_lock() { sem_wait(&(shm->sem)); } void sharedMemory_lock() { sem_wait(&(shm->sem)); }

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

@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
// control server // control server
if (isControlServer) { if (isControlServer) {
LOG(logINFOBLUE, ("Control Server [%d]\n", portno)); LOG(logINFOBLUE, ("Control Server [%d]\n", portno));
if (!sharedMemory_create(portno)) { if (sharedMemory_create(portno) == FAIL) {
return -1; return -1;
} }
#ifdef STOP_SERVER #ifdef STOP_SERVER
@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
// stop server // stop server
else { else {
LOG(logINFOBLUE, ("Stop Server [%d]\n", portno)); LOG(logINFOBLUE, ("Stop Server [%d]\n", portno));
if (!sharedMemory_open(portno - 1)) { if (sharedMemory_open(portno - 1) == FAIL) {
return -1; return -1;
} }
} }
@ -160,12 +160,12 @@ int main(int argc, char *argv[]) {
exitServer(sockfd); exitServer(sockfd);
// detach shared memory // detach shared memory
if (!sharedMemory_detach()) { if (sharedMemory_detach() == FAIL) {
return -1; return -1;
} }
// remove shared memory (control server) // remove shared memory (control server)
if (isControlServer) { if (isControlServer) {
if (!sharedMemory_remove()) { if (sharedMemory_remove() == FAIL) {
return -1; return -1;
} }
} }

3
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -1011,6 +1011,9 @@ std::string CmdProxy::Scan(int action) {
os << OutString(t) << '\n'; os << OutString(t) << '\n';
} else if (action == defs::PUT_ACTION) { } else if (action == defs::PUT_ACTION) {
if (args.size() == 1) { if (args.size() == 1) {
if (StringTo<int>(args[0]) != 0) {
throw sls::RuntimeError("Did you mean '0' to disable?");
}
det->disableScan(); det->disableScan();
os << "scan disabled" << '\n'; os << "scan disabled" << '\n';
} else if (args.size() != 4) { } else if (args.size() != 4) {