fix: Multiple Leaks around FairGeoLoader

ChristianTackeGSI · dennisklein · commit ede7137bd698 · 2024-04-01T20:05:07.000+02:00
Also some small other stylistic changes
diff --git a/fairroot/base/steer/FairRunSim.cxx b/fairroot/base/steer/FairRunSim.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -153,11 +153,11 @@ void FairRunSim::Init()
     //  fOutFile=fRootManager->OpenOutFile(fOutname);
     LOG(info) << "==============  FairRunSim: Initialising simulation run ==============";
 
-    auto loader = new FairGeoLoader(fLoaderName.Data(), "Geo Loader");
-    FairGeoInterface* GeoInterFace = loader->getGeoInterface();
-    GeoInterFace->SetNoOfSets(ListOfModules->GetEntries());
-    GeoInterFace->setMediaFile(MatFname.Data());
-    GeoInterFace->readMedia();
+    fGeoLoader = std::make_unique<FairGeoLoader>(fLoaderName.Data(), "Geo Loader");
+    FairGeoInterface* geointerFace = fGeoLoader->getGeoInterface();
+    geointerFace->SetNoOfSets(ListOfModules->GetEntries());
+    geointerFace->setMediaFile(MatFname.Data());
+    geointerFace->readMedia();
 
     //  gSystem->cd(flout.Data());
 
@@ -389,6 +389,9 @@ void FairRunSim::ls(Option_t* option) const
 {
     FairRun::ls(option);
     TROOT::IncreaseDirLevel();
+    if (fGeoLoader) {
+        fGeoLoader->ls(option);
+    }
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     if (fGen) {
diff --git a/fairroot/base/steer/FairRunSim.h b/fairroot/base/steer/FairRunSim.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -23,6 +23,7 @@
 #include <utility>
 
 class FairField;
+class FairGeoLoader;
 class FairMCEventHeader;
 class FairMesh;
 class FairModule;
@@ -223,6 +224,8 @@ class FairRunSim : public FairRun
 
     bool fWasMT{false};   //!                              /** Actual MT mode used */
 
+    std::unique_ptr<FairGeoLoader> fGeoLoader;   //!
+
   protected:
     Int_t count{0};                     //!< Internal counter
     FairMCApplication* fApp{nullptr};   //!< Main VMC application
diff --git a/fairroot/geobase/FairGeoLoader.cxx b/fairroot/geobase/FairGeoLoader.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -29,42 +29,44 @@ FairGeoLoader* FairGeoLoader::fgInstance = nullptr;
 
 FairGeoLoader* FairGeoLoader::Instance() { return fgInstance; }
 
+static std::unique_ptr<FairGeoBuilder> MakeGeoBuilder(const char* Name)
+{
+    if (strncmp(Name, "TGeo", 4) == 0) {
+        auto geom = std::make_unique<TGeoManager>("FAIRGeom", "FAIR geometry");
+        return std::make_unique<FairGeoRootBuilder>("TGeo builder", "geometry builder", std::move(geom));
+    }
+
+    if (strncmp(Name, "G3Native", 8) == 0) {
+        cout << "-I- FairGeoLoader() : Native G3 Geometry is used: This option is not supported any more!" << endl;
+        exit(0);
+        //        gGeoManager = NULL;
+        //        fGeoBuilder=new FairGeoG3Builder("G3 builder","geometry builder");
+    }
+
+    return {};
+}
+
 FairGeoLoader::FairGeoLoader()
     : TNamed()
-    , fInterface(NULL)
-    , fGeoBuilder(NULL)
 {
     fgInstance = this;
 }
 
 FairGeoLoader::FairGeoLoader(const char* Name, const char* title)
     : TNamed(Name, title)
-    , fInterface(NULL)
-    , fGeoBuilder(NULL)
+    , fGeoBuilder(MakeGeoBuilder(Name))
 {
     if (fgInstance) {
         Fatal("FairGeoLoader", "Singleton instance already exists.");
         return;
     }
     fgInstance = this;
-    fInterface = new FairGeoInterface;
-    if (strncmp(Name, "TGeo", 4) == 0) {
-        TGeoManager* geom = new TGeoManager("FAIRGeom", "FAIR geometry");
-        fGeoBuilder = new FairGeoRootBuilder("TGeo builder", "geometry builder");
-        (static_cast<FairGeoRootBuilder*>(fGeoBuilder))->setGeoManager(geom);
-    } else if (strncmp(Name, "G3Native", 8) == 0) {
-        cout << "-I- FairGeoLoader() : Native G3 Geometry is used: This option is not supported any more!" << endl;
-        exit(0);
-        //        gGeoManager = NULL;
-        //        fGeoBuilder=new FairGeoG3Builder("G3 builder","geometry builder");
-    }
 
-    fInterface->setGeomBuilder(fGeoBuilder);
+    fInterface.setGeomBuilder(fGeoBuilder.get());
 }
 
 FairGeoLoader::~FairGeoLoader()
 {
-    delete fInterface;
     if (fgInstance == this) {
         // Do not point to a destructed object!
         fgInstance = nullptr;
diff --git a/fairroot/geobase/FairGeoLoader.h b/fairroot/geobase/FairGeoLoader.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,34 +16,45 @@
 #ifndef FairGeoLOADER_H
 #define FairGeoLOADER_H
 
+#include "FairGeoInterface.h"
+
 #include <Rtypes.h>   // for FairGeoLoader::Class, etc
 #include <TNamed.h>   // for TNamed
+#include <memory>
 
-class FairGeoInterface;
 class FairGeoBuilder;
-/**New Geometry Loader, this loader handel the Hades geometry description
- * @author Ilse koenig
- * @author M. Al-Turany*/
 
+/**
+ * New Geometry Loader, this loader handel the Hades geometry description
+ * \ingroup geobase fairroot_singleton
+ * @author Ilse koenig
+ * @author M. Al-Turany
+ */
 class FairGeoLoader : public TNamed
 {
   public:
     FairGeoLoader(const char* Name, const char* title);
     FairGeoLoader();
     ~FairGeoLoader() override;
-    FairGeoInterface* getGeoInterface() { return fInterface; }
-    FairGeoBuilder* getGeoBuilder() { return fGeoBuilder; }
+    FairGeoInterface* getGeoInterface() { return &fInterface; }
+    FairGeoBuilder* getGeoBuilder() { return fGeoBuilder.get(); }
     /** static access method*/
     static FairGeoLoader* Instance();
 
   private:
     FairGeoLoader(const FairGeoLoader&);
     FairGeoLoader& operator=(const FairGeoLoader&);
     static FairGeoLoader* fgInstance;   //!  /**Singleton instance*/
-    FairGeoInterface* fInterface;       //!  /** Hades Geometry Interface*/
-    FairGeoBuilder* fGeoBuilder;        //!   /**Geometry builder*/
 
-    ClassDefOverride(FairGeoLoader, 1);
+    std::unique_ptr<FairGeoBuilder> fGeoBuilder;   //!< Geometry builder
+    /**
+     * \brief Geometry Interface
+     * \note Must be destructed before `fGeoBuilder`,
+     *       so must be after that member variable.
+     */
+    FairGeoInterface fInterface{};   //!
+
+    ClassDefOverride(FairGeoLoader, 0);
 };
 
 #endif
diff --git a/fairroot/geobase/FairGeoRootBuilder.cxx b/fairroot/geobase/FairGeoRootBuilder.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -23,7 +23,6 @@
 #include "FairGeoVector.h"      // for FairGeoVector
 
 #include <TArrayD.h>        // for TArrayD
-#include <TGeoManager.h>    // for TGeoManager
 #include <TGeoMaterial.h>   // for TGeoMixture, TGeoMaterial
 #include <TGeoMatrix.h>     // for TGeoCombiTrans, etc
 #include <TGeoMedium.h>     // for TGeoMedium
@@ -34,17 +33,16 @@
 
 FairGeoRootBuilder::FairGeoRootBuilder()
     : FairGeoBuilder()
-    , geoManager(nullptr)
-{
-    // Default constructor
-}
+{}
 
 FairGeoRootBuilder::FairGeoRootBuilder(const char* name, const char* title)
     : FairGeoBuilder(name, title)
-    , geoManager(nullptr)
-{
-    // Constructor
-}
+{}
+
+FairGeoRootBuilder::FairGeoRootBuilder(const char* name, const char* title, std::unique_ptr<TGeoManager> geom)
+    : FairGeoBuilder(name, title)
+    , geoManager(std::move(geom))
+{}
 
 Bool_t FairGeoRootBuilder::createNode(FairGeoNode* volu, Int_t hadFormat)
 {
diff --git a/fairroot/geobase/FairGeoRootBuilder.h b/fairroot/geobase/FairGeoRootBuilder.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -10,30 +10,29 @@
 
 #include "FairGeoBuilder.h"   // for FairGeoBuilder
 
-#include <Rtypes.h>   // for FairGeoRootBuilder::Class, etc
+#include <TGeoManager.h>
 
 class FairGeoMedium;
 class FairGeoNode;
-class TGeoManager;
 
 /**
  * class to create geometry in ROOT
+ * \ingroup geobase
  * @author M. Al-Turany
  */
 class FairGeoRootBuilder : public FairGeoBuilder
 {
   private:
     FairGeoRootBuilder(const FairGeoRootBuilder&);
     FairGeoRootBuilder& operator=(const FairGeoRootBuilder&);
-
-  protected:
-    TGeoManager* geoManager;   // ROOT geometry manager
+    std::unique_ptr<TGeoManager> geoManager;   //!< ROOT geometry manager
 
   public:
     FairGeoRootBuilder();
     FairGeoRootBuilder(const char*, const char*);
+    FairGeoRootBuilder(const char*, const char*, std::unique_ptr<TGeoManager>);
     ~FairGeoRootBuilder() override = default;
-    void setGeoManager(TGeoManager* me) { geoManager = me; }
+    [[deprecated]] void setGeoManager(TGeoManager* me) { geoManager.reset(me); }
     Bool_t createNode(FairGeoNode*, Int_t hadFormat = 0) override;
     Int_t createMedium(FairGeoMedium*) override;
     void finalize() override;
