Skip to content
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

Jump to bottom

FWCore Catalog Memory Cleanup after XML Parsing #15116

Merged
merged 13 commits into from Jul 19, 2016
Merged

FWCore Catalog Memory Cleanup after XML Parsing #15116

merged 13 commits into from Jul 19, 2016

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Jul 5, 2016

  • Release memory and cleanup after parsing an xml file

@ianna ianna closed this Jul 5, 2016
@cmsbuild cmsbuild added this to the Next CMSSW_8_1_X milestone Jul 5, 2016
@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2016

A new Pull Request was created by @ianna (Ianna Osborne) for CMSSW_8_1_X.

It involves the following packages:

FWCore/Catalog

@cmsbuild, @smuzaffar, @Dr15Jones, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @wddgit, @wmtan this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@ianna ianna reopened this Jul 5, 2016
@ianna
Copy link
Contributor Author

ianna commented Jul 5, 2016

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2016 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/13868/console

@ianna
Copy link
Contributor Author

ianna commented Jul 5, 2016

@Dr15Jones - I'm not sure how to test the changes. Please, see #15115

@ianna ianna mentioned this pull request Jul 5, 2016
Merged
@Dr15Jones
Copy link
Contributor

This code would also benefit from using a class to control the lifetime of the char* returned from the XML parser.

ianna
ianna reviewed Jul 5, 2016
View reviewed changes
FWCore/Catalog/src/FileLocator.cc
@@ -19,15 +19,12 @@ using namespace xercesc;
namespace {

inline std::string _toString(XMLCh const* toTranscode) {
std::string tmp(XMLString::transcode(toTranscode));
char* localForm = XMLString::transcode(toTranscode);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dr15Jones - do you mean this one?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function would just take a OwningXMLStringPtr as argument.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2016

+1
Tested at: 09a4c75
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15116/13868/summary.html

@ianna
Copy link
Contributor Author

ianna commented Jul 5, 2016

hold

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2016

Pull request has been put on hold by @ianna
They need to issue an unhold command to remove the hold state or L1 can unhold it for all

@cmsbuild cmsbuild added the hold label Jul 5, 2016
@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2016

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15116/13868/summary.html

The workflows 1003.0, 1001.0, 1000.0 have different files in step1_dasquery.log than the ones found in the baseline. You may want to check and retrigger the tests if necessary. You can check it in the "files" directory in the results of the comparisons

@cmsbuild
Copy link
Contributor

Pull request #15116 was updated. @cmsbuild, @smuzaffar, @Dr15Jones, @davidlange6 can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #15116 was updated. @cmsbuild, @smuzaffar, @Dr15Jones, @davidlange6 can you please check and sign again.

@ianna
Copy link
Contributor Author

ianna commented Jul 11, 2016

unhold

@cmsbuild cmsbuild removed the hold label Jul 11, 2016
@ianna
Copy link
Contributor Author

ianna commented Jul 11, 2016

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 11, 2016 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/13962/console

@Dr15Jones
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

+1
Tested at: 86624be
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15116/13962/summary.html

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15116/13962/summary.html

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit cf672ff into cms-sw:CMSSW_8_1_X Jul 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
comparison-available core-approved fully-signed orp-approved tests-approved
Projects
None yet
Milestone
Next CMSSW_8_1_X
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ianna @cmsbuild @Dr15Jones @davidlange6