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

sharedmem: config, sethostname call freesharedmemory and call setupmulti, freesharedmemoy(nonstatic) also cleans up member variables to make it consistent with shm, sharedmemory pointer set to 0 in non static free shared memory to be able to continue within application, sethostname frees memory only if detectors found in shm, add calls addmultipledetectors, replace replaces a detector in sls detector level, should also take lines in config file that has comments in between while ignoring the comments, sethostname in slsdetector also updates client, adding object in sls when creating new shm complains if shm existed and must delete again, removed remove commands

Browse Source
This commit is contained in:
maliakal_d
2018-06-27 15:38:03 +02:00
parent a0016cb005
commit 95254619c6
8 changed files with 204 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -207,6 +207,10 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
*/
virtual void setHostname(const char* name)=0;
/** adds the detector hostnames to the end of the list
\param name hostname
*/
virtual void addMultipleDetectors(const char* name)=0;
/** returns the detector type
\param pos position in the multi detector structure (is -1 returns type of detector with id -1)
@ -396,14 +400,11 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
/** Frees the shared memory - should not be used except for debugging*/
virtual void freeSharedMemory()=0;
/** adds the detector with ID id in postion pos
\param id of the detector to be added (should already exist!)
\param pos position where it should be added (normally at the end of the list (default to -1)
\returns the actual number of detectors or -1 if it failed (always for slsDetector)
*/
virtual int addSlsDetector(int id, int pos=-1){return -1;};
/**
* Get user details of shared memory
* @returns string with user details
*/
virtual std::string getUserDetails() = 0;
/** adds the detector name in position pos
\param name of the detector to be added (should already exist in shared memory or at least be online)
@ -413,19 +414,6 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
virtual int addSlsDetector(char* name, int pos=-1){return -1;};
/**
removes the detector in position pos from the multidetector
\param pos position of the detector to be removed from the multidetector system (defaults to -1 i.e. last detector)
\returns the actual number of detectors or -1 if it failed (always for slsDetector)
*/
virtual int removeSlsDetector(int pos=-1){return -1;};
/**removes the detector in position pos from the multidetector
\param name is the name of the detector
\returns the actual number of detectors or -1 if it failed (always for slsDetector)
*/
virtual int removeSlsDetector(char* name){return -1;};
/**
Turns off the server - do not use except for debugging!
*/