Skip to content

Return the ASCII system stream as unique_ptr to stop a per-load leak #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maureeungaro merged 1 commit into from
Jun 13, 2026
Merged

Return the ASCII system stream as unique_ptr to stop a per-load leak #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gemc/gsystem/gsystemFactories/text/loadGeometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ void GSystemTextFactory::loadGeometry(GSystem* system) {
gutilities::getStringVectorFromStringWithDelimiter(dbline, "|");
system->addGVolume(gvolumePars);
}

IN->close();
// IN (unique_ptr<ifstream>) closes the file and frees the stream on scope exit.
}
}
3 changes: 1 addition & 2 deletions gemc/gsystem/gsystemFactories/text/loadMaterials.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ void GSystemTextFactory::loadMaterials(GSystem* system) {
gutilities::getStringVectorFromStringWithDelimiter(dbline, "|");
system->addGMaterial(gmaterialsPars);
}

IN->close();
// IN (unique_ptr<ifstream>) closes the file and frees the stream on scope exit.
}
}
5 changes: 3 additions & 2 deletions gemc/gsystem/gsystemFactories/text/systemTextFactory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@

// cpp
#include <fstream>
#include <memory>

// returns the file stream, checking all possible directories.
// SYSTEMTYPE can be:
// - GTEXTGEOMTYPE (mandatory, exit if not found)
// - GTEXTMATSTYPE
std::ifstream* GSystemTextFactory::gSystemTextFileStream(GSystem* system, const std::string& SYSTEMTYPE) {
std::unique_ptr<std::ifstream> GSystemTextFactory::gSystemTextFileStream(GSystem* system, const std::string& SYSTEMTYPE) {
std::string fileName = system->getFilePath();
std::string variation = system->getVariation();
std::string fname = fileName + SYSTEMTYPE + variation + ".txt";

log->info(0, "gSystemTextFileStream filename is: ", fname);

// default dir is "."
auto IN = new std::ifstream(fname.c_str());
auto IN = std::make_unique<std::ifstream>(fname.c_str());

if (IN->good()) {
log->info(1, "Trying file ", fname);
Expand Down
6 changes: 5 additions & 1 deletion gemc/gsystem/gsystemFactories/text/systemTextFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
// gsystem
#include <gemc/gsystem/gsystemFactories/systemFactory.h>

// c++
#include <fstream>
#include <memory>

// file types
#define GTEXTGEOMTYPE "__geometry_"
#define GTEXTMATSTYPE "__materials_"
Expand Down Expand Up @@ -76,5 +80,5 @@ class GSystemTextFactory : public GSystemFactory
* - For geometry, failure to locate a file triggers an error unless \c system->getAnnotations() is \c "mats_only".
* - For materials, failure to locate a file is treated as "no materials provided".
*/
std::ifstream* gSystemTextFileStream(GSystem* system, const std::string& SYSTEMTYPE);
std::unique_ptr<std::ifstream> gSystemTextFileStream(GSystem* system, const std::string& SYSTEMTYPE);
};