Skip to content

[BP 636][io] fix small memleak in streamerInfoActions #18485

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
merged 3 commits into from
Apr 25, 2025
Merged

[BP 636][io] fix small memleak in streamerInfoActions #18485

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0092b4
[skip-ci] document memory management in streamerinfoactions
ferdymercury Apr 22, 2025
08ea9b9
[nfc] fix typo in function signature
ferdymercury Apr 22, 2025
f2f3d3b
[io] fix memleak in extra loopConfig copy
ferdymercury Apr 22, 2025
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
25 changes: 16 additions & 9 deletions io/io/src/TStreamerInfoActions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,17 +1514,23 @@ namespace TStreamerInfoActions
template<typename Looper>
struct CollectionLooper {

/// \param loopConfig pointer ownership stays at the caller, a copy is performed and transferred to the
/// TActionSequence class (stored as public fLoopConfig internally, will be deleted in destructor) \return unique
/// pointer of type TActionSequence
static std::unique_ptr<TStreamerInfoActions::TActionSequence>
CreateReadActionSquence(TStreamerInfo &info, TLoopConfiguration *loopConfig)
CreateReadActionSequence(TStreamerInfo &info, TLoopConfiguration *loopConfig)
{
TLoopConfiguration *localLoopConfig = loopConfig ? loopConfig->Copy() : nullptr;
std::unique_ptr<TStreamerInfoActions::TActionSequence> actions(
TActionSequence::CreateReadMemberWiseActions(info, localLoopConfig));
return actions;
}

/// \param loopConfig pointer ownership stays at the caller, a copy is performed and transferred to the
/// TActionSequence class (stored as public fLoopConfig internally, will be deleted in destructor) \return unique
/// pointer of type TActionSequence
static std::unique_ptr<TStreamerInfoActions::TActionSequence>
CreateWriteActionSquence(TStreamerInfo &info, TLoopConfiguration *loopConfig)
CreateWriteActionSequence(TStreamerInfo &info, TLoopConfiguration *loopConfig)
{
TLoopConfiguration *localLoopConfig = loopConfig ? loopConfig->Copy() : nullptr;
std::unique_ptr<TStreamerInfoActions::TActionSequence> actions(
Expand Down Expand Up @@ -2474,14 +2480,14 @@ namespace TStreamerInfoActions
using WriteStreamerLoop = CollectionLooper<VectorPtrLooper>::WriteStreamerLoop<kIsText, const void *>;

static std::unique_ptr<TStreamerInfoActions::TActionSequence>
CreateReadActionSquence(TStreamerInfo &info, TLoopConfiguration *)
CreateReadActionSequence(TStreamerInfo &info, TLoopConfiguration *)
{
using unique_ptr = std::unique_ptr<TStreamerInfoActions::TActionSequence>;
return unique_ptr(info.GetReadMemberWiseActions(kTRUE)->CreateCopy());
}

static std::unique_ptr<TStreamerInfoActions::TActionSequence>
CreateWriteActionSquence(TStreamerInfo &info, TLoopConfiguration *)
CreateWriteActionSequence(TStreamerInfo &info, TLoopConfiguration *)
{
using unique_ptr = std::unique_ptr<TStreamerInfoActions::TActionSequence>;
return unique_ptr(info.GetWriteMemberWiseActions(kTRUE)->CreateCopy());
Expand Down Expand Up @@ -3706,8 +3712,7 @@ GetCollectionReadAction(TVirtualStreamerInfo *info, TLoopConfiguration *loopConf
if (baseEl) {
auto baseinfo = (TStreamerInfo *)baseEl->GetBaseStreamerInfo();
assert(baseinfo);
TLoopConfiguration *baseLoopConfig = loopConfig ? loopConfig->Copy() : nullptr;
auto baseActions = Looper::CreateReadActionSquence(*baseinfo, baseLoopConfig);
auto baseActions = Looper::CreateReadActionSequence(*baseinfo, loopConfig);
baseActions->AddToOffset(baseEl->GetOffset());
return TConfiguredAction( Looper::SubSequenceAction, new TConfSubSequence(info, i, compinfo, 0, std::move(baseActions)));

Expand Down Expand Up @@ -4026,8 +4031,7 @@ GetCollectionWriteAction(TVirtualStreamerInfo *info, TLoopConfiguration *loopCon
if (baseEl) {
auto baseinfo = (TStreamerInfo *)baseEl->GetBaseStreamerInfo();
assert(baseinfo);
TLoopConfiguration *baseLoopConfig = loopConfig ? loopConfig->Copy() : nullptr;
auto baseActions = Looper::CreateWriteActionSquence(*baseinfo, baseLoopConfig);
auto baseActions = Looper::CreateWriteActionSequence(*baseinfo, loopConfig);
baseActions->AddToOffset(baseEl->GetOffset());
return TConfiguredAction( Looper::SubSequenceAction, new TConfSubSequence(info, i, compinfo, 0, std::move(baseActions)));

Expand Down Expand Up @@ -5309,7 +5313,10 @@ TStreamerInfoActions::TActionSequence *TStreamerInfoActions::TActionSequence::Cr
}

////////////////////////////////////////////////////////////////////////////////
/// Create the bundle of the actions necessary for the streaming memberwise of the content described by 'info' into the collection described by 'proxy'
/// Create the bundle of the actions necessary for the streaming memberwise of the content described by 'info' into the
/// collection described by 'proxy' \param loopConfig pointer ownership is taken from the caller and transferred to the
/// TActionSequence class (stored as public fLoopConfig internally, will be deleted in destructor) \return new
/// `sequence` pointer of type TActionSequence, the memory ownership is transferred to caller, must delete it later

TStreamerInfoActions::TActionSequence *TStreamerInfoActions::TActionSequence::CreateWriteMemberWiseActions(TVirtualStreamerInfo &info, TLoopConfiguration *loopConfig)
{
Expand Down
Loading