From 83283b672acdeb7b6f9e8eceacf5488c605516f3 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 6 Apr 2020 19:38:35 +0200 Subject: [PATCH] WIP --- .../slsDetectorFunctionList.c | 24 +++++++------- .../include/communication_virtual.h | 8 ++--- .../src/communication_virtual.c | 31 +++++++++++++------ .../slsDetectorServer/src/slsDetectorServer.c | 2 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index c1f79f889..649645e7c 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -329,7 +329,7 @@ void initStopServer() { #ifdef VIRTUAL virtual_stop = 0; if (!isControlServer) { - ComVirtual_writeStop(virtual_stop); + ComVirtual_setStop(virtual_stop); } #endif } @@ -359,7 +359,7 @@ void setupDetector() { #ifdef VIRTUAL virtual_status = 0; if (isControlServer) { - ComVirtual_writeStatus(virtual_status); + ComVirtual_setStatus(virtual_status); } #endif @@ -1366,8 +1366,8 @@ int startStateMachine(){ // set status to running virtual_status = 1; if (isControlServer) { - ComVirtual_writeStatus(virtual_status); - ComVirtual_readStop(&virtual_stop); + ComVirtual_setStatus(virtual_status); + virtual_stop = ComVirtual_getStop(); if (virtual_stop != 0) { LOG(logERROR, ("Cant start acquisition. " "Stop server has not updated stop status to 0\n")); @@ -1378,7 +1378,7 @@ int startStateMachine(){ LOG(logERROR, ("Could not start Virtual acquisition thread\n")); virtual_status = 0; if (isControlServer) { - ComVirtual_writeStatus(virtual_status); + ComVirtual_setStatus(virtual_status); } return FAIL; } @@ -1431,7 +1431,7 @@ void* start_timer(void* arg) { for (frameNr = 0; frameNr != numFrames; ++frameNr) { // update the virtual stop from stop server - ComVirtual_readStop(&virtual_stop); + virtual_stop = ComVirtual_getStop(); //check if virtual_stop is high if(virtual_stop == 1){ break; @@ -1487,7 +1487,7 @@ void* start_timer(void* arg) { virtual_status = 0; if (isControlServer) { - ComVirtual_writeStatus(virtual_status); + ComVirtual_setStatus(virtual_status); } LOG(logINFOBLUE, ("Finished Acquiring\n")); return NULL; @@ -1500,14 +1500,14 @@ int stopStateMachine(){ #ifdef VIRTUAL if (!isControlServer) { virtual_stop = 1; - ComVirtual_writeStop(virtual_stop); + ComVirtual_setStop(virtual_stop); // read till status is idle int tempStatus = 1; while(tempStatus == 1) { - ComVirtual_readStatus(&tempStatus); + tempStatus = ComVirtual_getStatus(); } virtual_stop = 0; - ComVirtual_writeStop(virtual_stop); + ComVirtual_setStop(virtual_stop); LOG(logINFO, ("Stopped State Machine\n")); } return OK; @@ -1521,7 +1521,7 @@ int stopStateMachine(){ enum runStatus getRunStatus(){ #ifdef VIRTUAL if (!isControlServer) { - ComVirtual_readStatus(&virtual_status); + virtual_status = ComVirtual_getStatus(); } if(virtual_status == 0){ LOG(logINFOBLUE, ("Status: IDLE\n")); @@ -1599,7 +1599,7 @@ void readFrame(int *ret, char *mess) { u_int32_t runBusy() { #ifdef VIRTUAL if (!isControlServer) { - ComVirtual_readStatus(&virtual_status); + virtual_status = ComVirtual_getStatus(); } return virtual_status; #endif diff --git a/slsDetectorServers/slsDetectorServer/include/communication_virtual.h b/slsDetectorServers/slsDetectorServer/include/communication_virtual.h index 1354f5fc7..06c6558d4 100755 --- a/slsDetectorServers/slsDetectorServer/include/communication_virtual.h +++ b/slsDetectorServers/slsDetectorServer/include/communication_virtual.h @@ -4,10 +4,10 @@ int ComVirtual_createFiles(const int port); void ComVirtual_setFileNames(const int port); -int ComVirtual_writeStatus(int value); -int ComVirtual_readStatus(int* value); -int ComVirtual_writeStop(int value); -int ComVirtual_readStop(int* value); +void ComVirtual_setStatus(int value); +int ComVirtual_getStatus(); +void ComVirtual_setStop(int value); +int ComVirtual_getStop(); int ComVirtual_writeToFile(int value, const char* fname, const char* serverName); int ComVirtual_readFromFile(int* value, const char* fname, const char* serverName); diff --git a/slsDetectorServers/slsDetectorServer/src/communication_virtual.c b/slsDetectorServers/slsDetectorServer/src/communication_virtual.c index 686bae70b..cb1cdf5d9 100755 --- a/slsDetectorServers/slsDetectorServer/src/communication_virtual.c +++ b/slsDetectorServers/slsDetectorServer/src/communication_virtual.c @@ -3,6 +3,7 @@ #include "clogger.h" #include +#include // usleep #define FILE_STATUS "/tmp/sls_virtual_server_status_" #define FILE_STOP "/tmp/sls_virtual_server_stop_" @@ -48,23 +49,35 @@ void ComVirtual_setFileNames(const int port) { memset(fnameStatus, 0, FILE_NAME_LENGTH); memset(fnameStop, 0, FILE_NAME_LENGTH); sprintf(fnameStatus, "%s%d", FILE_STATUS, port); - sprintf(fnameStatus, "%s%d", FILE_STOP, port); + sprintf(fnameStop, "%s%d", FILE_STOP, port); } -int ComVirtual_writeStatus(int value) { - return ComVirtual_writeToFile(value, FILE_STATUS, "Control"); +void ComVirtual_setStatus(int value) { + while (!ComVirtual_writeToFile(value, fnameStatus, "Control")) { + usleep(100); + } } -int ComVirtual_readStatus(int* value) { - return ComVirtual_readFromFile(value, FILE_STATUS, "Control"); +int ComVirtual_getStatus() { + int retval = 0; + while (!ComVirtual_readFromFile(&retval, fnameStatus, "Stop")) { + usleep(100); + } + return retval; } -int ComVirtual_writeStop(int value) { - return ComVirtual_writeToFile(value, FILE_STOP, "Stop"); +void ComVirtual_setStop(int value) { + while (!ComVirtual_writeToFile(value, fnameStop, "Stop")) { + usleep(100); + } } -int ComVirtual_readStop(int* value) { - return ComVirtual_readFromFile(value, FILE_STOP, "Stop"); +int ComVirtual_getStop() { + int retval = 0; + while (!ComVirtual_readFromFile(&retval, fnameStop, "Control")) { + usleep(100); + } + return retval; } int ComVirtual_writeToFile(int value, const char* fname, const char* serverName) { diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c index 07441cbae..c324a9f2b 100755 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) { else { LOG(logINFOBLUE, ("Stop Server [%d]\n", portno)); #ifdef VIRTUAL - ComVirtual_setFileNames(portno); + ComVirtual_setFileNames(portno - 1); #endif }