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

allowed virtual servers

Browse Source
This commit is contained in:
maliakal_d
2019-08-16 18:49:08 +02:00
parent a0bdfcdae3
commit c6dddaba97
4 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -404,25 +404,37 @@ void multiSlsDetector::addMultipleDetectors(const char *name) {
void multiSlsDetector::addSlsDetector(const std::string &hostname) {
FILE_LOG(logDEBUG1) << "Adding detector " << hostname;
int port = DEFAULT_PORTNO;
std::string host = hostname;
auto res = sls::split(hostname, ':');
if (res.size() > 1) {
host = res[0];
port = std::stoi(res[1]);
}
for (auto &d : detectors) {
if (d->getHostname() == hostname) {
FILE_LOG(logWARNING)
<< "Detector " << hostname
<< "already part of the multiDetector!" << std::endl
<< "Remove it before adding it back in a new position!";
return;
if (host != "localhost") {
for (auto &d : detectors) {
if (d->getHostname() == host) {
FILE_LOG(logWARNING)
<< "Detector " << host
<< "already part of the multiDetector!" << std::endl
<< "Remove it before adding it back in a new position!";
return;
}
}
}
// get type by connecting
detectorType type =
slsDetector::getTypeFromDetector(hostname, DEFAULT_PORTNO);
slsDetector::getTypeFromDetector(host, port);
int pos = (int)detectors.size();
detectors.push_back(
sls::make_unique<slsDetector>(type, multiId, pos, false));
multi_shm()->numberOfDetectors = detectors.size();
detectors[pos]->setHostname(hostname);
detectors[pos]->setControlPort(port);
detectors[pos]->setStopPort(port + 1);
detectors[pos]->setHostname(host);
multi_shm()->multiDetectorType = getDetectorTypeAsEnum(-1);// -1 needed here
}

30
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -23,13 +23,11 @@
using namespace sls;
#define DEFAULT_HOSTNAME "localhost"
// create shm
slsDetector::slsDetector(detectorType type, int multi_id, int det_id,
bool verify)
: detId(det_id), shm(multi_id, det_id) {
/* called from put hostname command,
* so sls shared memory will be created */
// ensure shared memory was not created before
if (shm.IsExisting()) {
@ -42,10 +40,9 @@ slsDetector::slsDetector(detectorType type, int multi_id, int det_id,
initSharedMemory(type, multi_id, verify);
}
// pick up from shm
slsDetector::slsDetector(int multi_id, int det_id, bool verify)
: detId(det_id), shm(multi_id, det_id) {
/* called from multi constructor to populate structure,
* so sls shared memory will be opened, not created */
// getDetectorType From shm will check if it was already existing
detectorType type = getDetectorTypeFromShm(multi_id, verify);
@ -305,8 +302,7 @@ void slsDetector::initSharedMemory(detectorType type, int multi_id,
void slsDetector::initializeDetectorStructure(detectorType type) {
shm()->shmversion = SLS_SHMVERSION;
shm()->controlPort = DEFAULT_PORTNO;
sls::strcpy_safe(shm()->hostname, DEFAULT_HOSTNAME);
memset(shm()->hostname, 0, MAX_STR_LENGTH);
shm()->myDetectorType = type;
shm()->multiSize.x = 0;
shm()->multiSize.y = 0;
@ -644,9 +640,13 @@ int slsDetector::setControlPort(int port_number) {
int retval = -1;
FILE_LOG(logDEBUG1) << "Setting control port to " << port_number;
if (port_number >= 0 && port_number != shm()->controlPort) {
sendToDetector(F_SET_PORT, port_number, retval);
shm()->controlPort = retval;
FILE_LOG(logDEBUG1) << "Control port: " << retval;
if (strlen(shm()->hostname) > 0) {
sendToDetector(F_SET_PORT, port_number, retval);
shm()->controlPort = retval;
FILE_LOG(logDEBUG1) << "Control port: " << retval;
} else {
shm()->controlPort = port_number;
}
}
return shm()->controlPort;
}
@ -655,9 +655,13 @@ int slsDetector::setStopPort(int port_number) {
int retval = -1;
FILE_LOG(logDEBUG1) << "Setting stop port to " << port_number;
if (port_number >= 0 && port_number != shm()->stopPort) {
sendToDetectorStop(F_SET_PORT, port_number, retval);
shm()->stopPort = retval;
FILE_LOG(logDEBUG1) << "Stop port: " << retval;
if (strlen(shm()->hostname) > 0) {
sendToDetectorStop(F_SET_PORT, port_number, retval);
shm()->stopPort = retval;
FILE_LOG(logDEBUG1) << "Stop port: " << retval;
} else {
shm()->stopPort = port_number;
}
}
return shm()->stopPort;
}