Merge pull request #246 from sy-c/master

v2.17,2

Author: sy-c

doc/releaseNotes.md

@@ -530,3 +530,6 @@ This file describes the main feature changes for each readout.exe released versi
   - added equipment-*.dropPagesWithError: if set, the pages with RDH errors are discarded (requires rdhCheckEnabled or rdhUseFirstInPage). This may be used if downstream software is not robust to RDH errors.
 - Disabled unused RDMA features (still available by switch in CMake)
 - Added feature for memory banks real time monitoring. Enabled by setting membanksMonitorRate in /etc/o2.d/readout-defaults.cfg. Output (high-rate text) can be seen locally in real time with `tail -f /tmp/readout-monitor-mempool-(id)`. The status of each page in the bank is displayed.
+
+## v2.17.2 - 08/03/2023
+- Updated naming of files saved to disk when equipment-*.saveErrorPagesMax is set. Now includes timestamp, equipment id, and file counter: e.g. /tmp/readout-t1678288819-eq1-superpage.1.raw

src/ReadoutEquipment.cxx

@@ -1031,11 +1031,12 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
   if (isPageError) {
     if (saveErrorPagesCount < cfgSaveErrorPagesMax) {
       saveErrorPagesCount++;
-      std::string fn = cfgSaveErrorPagesPath + "/readout.superpage." + std::to_string(saveErrorPagesCount) + ".raw";
-      theLog.log(LogInfoSupport, "Equipment %d : saving superpage %p with errors to disk : %s (%d bytes)", id, blockData, fn.c_str(), blockHeader.dataSize);
+      char fn[256];
+      snprintf(fn, 256, "%s/readout-t%d-eq%d-superpage.%d.raw", cfgSaveErrorPagesPath.c_str(), (int)time(NULL), (int)id, (int)saveErrorPagesCount);
+      theLog.log(LogInfoSupport, "Equipment %d : saving superpage %p with errors to disk : %s (%d bytes)", id, blockData, fn, blockHeader.dataSize);
       FILE *fp;
       bool success = 0;
-      fp = fopen(fn.c_str(), "wb");
+      fp = fopen(fn, "wb");
       if (fp != nullptr) {
         if (fwrite(blockData, blockHeader.dataSize, 1, fp) == 1) {
 	  success = 1;

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.17.1"
+#define READOUT_VERSION "2.17.2"