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

fixes fromreview

Browse Source
This commit is contained in:
maliakal_d
2022-02-04 08:19:46 +01:00
parent 26faaa307b
commit 3350e3997e
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsReceiverSoftware/src/Implementation.cpp
View File

@ -1,7 +1,6 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
#include "Implementation.h"
#include "Arping.h"
#include "DataProcessor.h"
#include "DataStreamer.h"
#include "Fifo.h"
@ -109,9 +108,6 @@ void Implementation::SetupFifoStructure() {
void Implementation::setDetectorType(const detectorType d) {
// object to create thread for arping
arping = sls::make_unique<Arping>();
detType = d;
switch (detType) {
case GOTTHARD:
@ -325,21 +321,19 @@ std::array<pid_t, NUM_RX_THREAD_IDS> Implementation::getThreadIds() const {
retval[id++] = 0;
}
}
retval[NUM_RX_THREAD_IDS - 1] = arping->GetThreadId();
retval[NUM_RX_THREAD_IDS - 1] = arping.GetThreadId();
return retval;
}
bool Implementation::getArping() const { return arping->IsRunning(); }
bool Implementation::getArping() const { return arping.IsRunning(); }
pid_t Implementation::getArpingThreadId() const {
return arping->GetThreadId();
}
pid_t Implementation::getArpingThreadId() const { return arping.GetThreadId(); }
void Implementation::setArping(const bool i,
const std::vector<std::string> ips) {
if (i != arping->IsRunning()) {
if (i != arping.IsRunning()) {
if (!i) {
arping->StopThread();
arping.StopThread();
} else {
// setup interface
for (int i = 0; i != numUDPInterfaces; ++i) {
@ -347,9 +341,9 @@ void Implementation::setArping(const bool i,
if (i == 1 && (numUDPInterfaces == 1 || detType == EIGER)) {
break;
}
arping->SetInterfacesAndIps(i, eth[i], ips[i]);
arping.SetInterfacesAndIps(i, eth[i], ips[i]);
}
arping->StartThread();
arping.StartThread();
}
}
}