Skip to content

Commit b802e4a

Browse files
DO-NOT-MERGE: Add more debug info
1 parent ec12225 commit b802e4a

6 files changed

Lines changed: 51 additions & 6 deletions

File tree

examples/MQ/pixelSimSplit/run/scripts/test-splitMQ.sh.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ for DEVICE in "${!DEVICES[@]}"
8282
do
8383
LOGS[$DEVICE]="$(pwd)/$DEVICE.log"
8484
printf "%12s: " $DEVICE
85-
export LD_PRELOAD=libc_malloc_debug.so
86-
export MALLOC_CHECK_=3
8785
${DEVICES[$DEVICE]} > ${LOGS[$DEVICE]} 2>&1 & # Run device
88-
unset LD_PRELOAD MALLOC_CHECK_
8986
PIDS[$DEVICE]=$!
9087
echo "PID=${PIDS[$DEVICE]}, LOG=${LOGS[$DEVICE]}"
9188
done
@@ -107,7 +104,7 @@ do
107104
echo "*** $DEVICE failed with exit code $ret"
108105
RC=$(($RC + $ret))
109106
echo " Last lines of log:"
110-
tail -n 50 "${LOGS[$DEVICE]}" | sed -e 's/^/ | /'
107+
tail -n 100 "${LOGS[$DEVICE]}" | sed -e 's/^/ | /'
111108
}
112109
done
113110
echo "... terminated (RC=$RC)."

examples/MQ/pixelSimSplit/src/devices/FairMQTransportDevice.cxx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ void FairMQTransportDevice::InitTask()
137137

138138
void FairMQTransportDevice::ResetTask()
139139
{
140+
if (fRunSim) {
141+
fRunSim->ls();
142+
}
140143
fRunSim.reset();
141144
}
142145

@@ -272,4 +275,10 @@ void FairMQTransportDevice::UpdateParameterServer()
272275

273276
void FairMQTransportDevice::PostRun() {}
274277

275-
FairMQTransportDevice::~FairMQTransportDevice() {}
278+
FairMQTransportDevice::~FairMQTransportDevice()
279+
{
280+
LOG(info) << "FairMQTransportDevice dtor starting";
281+
if (fRunSim) {
282+
fRunSim->ls();
283+
}
284+
}

fairroot/geobase/FairGeoInterface.cxx

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <TClass.h> // for TClass
3434
#include <TList.h> // for TList
3535
#include <TObjArray.h> // for TObjArray
36+
#include <TROOT.h> //
3637
#include <iostream> // for operator<<, basic_ostream, etc
3738
#include <stdio.h> // for sprintf
3839
#include <string.h> // for strcmp
@@ -56,7 +57,8 @@ FairGeoInterface::FairGeoInterface()
5657
, setupFile("")
5758
, geoBuilder(nullptr)
5859
{
59-
// Constructor
60+
sets->SetName("sets");
61+
masterNodes->SetName("masterNodes");
6062
}
6163

6264
FairGeoInterface::~FairGeoInterface()
@@ -508,6 +510,28 @@ void FairGeoInterface::print()
508510
cout << "********************************************************************\n";
509511
}
510512

513+
void FairGeoInterface::ls(Option_t* option) const
514+
{
515+
TObject::ls(option);
516+
TROOT::IncreaseDirLevel();
517+
if (fileInput) {
518+
fileInput->ls(option);
519+
}
520+
if (oraInput) {
521+
oraInput->ls(option);
522+
}
523+
if (output) {
524+
output->ls(option);
525+
}
526+
if (sets) {
527+
sets->ls(option);
528+
}
529+
if (masterNodes) {
530+
masterNodes->ls(option);
531+
}
532+
TROOT::DecreaseDirLevel();
533+
}
534+
511535
Bool_t FairGeoInterface::readGeomConfig(const char* configFile)
512536
{
513537
// Reads the GEANT configuration file

fairroot/geobase/FairGeoInterface.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ class FairGeoInterface : public TObject
8484
void addSetupFile(const char* f) { setupFile = f; }
8585
Bool_t readSetupFile();
8686
void print();
87+
void ls(Option_t* option = "") const override;
8788
void SetNoOfSets(Int_t n) { nSets = n; }
8889

8990
private:

fairroot/geobase/FairGeoLoader.cxx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "FairGeoRootBuilder.h" // for FairGeoRootBuilder
1919

2020
#include <TGeoManager.h> // for TGeoManager
21+
#include <TROOT.h> //
2122
#include <cstdlib> // for NULL, exit
2223
#include <iostream> // for cout, endl, operator<<, etc
2324
#include <string.h> // for strncmp
@@ -72,3 +73,14 @@ FairGeoLoader::~FairGeoLoader()
7273
fgInstance = nullptr;
7374
}
7475
}
76+
77+
void FairGeoLoader::ls(Option_t* option) const
78+
{
79+
TNamed::ls(option);
80+
TROOT::IncreaseDirLevel();
81+
if (fGeoBuilder) {
82+
fGeoBuilder->ls(option);
83+
}
84+
fInterface.ls(option);
85+
TROOT::DecreaseDirLevel();
86+
}

fairroot/geobase/FairGeoLoader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class FairGeoLoader : public TNamed
4141
/** static access method*/
4242
static FairGeoLoader* Instance();
4343

44+
void ls(Option_t* option = "") const override;
45+
4446
private:
4547
FairGeoLoader(const FairGeoLoader&);
4648
FairGeoLoader& operator=(const FairGeoLoader&);

0 commit comments

Comments
 (0)