DO-NOT-MERGE: Add more debug info

FairRootGroup · Apr 3, 2024 · 4b2da0c · 4b2da0c
1 parent af6343e
commit 4b2da0c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/examples/MQ/pixelSimSplit/run/scripts/test-splitMQ.sh.in b/examples/MQ/pixelSimSplit/run/scripts/test-splitMQ.sh.in
@@ -82,10 +82,7 @@ for DEVICE in "${!DEVICES[@]}"
 do
   LOGS[$DEVICE]="$(pwd)/$DEVICE.log"
   printf "%12s: " $DEVICE
-  export LD_PRELOAD=libc_malloc_debug.so
-  export MALLOC_CHECK_=3
   ${DEVICES[$DEVICE]} > ${LOGS[$DEVICE]} 2>&1 &  # Run device
-  unset LD_PRELOAD MALLOC_CHECK_
   PIDS[$DEVICE]=$!
   echo "PID=${PIDS[$DEVICE]}, LOG=${LOGS[$DEVICE]}"
 done
@@ -107,7 +104,7 @@ do
     echo "*** $DEVICE failed with exit code $ret"
     RC=$(($RC + $ret))
     echo "    Last lines of log:"
-    tail -n 50 "${LOGS[$DEVICE]}" | sed -e 's/^/    | /'
+    tail -n 100 "${LOGS[$DEVICE]}" | sed -e 's/^/    | /'
   }
 done
 echo "... terminated (RC=$RC)."

diff --git a/examples/MQ/pixelSimSplit/src/devices/FairMQTransportDevice.cxx b/examples/MQ/pixelSimSplit/src/devices/FairMQTransportDevice.cxx
@@ -272,4 +272,10 @@ void FairMQTransportDevice::UpdateParameterServer()
 
 void FairMQTransportDevice::PostRun() {}
 
-FairMQTransportDevice::~FairMQTransportDevice() {}
+FairMQTransportDevice::~FairMQTransportDevice()
+{
+    LOG(info) << "FairMQTransportDevice dtor starting";
+    if (fRunSim) {
+        fRunSim->ls();
+    }
+}
diff --git a/fairroot/geobase/FairGeoInterface.cxx b/fairroot/geobase/FairGeoInterface.cxx
@@ -33,6 +33,7 @@
 #include <TClass.h>       // for TClass
 #include <TList.h>        // for TList
 #include <TObjArray.h>    // for TObjArray
+#include <TROOT.h>        //
 #include <iostream>       // for operator<<, basic_ostream, etc
 #include <stdio.h>        // for sprintf
 #include <string.h>       // for strcmp
@@ -56,7 +57,8 @@ FairGeoInterface::FairGeoInterface()
     , setupFile("")
     , geoBuilder(nullptr)
 {
-    // Constructor
+    sets->SetName("sets");
+    masterNodes->SetName("masterNodes");
 }
 
 FairGeoInterface::~FairGeoInterface()
@@ -508,6 +510,28 @@ void FairGeoInterface::print()
     cout << "********************************************************************\n";
 }
 
+void FairGeoInterface::ls(Option_t* option) const
+{
+    TObject::ls(option);
+    TROOT::IncreaseDirLevel();
+    if (fileInput) {
+        fileInput->ls(option);
+    }
+    if (oraInput) {
+        oraInput->ls(option);
+    }
+    if (output) {
+        output->ls(option);
+    }
+    if (sets) {
+        sets->ls(option);
+    }
+    if (masterNodes) {
+        masterNodes->ls(option);
+    }
+    TROOT::DecreaseDirLevel();
+}
+
 Bool_t FairGeoInterface::readGeomConfig(const char* configFile)
 {
     // Reads the GEANT configuration file

diff --git a/fairroot/geobase/FairGeoInterface.h b/fairroot/geobase/FairGeoInterface.h
@@ -84,6 +84,7 @@ class FairGeoInterface : public TObject
     void addSetupFile(const char* f) { setupFile = f; }
     Bool_t readSetupFile();
     void print();
+    void ls(Option_t* option = "") const override;
     void SetNoOfSets(Int_t n) { nSets = n; }
 
   private:

diff --git a/fairroot/geobase/FairGeoLoader.cxx b/fairroot/geobase/FairGeoLoader.cxx
@@ -18,6 +18,7 @@
 #include "FairGeoRootBuilder.h"   // for FairGeoRootBuilder
 
 #include <TGeoManager.h>   // for TGeoManager
+#include <TROOT.h>         //
 #include <cstdlib>         // for NULL, exit
 #include <iostream>        // for cout, endl, operator<<, etc
 #include <string.h>        // for strncmp
@@ -72,3 +73,14 @@ FairGeoLoader::~FairGeoLoader()
         fgInstance = nullptr;
     }
 }
+
+void FairGeoLoader::ls(Option_t* option) const
+{
+    TNamed::ls(option);
+    TROOT::IncreaseDirLevel();
+    if (fGeoBuilder) {
+        fGeoBuilder->ls(option);
+    }
+    fInterface.ls(option);
+    TROOT::DecreaseDirLevel();
+}
diff --git a/fairroot/geobase/FairGeoLoader.h b/fairroot/geobase/FairGeoLoader.h
@@ -41,6 +41,8 @@ class FairGeoLoader : public TNamed
     /** static access method*/
     static FairGeoLoader* Instance();
 
+    void ls(Option_t* option = "") const override;
+
   private:
     FairGeoLoader(const FairGeoLoader&);
     FairGeoLoader& operator=(const FairGeoLoader&);