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

udp_firstdst for jungfrau

Browse Source
This commit is contained in:
maliakal_d 2021-08-25 14:27:06 +02:00
parent 485b54994c
commit 1d989637e9
13 changed files with 162 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -58,7 +58,7 @@ char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
uint32_t adcEnableMask_1g = BIT32_MSK;
// 10g readout
uint8_t adcEnableMask_10g = BIT32_MSK;
uint8_t adcEnableMask_10g = 0xFF;
int32_t clkPhase[NUM_CLOCKS] = {};
uint32_t clkFrequency[NUM_CLOCKS] = {40, 20, 20, 200};
@ -471,7 +471,7 @@ void setupDetector() {
vLimit = DEFAULT_VLIMIT;
highvoltage = 0;
adcEnableMask_1g = BIT32_MSK;
adcEnableMask_10g = BIT32_MSK;
adcEnableMask_10g = 0xFF;
analogEnable = 1;
digitalEnable = 0;
naSamples = 1;

12
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1341,6 +1341,18 @@ void setNumberofDestinations(int value) {
bus_w(CONTROL_REG, bus_r(CONTROL_REG) | ((value << CONTROL_RX_ADDTNL_ENDPTS_NUM_OFST) & CONTROL_RX_ADDTNL_ENDPTS_NUM_MSK));
}
int getFirstUDPDestination() {
return ((bus_r(CONTROL_REG) & CONTROL_RX_ENDPTS_START_MSK) >>
CONTROL_RX_ENDPTS_START_OFST);
}
void setFirstUDPDestination(int value) {
LOG(logINFO, ("Setting first entry to %d\n", value));
bus_w(CONTROL_REG,
bus_r(CONTROL_REG) | ((value << CONTROL_RX_ENDPTS_START_OFST) &
CONTROL_RX_ENDPTS_START_MSK));
}
void selectPrimaryInterface(int val) {
uint32_t addr = CONFIG_REG;

4
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -56,7 +56,7 @@ char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
uint32_t adcEnableMask_1g = BIT32_MSK;
// 10g readout
uint8_t adcEnableMask_10g = BIT32_MSK;
uint8_t adcEnableMask_10g = 0xFF;
int32_t clkPhase[NUM_CLOCKS] = {};
uint32_t clkFrequency[NUM_CLOCKS] = {40, 20, 20, 200};
@ -481,7 +481,7 @@ void setupDetector() {
vLimit = DEFAULT_VLIMIT;
highvoltage = 0;
adcEnableMask_1g = BIT32_MSK;
adcEnableMask_10g = BIT32_MSK;
adcEnableMask_10g = 0xFF;
nSamples = 1;
#ifdef VIRTUAL
sharedMemory_setStatus(IDLE);

2
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -388,6 +388,8 @@ int getNumberofUDPInterfaces();
#ifdef JUNGFRAUD
int getNumberofDestinations();
void setNumberofDestinations(int value);
int getFirstUDPDestination();
void setFirstUDPDestination(int value);
void selectPrimaryInterface(int val);
int getPrimaryInterface();
void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,

2
slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
View File

@ -273,3 +273,5 @@ int get_dest_udp_list(int);
int set_dest_udp_list(int);
int get_num_dest_list(int);
int set_num_dest_list(int);
int get_udp_first_dest(int);
int set_udp_first_dest(int);

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

@ -52,6 +52,7 @@ int checkModuleFlag = 1;
udpStruct udpDetails[MAX_UDP_DESTINATION];
int numUdpDestinations = 1;
int firstUDPDestination = 0;
int configured = FAIL;
char configureMessage[MAX_STR_LENGTH] = "udp parameters not configured yet";
@ -408,6 +409,8 @@ void function_table() {
flist[F_SET_DEST_UDP_LIST] = &set_dest_udp_list;
flist[F_GET_NUM_DEST_UDP] = &get_num_dest_list;
flist[F_SET_NUM_DEST_UDP] = &set_num_dest_list;
flist[F_GET_UDP_FIRST_DEST] = &get_udp_first_dest;
flist[F_SET_UDP_FIRST_DEST] = &set_udp_first_dest;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@ -2926,14 +2929,16 @@ int enable_ten_giga(int file_des) {
uint64_t hardwaremac = getDetectorMAC();
if (udpDetails[0].srcmac != hardwaremac) {
LOG(logINFOBLUE, ("Updating udp source mac\n"));
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcmac = hardwaremac;
}
}
uint32_t hardwareip = getDetectorIP();
if (arg == 0 && udpDetails[0].srcip != hardwareip) {
LOG(logINFOBLUE, ("Updating udp source ip\n"));
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcip = hardwareip;
}
}
@ -4872,7 +4877,8 @@ void calculate_and_set_position() {
for (int i = 0; i < 6; ++i) {
udpDetails[0].srcmac = (udpDetails[0].srcmac << 8) + a[i];
}
for (int iRxEntry = 1; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 1; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcmac = udpDetails[0].srcmac;
}
}
@ -4891,7 +4897,8 @@ void calculate_and_set_position() {
for (int i = 0; i < 6; ++i) {
udpDetails[0].srcmac2 = (udpDetails[0].srcmac2 << 8) + a[i];
}
for (int iRxEntry = 1; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 1; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcmac2 = udpDetails[0].srcmac2;
}
}
@ -4937,7 +4944,8 @@ int check_detector_idle(const char *s) {
}
int is_udp_configured() {
for (int i = 0; i != numUdpDestinations; ++i) {
for (int i = firstUDPDestination;
i != firstUDPDestination + numUdpDestinations; ++i) {
if (udpDetails[i].dstip == 0) {
sprintf(configureMessage, "udp destination ip not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
@ -5026,7 +5034,8 @@ int set_source_udp_ip(int file_des) {
if (Server_VerifyLock() == OK) {
if (check_detector_idle("configure mac") == OK) {
if (udpDetails[0].srcip != arg) {
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcip = arg;
}
configure_mac();
@ -5067,7 +5076,8 @@ int set_source_udp_ip2(int file_des) {
if (Server_VerifyLock() == OK) {
if (check_detector_idle("configure mac") == OK) {
if (udpDetails[0].srcip2 != arg) {
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcip2 = arg;
}
configure_mac();
@ -5187,7 +5197,8 @@ int set_source_udp_mac(int file_des) {
if (Server_VerifyLock() == OK) {
if (check_detector_idle("configure mac") == OK) {
if (udpDetails[0].srcmac != arg) {
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcmac = arg;
}
configure_mac();
@ -5226,7 +5237,8 @@ int set_source_udp_mac2(int file_des) {
if (Server_VerifyLock() == OK) {
if (check_detector_idle("configure mac") == OK) {
if (udpDetails[0].srcmac2 != arg) {
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION;
++iRxEntry) {
udpDetails[iRxEntry].srcmac2 = arg;
}
configure_mac();
@ -9178,14 +9190,56 @@ int set_num_dest_list(int file_des) {
} else {
if (check_detector_idle("set number of udp destinations") == OK) {
numUdpDestinations = arg;
// copying src details from first src entry
for (int iRxEntry = 1; iRxEntry != numUdpDestinations; ++iRxEntry) {
udpDetails[iRxEntry].srcip = udpDetails[0].srcip;
udpDetails[iRxEntry].srcip2 = udpDetails[0].srcip2;
udpDetails[iRxEntry].srcmac = udpDetails[0].srcmac;
udpDetails[iRxEntry].srcmac2 = udpDetails[0].srcmac2;
}
configure_mac();
}
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
}
int get_udp_first_dest(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int retval = -1;
#if !defined(JUNGFRAUD) && !defined(EIGERD)
functionNotImplemented();
#else
retval = firstUDPDestination;
#ifdef JUNGFRAUD
if (getFirstUDPDestination() != retval) {
ret = FAIL;
sprintf(mess,
"Could not get first desintation. (server reads %d, fpga reads "
"%d).\n",
getFirstUDPDestination(), retval);
LOG(logERROR, (mess));
}
#endif
#endif
LOG(logDEBUG1, ("first udp destination retval: 0x%x\n", retval));
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}
int set_udp_first_dest(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int arg = -1;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
LOG(logDEBUG1, ("Setting first udp destination to %d\n", arg));
#if !defined(JUNGFRAUD) && !defined(EIGERD)
functionNotImplemented();
#else
if (arg < 0 || arg >= MAX_UDP_DESTINATION) {
ret = FAIL;
sprintf(mess, "Could not set first destination. Options: 0-%d\n",
MAX_UDP_DESTINATION - 1);
LOG(logERROR, (mess));
} else {
if (check_detector_idle("set first udp destination") == OK) {
firstUDPDestination = arg;
configure_mac();
}
}

6
slsDetectorSoftware/include/sls/Detector.h
View File

@ -677,6 +677,12 @@ class Detector {
/**[Jungfrau][Eiger] Options 1-32 */
void setNumberofUDPDestinations(const int value, Positions pos = {});
/** [Jungfrau][Eiger] */
Result<int> getFirstUDPDestination(Positions pos = {}) const;
/**[Jungfrau][Eiger] Options 0-31 */
void setFirstUDPDestination(const int value, Positions pos = {});
Result<IpAddr> getDestinationUDPIP(Positions pos = {}) const;
/** IP of the interface in receiver that the detector sends data to */

9
slsDetectorSoftware/src/CmdProxy.h
View File

@ -859,6 +859,7 @@ class CmdProxy {
{"selinterface", &CmdProxy::selinterface},
{"udp_dstlist", &CmdProxy::UDPDestinationList},
{"udp_numdst", &CmdProxy::udp_numdst},
{"udp_firstdst", &CmdProxy::udp_firstdst},
{"udp_srcip", &CmdProxy::udp_srcip},
{"udp_srcip2", &CmdProxy::udp_srcip2},
{"udp_dstip", &CmdProxy::UDPDestinationIP},
@ -1539,6 +1540,14 @@ class CmdProxy {
"destinations that the detector will stream images "
"out in a round robin fashion. Default: 1");
INTEGER_COMMAND_VEC_ID(
udp_firstdst, getFirstUDPDestination, setFirstUDPDestination,
StringTo<int>,
"[0 - 31]\n\t[Jungfrau][Eiger] One can set which is the first "
"destination that the detector will stream images "
"out from in a round robin fashion. The entry must not have been "
"empty. Default: 0");
INTEGER_COMMAND_VEC_ID(
udp_srcip, getSourceUDPIP, setSourceUDPIP, IpAddr,
"[x.x.x.x]\n\tIp address of the detector (source) udp "

8
slsDetectorSoftware/src/Detector.cpp
View File

@ -929,6 +929,14 @@ void Detector::setNumberofUDPDestinations(const int value, Positions pos) {
pimpl->Parallel(&Module::setNumberofUDPDestinations, pos, value);
}
Result<int> Detector::getFirstUDPDestination(Positions pos) const {
return pimpl->Parallel(&Module::getFirstUDPDestination, pos);
}
void Detector::setFirstUDPDestination(const int value, Positions pos) {
pimpl->Parallel(&Module::setFirstUDPDestination, pos, value);
}
Result<IpAddr> Detector::getDestinationUDPIP(Positions pos) const {
return pimpl->Parallel(&Module::getDestinationUDPIP, pos);
}

8
slsDetectorSoftware/src/Module.cpp
View File

@ -970,6 +970,14 @@ void Module::setNumberofUDPDestinations(const int value) {
sendToDetector(F_SET_NUM_DEST_UDP, value, nullptr);
}
int Module::getFirstUDPDestination() const {
return sendToDetector<int>(F_GET_UDP_FIRST_DEST);
}
void Module::setFirstUDPDestination(const int value) {
sendToDetector(F_SET_UDP_FIRST_DEST, value, nullptr);
}
sls::IpAddr Module::getDestinationUDPIP() const {
return sendToDetector<sls::IpAddr>(F_GET_DEST_UDP_IP);
}

2
slsDetectorSoftware/src/Module.h
View File

@ -226,6 +226,8 @@ class Module : public virtual slsDetectorDefs {
void setDestinationUDPList(const defs::udpDestination dest);
int getNumberofUDPDestinations() const;
void setNumberofUDPDestinations(const int value);
int getFirstUDPDestination() const;
void setFirstUDPDestination(const int value);
sls::IpAddr getDestinationUDPIP() const;
void setDestinationUDPIP(const sls::IpAddr ip);
sls::IpAddr getDestinationUDPIP2() const;

31
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -2262,6 +2262,37 @@ TEST_CASE("udp_numdst", "[.cmd]") {
}
}
TEST_CASE("udp_firstdst", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::JUNGFRAU || det_type == defs::EIGER) {
auto prev_val = det.getFirstUDPDestination();
{
std::ostringstream oss;
proxy.Call("udp_firstdst", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "udp_firstdst 10\n");
}
{
std::ostringstream oss;
proxy.Call("udp_firstdst", {}, -1, GET, oss);
REQUIRE(oss.str() == "udp_firstdst 0\n");
}
{
std::ostringstream oss;
proxy.Call("udp_firstdst", {"31"}, -1, PUT, oss);
REQUIRE(oss.str() == "udp_firstdst 31\n");
}
REQUIRE_THROWS(proxy.Call("udp_firstdst", {"33"}, -1, PUT));
for (int i = 0; i != det.size(); ++i) {
det.setFirstUDPDestination(prev_val[i], {i});
}
} else {
REQUIRE_THROWS(proxy.Call("udp_numdst", {}, -1, GET));
}
}
TEST_CASE("udp_dstip", "[.cmd]") {
Detector det;
CmdProxy proxy(&det);

4
slsSupportLib/include/sls/sls_detector_funcs.h
View File

@ -249,6 +249,8 @@ enum detFuncs {
F_SET_DEST_UDP_LIST,
F_GET_NUM_DEST_UDP,
F_SET_NUM_DEST_UDP,
F_GET_UDP_FIRST_DEST,
F_SET_UDP_FIRST_DEST,
NUM_DET_FUNCTIONS,
RECEIVER_ENUM_START = 256, /**< detector function should not exceed this
@ -605,6 +607,8 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_SET_DEST_UDP_LIST: return "F_SET_DEST_UDP_LIST";
case F_GET_NUM_DEST_UDP: return "F_GET_NUM_DEST_UDP";
case F_SET_NUM_DEST_UDP: return "F_SET_NUM_DEST_UDP";
case F_GET_UDP_FIRST_DEST: return "F_GET_UDP_FIRST_DEST";
case F_SET_UDP_FIRST_DEST: return "F_SET_UDP_FIRST_DEST";
case NUM_DET_FUNCTIONS: return "NUM_DET_FUNCTIONS";
case RECEIVER_ENUM_START: return "RECEIVER_ENUM_START";