geometry and pixels =>tostring

psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants

@@ -14,4 +14,4 @@ slsDetectorPackage/8.0.2_rh8 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/9.0.0_rh8 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/9.1.0_rh8 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/9.1.1_rh8 stable cmake/3.15.5 Qt/5.12.10
-
+slsDetectorPackage/9.2.0_rh8 stable cmake/3.15.5 Qt/5.12.10

slsDetectorSoftware/CMakeLists.txt

@@ -29,6 +29,7 @@ target_link_libraries(slsDetectorObject
         slsProjectOptions
         slsSupportStatic
         pthread
+        rt
     PRIVATE
         slsProjectWarnings
 )
@@ -97,7 +98,9 @@ if(SLS_USE_TEXTCLIENT)
         add_executable(${val1} src/CmdApp.cpp)
 
         target_link_libraries(${val1} 
-            slsDetectorStatic
+        slsDetectorStatic
+        pthread
+        rt
         )
         SET_SOURCE_FILES_PROPERTIES( src/Caller.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-but-set-variable")
 

slsDetectorSoftware/src/Module.cpp

@@ -1203,7 +1203,7 @@ void Module::setDestinationUDPIP(const IpAddr ip) {
     }
     sendToDetector(F_SET_DEST_UDP_IP, ip, nullptr);
     if (shm()->useReceiverFlag) {
-        MacAddr retval{uint64_t(0)};
+        MacAddr retval(0LU);
         sendToReceiver(F_SET_RECEIVER_UDP_IP, ip, retval);
         LOG(logINFO) << "Setting destination udp mac of Module " << moduleIndex
                      << " to " << retval;
@@ -1226,7 +1226,7 @@ void Module::setDestinationUDPIP2(const IpAddr ip) {
     }
     sendToDetector(F_SET_DEST_UDP_IP2, ip, nullptr);
     if (shm()->useReceiverFlag) {
-        MacAddr retval{uint64_t(0)};
+        MacAddr retval(0LU);
         sendToReceiver(F_SET_RECEIVER_UDP_IP2, ip, retval);
         LOG(logINFO) << "Setting destination udp mac2 of Module " << moduleIndex
                      << " to " << retval;

slsDetectorSoftware/src/SharedMemory.h

@@ -25,12 +25,8 @@
 #include <unistd.h>
 
 namespace sls {
-#ifdef __APPLE__
-    // On macOS SHM_NAME_MAX is 31 so we need the shortest possible prefix
-    #define SHM_DETECTOR_PREFIX "/sls_"
-#else
-    #define SHM_DETECTOR_PREFIX "/slsDetectorPackage_detector_"
-#endif
+
+#define SHM_DETECTOR_PREFIX "/slsDetectorPackage_detector_"
 #define SHM_MODULE_PREFIX   "_module_"
 #define SHM_ENV_NAME        "SLSDETNAME"
 
@@ -207,11 +203,6 @@ template <typename T> class SharedMemory {
             throw SharedMemoryError(msg);
         }
 
-        #ifdef __APPLE__
-        // On macOS, fstat returns the allocated size and not the requested size.
-        // This means we can't check for size since we always get for example 16384 bytes.
-        return;
-        #endif
         auto actual_size = static_cast<size_t>(sb.st_size);
         auto expected_size = sizeof(T);
         if (actual_size != expected_size) {

slsReceiverSoftware/src/MasterAttributes.cpp

@@ -168,19 +168,11 @@ void MasterAttributes::GetFinalBinaryAttributes(
 #ifdef HDF5C
 void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
                                                  H5::Group *group) {
-    char c[1024]{};
-    // version
-    {
-        double version = BINARY_WRITER_VERSION;
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::Attribute attribute = fd->createAttribute(
-            "Version", H5::PredType::NATIVE_DOUBLE, dataspace);
-        attribute.write(H5::PredType::NATIVE_DOUBLE, &version);
-    }
+    char c[HSTR_LEN]{};
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     // timestamp
     {
         time_t t = std::time(nullptr);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
         H5::DataSet dataset =
             group->createDataSet("Timestamp", strdatatype, dataspace);
@@ -190,7 +182,6 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
     // detector type
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
         H5::DataSet dataset =
             group->createDataSet("Detector Type", strdatatype, dataspace);
         strcpy_safe(c, ToString(detType));
@@ -199,26 +190,18 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
     // timing mode
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
         H5::DataSet dataset =
             group->createDataSet("Timing Mode", strdatatype, dataspace);
         strcpy_safe(c, ToString(timingMode));
         dataset.write(c, strdatatype);
     }
-    // TODO: make this into an array?
-    // geometry x
+    // geometry
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
         H5::DataSet dataset = group->createDataSet(
-            "Geometry in x axis", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&geometry.x, H5::PredType::NATIVE_INT);
-    }
-    // geometry y
-    {
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::DataSet dataset = group->createDataSet(
-            "Geometry in y axis", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&geometry.y, H5::PredType::NATIVE_INT);
+            "Geometry", strdatatype, dataspace);
+        strcpy_safe(c, ToString(geometry));
+        dataset.write(c, strdatatype);
     }
     // Image Size
     {
@@ -227,7 +210,6 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
             "Image Size", H5::PredType::NATIVE_INT, dataspace);
         dataset.write(&imageSize, H5::PredType::NATIVE_INT);
         H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
         H5::Attribute attribute =
             dataset.createAttribute("Unit", strdatatype, dataspaceAttr);
         strcpy_safe(c, "bytes");
@@ -238,15 +220,9 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
         H5::DataSet dataset = group->createDataSet(
-            "Number of pixels in x axis", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&nPixels.x, H5::PredType::NATIVE_INT);
-    }
-    // npixels y
-    {
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::DataSet dataset = group->createDataSet(
-            "Number of pixels in y axis", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&nPixels.y, H5::PredType::NATIVE_INT);
+            "Pixels", strdatatype, dataspace);
+        strcpy_safe(c, ToString(nPixels));
+        dataset.write(c, strdatatype);
     }
     // Maximum frames per file
     {
@@ -258,7 +234,6 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
     // Frame Discard Policy
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
         H5::DataSet dataset = group->createDataSet("Frame Discard Policy",
                                                    strdatatype, dataspace);
         strcpy_safe(c, ToString(frameDiscardMode));
@@ -274,7 +249,6 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
     // Scan Parameters
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
         H5::DataSet dataset =
             group->createDataSet("Scan Parameters", strdatatype, dataspace);
         strcpy_safe(c, ToString(scanParams));
@@ -287,39 +261,18 @@ void MasterAttributes::WriteCommonHDF5Attributes(H5::H5File *fd,
             "Total Frames", H5::PredType::STD_U64LE, dataspace);
         dataset.write(&totalFrames, H5::PredType::STD_U64LE);
     }
-    // Receiver Roi xmin
+    // Receiver Roi
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
         H5::DataSet dataset = group->createDataSet(
-            "receiver roi xmin", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&receiverRoi.xmin, H5::PredType::NATIVE_INT);
-    }
-    // Receiver Roi xmax
-    {
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::DataSet dataset = group->createDataSet(
-            "receiver roi xmax", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&receiverRoi.xmax, H5::PredType::NATIVE_INT);
-    }
-    // Receiver Roi ymin
-    {
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::DataSet dataset = group->createDataSet(
-            "receiver roi ymin", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&receiverRoi.ymin, H5::PredType::NATIVE_INT);
-    }
-    // Receiver Roi ymax
-    {
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::DataSet dataset = group->createDataSet(
-            "receiver roi ymax", H5::PredType::NATIVE_INT, dataspace);
-        dataset.write(&receiverRoi.ymax, H5::PredType::NATIVE_INT);
+            "receiver roi", H5::PredType::NATIVE_INT, dataspace);
+        strcpy_safe(c, ToString(receiverRoi));
+        dataset.write(c, strdatatype);
     }
 }
 
 void MasterAttributes::WriteFinalHDF5Attributes(H5::H5File *fd,
                                                 H5::Group *group) {
-    char c[1024]{};
     // Total Frames in file
     {
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
@@ -334,6 +287,7 @@ void MasterAttributes::WriteFinalHDF5Attributes(H5::H5File *fd,
         H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
         H5::DataSet dataset = group->createDataSet("Additional JSON Header",
                                                    strdatatype, dataspace);
+        char c[sizeof(strdatatype)]{};
         strcpy_safe(c, ToString(additionalJsonHeader));
         dataset.write(c, strdatatype);
     }
@@ -341,20 +295,20 @@ void MasterAttributes::WriteFinalHDF5Attributes(H5::H5File *fd,
 
 void MasterAttributes::WriteHDF5Exptime(H5::H5File *fd, H5::Group *group) {
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Exposure Time", strdatatype, dataspace);
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     strcpy_safe(c, ToString(exptime));
     dataset.write(c, strdatatype);
 }
 
 void MasterAttributes::WriteHDF5Period(H5::H5File *fd, H5::Group *group) {
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Acquisition Period", strdatatype, dataspace);
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     strcpy_safe(c, ToString(period));
     dataset.write(c, strdatatype);
 }
@@ -365,10 +319,10 @@ void MasterAttributes::WriteHDF5DynamicRange(H5::H5File *fd, H5::Group *group) {
         "Dynamic Range", H5::PredType::NATIVE_INT, dataspace);
     dataset.write(&dynamicRange, H5::PredType::NATIVE_INT);
     H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::Attribute attribute =
         dataset.createAttribute("Unit", strdatatype, dataspaceAttr);
-    char c[1024] = "bits";
+    char c[HSTR_LEN] = "bits";
     attribute.write(strdatatype, c);
 }
 
@@ -396,13 +350,13 @@ void MasterAttributes::WriteHDF5ReadNRows(H5::H5File *fd, H5::Group *group) {
 
 void MasterAttributes::WriteHDF5ThresholdEnergy(H5::H5File *fd,
                                                 H5::Group *group) {
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
     H5::DataSet dataset = group->createDataSet(
         "Threshold Energy", H5::PredType::NATIVE_INT, dataspace);
     dataset.write(&thresholdEnergyeV, H5::PredType::NATIVE_INT);
     H5::DataSpace dataspaceAttr = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::Attribute attribute =
         dataset.createAttribute("Unit", strdatatype, dataspaceAttr);
     strcpy_safe(c, "eV");
@@ -411,9 +365,9 @@ void MasterAttributes::WriteHDF5ThresholdEnergy(H5::H5File *fd,
 
 void MasterAttributes::WriteHDF5ThresholdEnergies(H5::H5File *fd,
                                                   H5::Group *group) {
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 1024);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Threshold Energies", strdatatype, dataspace);
     strcpy_safe(c, ToString(thresholdAllEnergyeV));
@@ -421,9 +375,9 @@ void MasterAttributes::WriteHDF5ThresholdEnergies(H5::H5File *fd,
 }
 
 void MasterAttributes::WriteHDF5SubExpTime(H5::H5File *fd, H5::Group *group) {
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Sub Exposure Time", strdatatype, dataspace);
     strcpy_safe(c, ToString(subExptime));
@@ -431,9 +385,9 @@ void MasterAttributes::WriteHDF5SubExpTime(H5::H5File *fd, H5::Group *group) {
 }
 
 void MasterAttributes::WriteHDF5SubPeriod(H5::H5File *fd, H5::Group *group) {
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Sub Period", strdatatype, dataspace);
     strcpy_safe(c, ToString(subPeriod));
@@ -449,9 +403,9 @@ void MasterAttributes::WriteHDF5SubQuad(H5::H5File *fd, H5::Group *group) {
 
 void MasterAttributes::WriteHDF5RateCorrections(H5::H5File *fd,
                                                 H5::Group *group) {
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 1024);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Rate Corrections", strdatatype, dataspace);
     strcpy_safe(c, ToString(ratecorr));
@@ -466,28 +420,24 @@ void MasterAttributes::WriteHDF5CounterMask(H5::H5File *fd, H5::Group *group) {
 }
 
 void MasterAttributes::WriteHDF5ExptimeArray(H5::H5File *fd, H5::Group *group) {
-    for (int i = 0; i != 3; ++i) {
-        char c[1024]{};
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
-        H5::DataSet dataset =
-            group->createDataSet("Exposure Time1", strdatatype, dataspace);
-        strcpy_safe(c, ToString(exptimeArray[i]));
-        dataset.write(c, strdatatype);
-    }
+    char c[HSTR_LEN]{};
+    H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
+    H5::DataSet dataset =
+        group->createDataSet("Exposure Times", strdatatype, dataspace);
+    strcpy_safe(c, ToString(exptimeArray));
+    dataset.write(c, strdatatype);
 }
 
 void MasterAttributes::WriteHDF5GateDelayArray(H5::H5File *fd,
                                                H5::Group *group) {
-    for (int i = 0; i != 3; ++i) {
-        char c[1024]{};
-        H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-        H5::StrType strdatatype(H5::PredType::C_S1, 256);
-        H5::DataSet dataset =
-            group->createDataSet("Gate Delay1", strdatatype, dataspace);
-        strcpy_safe(c, ToString(gateDelayArray[i]));
-        dataset.write(c, strdatatype);
-    }
+    char c[HSTR_LEN]{};
+    H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
+    H5::DataSet dataset =
+        group->createDataSet("Gate Delays", strdatatype, dataspace);
+    strcpy_safe(c, ToString(gateDelayArray));
+    dataset.write(c, strdatatype);
 }
 
 void MasterAttributes::WriteHDF5Gates(H5::H5File *fd, H5::Group *group) {
@@ -499,10 +449,10 @@ void MasterAttributes::WriteHDF5Gates(H5::H5File *fd, H5::Group *group) {
 
 void MasterAttributes::WriteHDF5BurstMode(H5::H5File *fd, H5::Group *group) {
     H5::DataSpace dataspace = H5::DataSpace(H5S_SCALAR);
-    H5::StrType strdatatype(H5::PredType::C_S1, 256);
+    H5::StrType strdatatype(H5::PredType::C_S1, HSTR_LEN);
     H5::DataSet dataset =
         group->createDataSet("Burst Mode", strdatatype, dataspace);
-    char c[1024]{};
+    char c[HSTR_LEN]{};
     strcpy_safe(c, ToString(burstMode));
     dataset.write(c, strdatatype);
 }

slsReceiverSoftware/src/MasterAttributes.h

@@ -151,7 +151,13 @@ class MasterAttributes {
         rapidjson::PrettyWriter<rapidjson::StringBuffer> *w);
 #ifdef HDF5C
     void WriteXilinxCtbHDF5Attributes(H5::H5File *fd, H5::Group *group);
+#endif
+    private:
+#ifdef HDF5C
+    static const int HSTR_LEN = 1024;
 #endif
 };
 
+
+
 } // namespace sls

slsReceiverSoftware/src/receiver_defs.h

@@ -19,8 +19,8 @@ namespace sls {
 // files
 
 // versions
-#define HDF5_WRITER_VERSION   (6.7) // 1 decimal places
-#define BINARY_WRITER_VERSION (7.3) // 1 decimal places
+#define HDF5_WRITER_VERSION   (7.0) 
+#define BINARY_WRITER_VERSION (7.3) 
 
 #define MAX_FRAMES_PER_FILE            20000
 #define SHORT_MAX_FRAMES_PER_FILE      100000

slsSupportLib/include/sls/ToString.h

@@ -47,8 +47,6 @@ std::string ToString(const defs::polarity s);
 std::string ToString(const defs::timingInfoDecoder s);
 std::string ToString(const defs::collectionMode s);
 
-std::string ToString(bool value);
-
 std::string ToString(const slsDetectorDefs::xy &coord);
 std::ostream &operator<<(std::ostream &os, const slsDetectorDefs::xy &coord);
 std::string ToString(const slsDetectorDefs::ROI &roi);

slsSupportLib/src/ToString.cpp

@@ -5,13 +5,6 @@
 
 namespace sls {
 
-
-std::string ToString(bool value) {
-    return value ? "1" : "0";
-}
-
-
-
 std::string ToString(const slsDetectorDefs::xy &coord) {
     std::ostringstream oss;
     oss << '[' << coord.x << ", " << coord.y << ']';

slsSupportLib/src/network_utils.cpp

@@ -15,7 +15,7 @@
 #include <netdb.h>
 #include <sstream>
 #include <sys/ioctl.h>
-// #include <sys/prctl.h>
+#include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -178,30 +178,30 @@ IpAddr InterfaceNameToIp(const std::string &ifn) {
 
 MacAddr InterfaceNameToMac(const std::string &inf) {
     // TODO! Copied from genericSocket needs to be refactored!
-    // struct ifreq ifr;
-    // char mac[32];
-    // const int mac_len = sizeof(mac);
-    // memset(mac, 0, mac_len);
+    struct ifreq ifr;
+    char mac[32];
+    const int mac_len = sizeof(mac);
+    memset(mac, 0, mac_len);
 
-    // int sock = socket(PF_INET, SOCK_STREAM, 0);
-    // strncpy(ifr.ifr_name, inf.c_str(), sizeof(ifr.ifr_name) - 1);
-    // ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
+    int sock = socket(PF_INET, SOCK_STREAM, 0);
+    strncpy(ifr.ifr_name, inf.c_str(), sizeof(ifr.ifr_name) - 1);
+    ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
-    // if (-1 == ioctl(sock, SIOCGIFHWADDR, &ifr)) {
-    //     perror("ioctl(SIOCGIFHWADDR) ");
-    //     return MacAddr{};
-    // }
-    // for (int j = 0, k = 0; j < 6; j++) {
-    //     k += snprintf(
-    //         mac + k, mac_len - k - 1, j ? ":%02X" : "%02X",
-    //         (int)(unsigned int)(unsigned char)ifr.ifr_hwaddr.sa_data[j]);
-    // }
-    // mac[mac_len - 1] = '\0';
+    if (-1 == ioctl(sock, SIOCGIFHWADDR, &ifr)) {
+        perror("ioctl(SIOCGIFHWADDR) ");
+        return MacAddr{};
+    }
+    for (int j = 0, k = 0; j < 6; j++) {
+        k += snprintf(
+            mac + k, mac_len - k - 1, j ? ":%02X" : "%02X",
+            (int)(unsigned int)(unsigned char)ifr.ifr_hwaddr.sa_data[j]);
+    }
+    mac[mac_len - 1] = '\0';
 
-    // if (sock != 1) {
-    //     close(sock);
-    // }
-    return MacAddr();
+    if (sock != 1) {
+        close(sock);
+    }
+    return MacAddr(mac);
 }
 
 void validatePortNumber(uint16_t port) {

slsSupportLib/tests/test-ToString.cpp

@@ -16,17 +16,6 @@ namespace sls {
 
 using namespace sls::time;
 
-TEST_CASE("Convert bool to string", "[support]") {
-    REQUIRE(ToString(true) == "1");
-    REQUIRE(ToString(false) == "0");
-}
-
-TEST_CASE("Convert string to bool", "[support]") {
-    REQUIRE(StringTo<bool>("1") == true);
-    REQUIRE(StringTo<bool>("0") == false);
-}
-
-
 TEST_CASE("Integer conversions", "[support]") {
     REQUIRE(ToString(0) == "0");
     REQUIRE(ToString(1) == "1");

tests/CMakeLists.txt

@@ -25,6 +25,7 @@ target_link_libraries(tests
       slsProjectOptions
       slsSupportStatic
       pthread
+      rt
     PRIVATE
       slsProjectWarnings
 )