Merge pull request #225 from sy-c/master

v2.11.1

Author: sy-c

doc/releaseNotes.md

@@ -468,3 +468,6 @@ This file describes the main feature changes for each readout.exe released versi
   - equipment-*.ctpMode: enables CTP mode, data is discarded until start of run detected in RDH detector field pattern, and after corresponding end of run is detected.
   - consumer-fileRecorder-*.tfMax: when set, recording will stop after reaching given number of timeframes.
 - o2-readout-rawreader: added option to dump stats on HBF size.
+
+## v2.11.1 - 16/06/2022
+- Minor release for osx compatibility.

src/ReadoutEquipment.cxx

@@ -727,7 +727,17 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
 	      auto bitsChanged = std::bitset<sizeof(uint32_t)>(h.getDetectorField() ^ lastDetectorField[lid]);
 	      uint32_t nChanged = bitsChanged.count();
 	      if (nChanged == 1) {
-	        int bitChanged = bitsChanged._Find_first();
+	        int bitChanged = bitsChanged.size();
+		#ifdef __linux__
+	          bitChanged = bitsChanged._Find_first();
+		#else
+		  for(int bitix = 0; bitix < (int)bitsChanged.size(); bitix++) {
+                    if (bitsChanged[bitix]) {
+                      bitChanged = bitix;
+		      break;
+		    }
+                  }
+		#endif
 		bool isSet = std::bitset<sizeof(uint32_t)>(h.getDetectorField()).test(bitChanged);
 
 		//theLog.log(LogInfoDevel_(3011), "bitChanged=%d isSet=%d ctpRunBit=%d discardData=%d", (int)bitChanged, (int)isSet, (int)ctpRunBit, (int)discardData);
@@ -872,7 +882,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
 	}
       }
 
-      if ((isDefinedLastDetectorField)&&(pageOffset)) {
+      if ((isDefinedLastDetectorField[linkId])&&(pageOffset)) {
         if (checkChangesInDetectorField(h, pageOffset)) {
 	   if (cfgRdhDumpWarningEnabled) {
              theLog.log(logRdhErrorsToken, "Equipment %d Link %d RDH #%d @ 0x%X : detector field changed not at page beginning", id, (int)blockHeader.linkId, rdhIndexInPage, (unsigned int)pageOffset);

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.11"
+#define READOUT_VERSION "2.11.1"
 

src/SocketRx.cxx

@@ -195,6 +195,10 @@ void SocketRx::run() {
   */
 }
 
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
 void SocketRx::broadcast(const char *message) {
   if (message==nullptr) return;
   ssize_t l = strlen(message);