Skip to content

Try a second time if pop fails in ReusableObjectHolder #36813

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

Closed
Dr15Jones wants to merge 1 commit into from
Closed

Try a second time if pop fails in ReusableObjectHolder #36813

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
14 changes: 12 additions & 2 deletions FWCore/Utilities/interface/ReusableObjectHolder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ namespace edm {
if (m_availableQueue.try_pop(item)) {
return wrapCustomDeleter(std::move(item));
} else {
return std::shared_ptr<T>{};
//try a second time as try_pop can have a false failure
if (m_availableQueue.try_pop(item)) {
return wrapCustomDeleter(std::move(item));
} else {
return std::shared_ptr<T>{};
}
}
}

Expand All @@ -124,7 +129,12 @@ namespace edm {
if (m_availableQueue.try_pop(item)) {
return wrapCustomDeleter(std::move(item));
} else {
return wrapCustomDeleter(makeUnique(iMakeFunc()));
//try a second time as try_pop can have a false failure
if (m_availableQueue.try_pop(item)) {
return wrapCustomDeleter(std::move(item));
} else {
return wrapCustomDeleter(makeUnique(iMakeFunc()));
}
}
}

Expand Down