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

Merge pull request #149 from slsdetectorgroup/stopfix

Browse Source 
stopping in virtual server needs a usleep before acquiring lock to ge…
This commit is contained in:
Dhanya Thattil 2020-08-27 18:22:51 +02:00 committed by GitHub
commit 97ee2d269d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -2347,7 +2347,7 @@ int stopStateMachine() {
sharedMemory_setStop(1); sharedMemory_setStop(1);
// read till status is idle // read till status is idle
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
return OK; return OK;

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2217,7 +2217,7 @@ int stopStateMachine() {
sharedMemory_setStop(1); sharedMemory_setStop(1);
// read till status is idle // read till status is idle
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
return OK; return OK;

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2556,7 +2556,7 @@ int stopStateMachine() {
#ifdef VIRTUAL #ifdef VIRTUAL
sharedMemory_setStop(1); sharedMemory_setStop(1);
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
return OK; return OK;

2
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -1630,7 +1630,7 @@ int stopStateMachine() {
sharedMemory_setStop(1); sharedMemory_setStop(1);
// read till status is idle // read till status is idle
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
} }

2
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1818,7 +1818,7 @@ int stopStateMachine() {
sharedMemory_setStop(1); sharedMemory_setStop(1);
// read till status is idle // read till status is idle
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
return OK; return OK;

2
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -1980,7 +1980,7 @@ int stopStateMachine() {
sharedMemory_setStop(1); sharedMemory_setStop(1);
// read till status is idle // read till status is idle
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
return OK; return OK;

2
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -2261,7 +2261,7 @@ int stopStateMachine() {
sharedMemory_setStop(1); sharedMemory_setStop(1);
// read till status is idle // read till status is idle
while (sharedMemory_getStatus() == RUNNING) while (sharedMemory_getStatus() == RUNNING)
; usleep(500);
sharedMemory_setStop(0); sharedMemory_setStop(0);
LOG(logINFO, ("Stopped State Machine\n")); LOG(logINFO, ("Stopped State Machine\n"));
} }