Remove manually allocated memory (#2363)

#2244
AntaresSimulatorTeam · Aug 30, 2024 · b472829 · b472829
1 parent c8ffce8
commit b472829
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 130 deletions.
diff --git a/src/libs/antares/study/area/area.cpp b/src/libs/antares/study/area/area.cpp
@@ -185,7 +185,7 @@ uint64_t Area::memoryUsage() const
     ret += wind.memoryUsage();
 
     // Hydro
-    ret += PreproHydroMemoryUsage(hydro.prepro);
+    ret += PreproHydroMemoryUsage(hydro.prepro.get());
     if (hydro.series)
     {
         ret += hydro.series->memoryUsage();
@@ -223,27 +223,27 @@ void Area::createMissingTimeSeries()
 {
     if (!hydro.series)
     {
-        hydro.series = new DataSeriesHydro();
+        hydro.series = std::make_unique<DataSeriesHydro>();
     }
 }
 
 void Area::createMissingPrepros()
 {
     if (!load.prepro)
     {
-        load.prepro = new Data::Load::Prepro();
+        load.prepro = std::make_unique<Data::Load::Prepro>();
     }
     if (!solar.prepro)
     {
-        solar.prepro = new Data::Solar::Prepro();
+        solar.prepro = std::make_unique<Data::Solar::Prepro>();
     }
     if (!wind.prepro)
     {
-        wind.prepro = new Data::Wind::Prepro();
+        wind.prepro = std::make_unique<Data::Wind::Prepro>();
     }
     if (!hydro.prepro)
     {
-        hydro.prepro = new PreproHydro();
+        hydro.prepro = std::make_unique<PreproHydro>();
     }
     thermal.list.ensureDataPrepro();
 }

diff --git a/src/libs/antares/study/area/list.cpp b/src/libs/antares/study/area/list.cpp
@@ -934,11 +934,10 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
             ret = area.hydro.prepro->validate(area.id) && ret;
         }
 
-        auto* hydroSeries = area.hydro.series;
         if (!options.loadOnlyNeeded || !area.hydro.prepro) // Series
         {
             buffer.clear() << study.folderInput << SEP << "hydro" << SEP << "series";
-            ret = hydroSeries->loadGenerationTS(area.id, buffer, studyVersion) && ret;
+            ret = area.hydro.series->loadGenerationTS(area.id, buffer, studyVersion) && ret;
         }
 
         if (studyVersion < StudyVersion(9, 1))
@@ -953,12 +952,12 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
         else
         {
             buffer.clear() << study.folderInput << SEP << "hydro" << SEP << "series";
-            ret = hydroSeries->LoadMaxPower(area.id, buffer) && ret;
+            ret = area.hydro.series->LoadMaxPower(area.id, buffer) && ret;
         }
 
-        hydroSeries->resizeTSinDeratedMode(study.parameters.derated,
-                                           studyVersion,
-                                           study.usedByTheSolver);
+        area.hydro.series->resizeTSinDeratedMode(study.parameters.derated,
+                                                 studyVersion,
+                                                 study.usedByTheSolver);
     }
 
     // Wind
@@ -1320,7 +1319,7 @@ void AreaListEnsureDataLoadPrepro(AreaList* l)
       {
           if (!area.load.prepro)
           {
-              area.load.prepro = new Antares::Data::Load::Prepro();
+              area.load.prepro = std::make_unique<Antares::Data::Load::Prepro>();
           }
       });
 }
@@ -1335,7 +1334,7 @@ void AreaListEnsureDataSolarPrepro(AreaList* l)
       {
           if (!area.solar.prepro)
           {
-              area.solar.prepro = new Antares::Data::Solar::Prepro();
+              area.solar.prepro = std::make_unique<Antares::Data::Solar::Prepro>();
           }
       });
 }
@@ -1350,7 +1349,7 @@ void AreaListEnsureDataWindPrepro(AreaList* l)
       {
           if (!area.wind.prepro)
           {
-              area.wind.prepro = new Antares::Data::Wind::Prepro();
+              area.wind.prepro = std::make_unique<Antares::Data::Wind::Prepro>();
           }
       });
 }
@@ -1365,7 +1364,7 @@ void AreaListEnsureDataHydroTimeSeries(AreaList* l)
       {
           if (!area.hydro.series)
           {
-              area.hydro.series = new DataSeriesHydro();
+              area.hydro.series = std::make_unique<DataSeriesHydro>();
           }
       });
 }
@@ -1380,7 +1379,7 @@ void AreaListEnsureDataHydroPrepro(AreaList* l)
       {
           if (!area.hydro.prepro)
           {
-              area.hydro.prepro = new PreproHydro();
+              area.hydro.prepro = std::make_unique<PreproHydro>();
           }
       });
 }

diff --git a/src/libs/antares/study/include/antares/study/parts/hydro/container.h b/src/libs/antares/study/include/antares/study/parts/hydro/container.h
@@ -138,7 +138,7 @@ class PartHydro
     */
     PartHydro();
     //! Destructor
-    ~PartHydro();
+    ~PartHydro() = default;
 
     /*!
     ** \brief Reset internal data
@@ -211,10 +211,10 @@ class PartHydro
     HydroAllocation allocation;
 
     //! Data for the pre-processor
-    PreproHydro* prepro;
+    std::unique_ptr<PreproHydro> prepro;
 
     //! Data for time-series
-    DataSeriesHydro* series;
+    std::unique_ptr<DataSeriesHydro> series;
     // TODO : following time series could be hosted by the series data member above (of type
     // DataSeriesHydro),
     //        which contains other time.

diff --git a/src/libs/antares/study/include/antares/study/parts/load/container.h b/src/libs/antares/study/include/antares/study/parts/load/container.h
@@ -44,7 +44,7 @@ class Container final: private Yuni::NonCopyable<Container>
     */
     Container();
     //! Destructor
-    ~Container();
+    ~Container() = default;
     //@}
 
     /*!
@@ -67,9 +67,8 @@ class Container final: private Yuni::NonCopyable<Container>
     */
     uint64_t memoryUsage() const;
 
-public:
     //! Data for the pre-processor
-    Data::Load::Prepro* prepro;
+    std::unique_ptr<Data::Load::Prepro> prepro;
 
     TimeSeriesNumbers tsNumbers;
 

diff --git a/src/libs/antares/study/include/antares/study/parts/solar/container.h b/src/libs/antares/study/include/antares/study/parts/solar/container.h
@@ -41,7 +41,7 @@ class Container
     */
     Container();
     //! Destructor
-    ~Container();
+    ~Container() = default;
     //@}
 
     /*!
@@ -64,9 +64,8 @@ class Container
     */
     uint64_t memoryUsage() const;
 
-public:
     //! Data for the pre-processor
-    Data::Solar::Prepro* prepro;
+    std::unique_ptr<Data::Solar::Prepro> prepro;
 
     TimeSeriesNumbers tsNumbers;
 

diff --git a/src/libs/antares/study/include/antares/study/parts/wind/container.h b/src/libs/antares/study/include/antares/study/parts/wind/container.h
@@ -41,7 +41,7 @@ class Container
     */
     Container();
     //! Destructor
-    ~Container();
+    ~Container() = default;
     //@}
 
     /*!
@@ -64,9 +64,8 @@ class Container
     */
     uint64_t memoryUsage() const;
 
-public:
     //! Data for the pre-processor
-    Data::Wind::Prepro* prepro;
+    std::unique_ptr<Data::Wind::Prepro> prepro;
 
     TimeSeriesNumbers tsNumbers;
 

diff --git a/src/libs/antares/study/include/antares/study/progression/progression.h b/src/libs/antares/study/include/antares/study/progression/progression.h
@@ -169,15 +169,7 @@ class Progression final
     public:
         Meter();
 
-        virtual ~Meter()
-        {
-            if (logsContainer)
-            {
-                delete[] logsContainer;
-            }
-        }
-
-        void allocateLogsContainer(uint nb);
+        virtual ~Meter() = default;
 
         /*!
         ** \brief Prepare enough space to allow @n simultaneous tasks
@@ -188,16 +180,12 @@ class Progression final
         virtual bool onInterval(uint) override;
 
     public:
-        //
         Progression::Part::Map parts;
         Part::ListRef inUse;
         std::mutex mutex;
         uint nbParallelYears;
 
-        // Because writing something to the logs might be expensive, we have to
-        // reduce the time spent in locking the mutex.
-        // We will use a temp vector of string to delay the writing into the logs
-        Yuni::CString<256, false>* logsContainer;
+        std::vector<Yuni::CString<256, false>> logsContainer;
 
     }; // class Meter
 

diff --git a/src/libs/antares/study/include/antares/study/progression/progression.hxx b/src/libs/antares/study/include/antares/study/progression/progression.hxx
@@ -26,16 +26,10 @@ namespace Antares
 namespace Solver
 {
 inline Progression::Meter::Meter():
-    nbParallelYears(0),
-    logsContainer(nullptr)
+    nbParallelYears(0)
 {
 }
 
-inline void Progression::Meter::allocateLogsContainer(uint nb)
-{
-    logsContainer = new Yuni::CString<256, false>[nb];
-}
-
 inline void Progression::Meter::taskCount(uint n)
 {
     (void)n;
@@ -49,7 +43,7 @@ inline void Progression::add(Section section, int nbTicks)
 inline void Progression::setNumberOfParallelYears(uint nb)
 {
     pProgressMeter.nbParallelYears = nb;
-    pProgressMeter.allocateLogsContainer(nb);
+    pProgressMeter.logsContainer.resize(nb);
 }
 
 inline Progression::Part& Progression::begin(uint year, Progression::Section section)

diff --git a/src/libs/antares/study/parts/hydro/container.cpp b/src/libs/antares/study/parts/hydro/container.cpp
@@ -48,17 +48,10 @@ PartHydro::PartHydro():
     leewayLowerBound(1.),
     leewayUpperBound(1.),
     pumpingEfficiency(1.),
-    prepro(nullptr),
     series(nullptr)
 {
 }
 
-PartHydro::~PartHydro()
-{
-    delete prepro;
-    delete series;
-}
-
 void PartHydro::reset()
 {
     intraDailyModulation = 24;

diff --git a/src/libs/antares/study/parts/load/container.cpp b/src/libs/antares/study/parts/load/container.cpp
@@ -31,17 +31,10 @@ using namespace Yuni;
 namespace Antares::Data::Load
 {
 Container::Container():
-    prepro(nullptr),
     series(tsNumbers)
 {
 }
 
-Container::~Container()
-{
-    delete prepro;
-    prepro = nullptr;
-}
-
 bool Container::forceReload(bool reload) const
 {
     bool ret = true;

diff --git a/src/libs/antares/study/parts/solar/container.cpp b/src/libs/antares/study/parts/solar/container.cpp
@@ -31,16 +31,10 @@ using namespace Yuni;
 namespace Antares::Data::Solar
 {
 Container::Container():
-    prepro(nullptr),
     series(tsNumbers)
 {
 }
 
-Container::~Container()
-{
-    delete prepro;
-}
-
 bool Container::forceReload(bool reload) const
 {
     bool ret = true;

diff --git a/src/libs/antares/study/parts/wind/container.cpp b/src/libs/antares/study/parts/wind/container.cpp
@@ -30,16 +30,10 @@ using namespace Yuni;
 namespace Antares::Data::Wind
 {
 Container::Container():
-    prepro(nullptr),
     series(tsNumbers)
 {
 }
 
-Container::~Container()
-{
-    delete prepro;
-}
-
 bool Container::forceReload(bool reload) const
 {
     bool ret = true;

diff --git a/src/libs/antares/study/study.cpp b/src/libs/antares/study/study.cpp
@@ -979,22 +979,22 @@ bool Study::clusterRename(Cluster* cluster, ClusterName newName)
 
 void Study::destroyAllLoadTSGeneratorData()
 {
-    areas.each([](Data::Area& area) { FreeAndNil(area.load.prepro); });
+    areas.each([](Data::Area& area) { area.load.prepro.reset(); });
 }
 
 void Study::destroyAllSolarTSGeneratorData()
 {
-    areas.each([](Data::Area& area) { FreeAndNil(area.solar.prepro); });
+    areas.each([](Data::Area& area) { area.solar.prepro.reset(); });
 }
 
 void Study::destroyAllHydroTSGeneratorData()
 {
-    areas.each([](Data::Area& area) { FreeAndNil(area.hydro.prepro); });
+    areas.each([](Data::Area& area) { area.hydro.prepro.reset(); });
 }
 
 void Study::destroyAllWindTSGeneratorData()
 {
-    areas.each([](Data::Area& area) { FreeAndNil(area.wind.prepro); });
+    areas.each([](Data::Area& area) { area.wind.prepro.reset(); });
 }
 
 void Study::ensureDataAreLoadedForAllBindingConstraints()

diff --git a/src/solver/ts-generator/generator.cpp b/src/solver/ts-generator/generator.cpp
@@ -50,9 +50,7 @@ void ResizeGeneratedTimeSeries(Data::AreaList& areas, Data::Parameters& params)
           // Hydro
           if (params.timeSeriesToGenerate & Data::timeSeriesHydro)
           {
-              Data::DataSeriesHydro* const series = area.hydro.series;
-              const uint nbSeries = params.nbTimeSeriesHydro;
-              series->resizeTS(nbSeries);
+              area.hydro.series->resizeTS(params.nbTimeSeriesHydro);
           }
 
           // Thermal

diff --git a/src/solver/ts-generator/hydro.cpp b/src/solver/ts-generator/hydro.cpp
@@ -96,7 +96,7 @@ bool GenerateHydroTimeSeries(Data::Study& study, uint currentYear, Solver::IResu
     for (uint i = 0; i < DIM; i++)
     {
         uint areaIndexI = i / MONTHS_PER_YEAR;
-        auto* prepro = study.areas.byIndex[areaIndexI]->hydro.prepro;
+        auto* prepro = study.areas.byIndex[areaIndexI]->hydro.prepro.get();
 
         auto& corre = CORRE[i];
 
@@ -105,7 +105,7 @@ bool GenerateHydroTimeSeries(Data::Study& study, uint currentYear, Solver::IResu
         for (uint j = 0; j < DIM; j++)
         {
             uint areaIndexJ = j / MONTHS_PER_YEAR;
-            auto* preproJ = study.areas.byIndex[areaIndexJ]->hydro.prepro;
+            auto* preproJ = study.areas.byIndex[areaIndexJ]->hydro.prepro.get();
 
             x = std::abs(((int)(i % MONTHS_PER_YEAR) - (int)(j % MONTHS_PER_YEAR)) / 2.);