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

works virutally for virtual servers

Browse Source
This commit is contained in:
maliakal_d 2021-11-12 15:18:42 +01:00
parent eda66e63a5
commit 0ffd30e147
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorServers/slsDetectorServer/include/common.h
View File

@ -8,8 +8,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <time.h> #include <time.h>
#ifdef VIRTUAL
#define TEMP_PROG_FOLDER_NAME "/tmp/"
#else
#define TEMP_PROG_FOLDER_NAME "/var/tmp/" #define TEMP_PROG_FOLDER_NAME "/var/tmp/"
#define TEMP_PROG_FOLDER_NAME_ALL_FILES "/var/tmp/*" #define TEMP_PROG_FOLDER_NAME_ALL_FILES "/var/tmp/*"
#endif
#define TEMP_PROG_FILE_NAME TEMP_PROG_FOLDER_NAME "tmp.rawbin" #define TEMP_PROG_FILE_NAME TEMP_PROG_FOLDER_NAME "tmp.rawbin"
enum numberMode { DEC, HEX }; enum numberMode { DEC, HEX };

12
slsDetectorServers/slsDetectorServer/src/common.c
View File

@ -434,8 +434,13 @@ int setupDetectorServer(char *mess, char *sname) {
LOG(logINFO, ("\tPermissions modified\n")); LOG(logINFO, ("\tPermissions modified\n"));
// symbolic link // symbolic link
if (snprintf(cmd, MAX_STR_LENGTH, "ln -sf %s %s", sname, char linkname[MAX_STR_LENGTH] = {0};
LINKED_SERVER_NAME) >= MAX_STR_LENGTH) { strcpy(linkname, LINKED_SERVER_NAME);
#ifdef VIRTUAL
sprintf(linkname, "%s%s", TEMP_PROG_FOLDER_NAME, LINKED_SERVER_NAME);
#endif
if (snprintf(cmd, MAX_STR_LENGTH, "ln -sf %s %s", sname, linkname) >=
MAX_STR_LENGTH) {
strcpy(mess, "Could not copy detector server. Command to " strcpy(mess, "Could not copy detector server. Command to "
"create symbolic link too long\n"); "create symbolic link too long\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
@ -451,6 +456,7 @@ int setupDetectorServer(char *mess, char *sname) {
LOG(logINFO, ("\tSymbolic link created\n")); LOG(logINFO, ("\tSymbolic link created\n"));
// blackfin boards (respawn) (only kept for backwards compatibility) // blackfin boards (respawn) (only kept for backwards compatibility)
#ifndef VIRTUAL
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) || \ #if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) || \
defined(GOTTHARDD) defined(GOTTHARDD)
// delete every line with DetectorServer in /etc/inittab // delete every line with DetectorServer in /etc/inittab
@ -481,6 +487,7 @@ int setupDetectorServer(char *mess, char *sname) {
} }
LOG(logINFO, ("\tinittab: updated for respawning\n")); LOG(logINFO, ("\tinittab: updated for respawning\n"));
#endif
#endif #endif
// sync // sync
@ -567,6 +574,7 @@ int moveBinaryFile(char *mess, char *dest, char *src, char *errorPrefix) {
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) { if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, "Could not %s. (moving). %s\n", snprintf(mess, MAX_STR_LENGTH, "Could not %s. (moving). %s\n",
errorPrefix, retvals); errorPrefix, retvals);

4
slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c
View File

@ -219,6 +219,9 @@ int resetFPGA(char *mess) {
} }
int emptyTempFolder(char *mess) { int emptyTempFolder(char *mess) {
#ifdef VIRTUAL
return OK;
#else
char cmd[MAX_STR_LENGTH] = {0}; char cmd[MAX_STR_LENGTH] = {0};
char retvals[MAX_STR_LENGTH] = {0}; char retvals[MAX_STR_LENGTH] = {0};
@ -240,6 +243,7 @@ int emptyTempFolder(char *mess) {
} }
LOG(logINFO, ("\tEmptied temp folder(%s)\n", TEMP_PROG_FOLDER_NAME)); LOG(logINFO, ("\tEmptied temp folder(%s)\n", TEMP_PROG_FOLDER_NAME));
return OK; return OK;
#endif
} }
int preparetoCopyProgram(char *mess, char *functionType, FILE **fd, int preparetoCopyProgram(char *mess, char *functionType, FILE **fd,

10
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -97,7 +97,7 @@ int updateModeAllowedFunction(int file_des) {
F_UPDATE_KERNEL, F_UPDATE_KERNEL,
F_UPDATE_DETECTOR_SERVER}; F_UPDATE_DETECTOR_SERVER};
for (unsigned int i = 0; i < listsize; ++i) { for (unsigned int i = 0; i < listsize; ++i) {
if (fnum == list[i]) { if ((unsigned int)fnum == list[i]) {
return OK; return OK;
} }
} }
@ -9312,6 +9312,14 @@ int receive_program(int file_des, enum PROGRAM_INDEX index) {
if (index == PROGRAM_SERVER) { if (index == PROGRAM_SERVER) {
if (receiveData(file_des, serverName, MAX_STR_LENGTH, OTHER) < 0) if (receiveData(file_des, serverName, MAX_STR_LENGTH, OTHER) < 0)
return printSocketReadError(); return printSocketReadError();
#ifdef VIRTUAL
// writing to a temp folder
{
char temp[MAX_STR_LENGTH] = {0};
sprintf(temp, "%s%s", TEMP_PROG_FOLDER_NAME, serverName);
strcpy(serverName, temp);
}
#endif
LOG(logINFO, ("\tServer Name: %s\n", serverName)); LOG(logINFO, ("\tServer Name: %s\n", serverName));
} }