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

Move from tinyxml to tinyxml2 in FWCore-MessageLogger #24503

Merged
merged 6 commits into from Oct 15, 2018
Merged

Move from tinyxml to tinyxml2 in FWCore-MessageLogger #24503

merged 6 commits into from Oct 15, 2018

Conversation

mrodozov
Copy link
Contributor

@mrodozov mrodozov commented Sep 11, 2018 •
edited

Recently we added tinyxml2 external and now we are moving pkgs that were using tinyxml to tinyxml2.

@mrodozov
Copy link
Contributor Author

please test

@cmsbuild cmsbuild added this to the CMSSW_10_3_X milestone Sep 11, 2018
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-24503/6365

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 11, 2018 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30329/console Started: 2018/09/11 15:16

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mrodozov (Mircho Rodozov) for master.

It involves the following packages:

FWCore/MessageLogger

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

cms-bot commands are listed here

Dr15Jones
Dr15Jones suggested changes Sep 11, 2018
View reviewed changes
FWCore/MessageLogger/src/JobReport.cc Outdated
branch.SetAttribute("Name", iBranch.first);
branch.SetAttribute("ReadCount", iBranch.second);
ost << branch << "\n";
tinyxml2::XMLPrinter printer;
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

FWCore/MessageLogger/src/JobReport.cc Outdated
tinyxml2::XMLElement * branch = doc.NewElement("Branch");
branch->SetAttribute("Name", iBranch.first.c_str());
branch->SetAttribute("ReadCount", int64_t(iBranch.second));
branch->Accept(&printer);
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

FWCore/MessageLogger/src/JobReport.cc Outdated
{
std::lock_guard<std::mutex> lock(write_mutex);
msg << fallback << "\n";
fallback->Accept(&printer);
Copy link
Contributor

Choose a reason for hiding this comment

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

indention

FWCore/MessageLogger/src/JobReport.cc Outdated
tinyxml2::XMLElement * branch = doc.NewElement("Branch");
branch->SetAttribute("Name", iBranch.first.c_str());
branch->SetAttribute("ReadCount", int64_t(iBranch.second));
branch->Accept(&printer);
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

FWCore/MessageLogger/src/JobReport.cc Outdated
branch.SetAttribute("Name", iBranch.first);
branch.SetAttribute("ReadCount", iBranch.second.value().load());
ost << branch << "\n";
tinyxml2::XMLPrinter printer;
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

FWCore/MessageLogger/src/JobReport.cc Outdated
tinyxml2::XMLElement * branch = doc.NewElement("Branch");
branch->SetAttribute("Name", iBranch.first.c_str());
branch->SetAttribute("ReadCount", int64_t(iBranch.second.value().load()));
branch->Accept(&printer);
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

FWCore/MessageLogger/src/JobReport.cc Outdated
branch.SetAttribute("Name", iBranch.first);
branch.SetAttribute("ReadCount", iBranch.second);
ost << branch << "\n";
tinyxml2::XMLPrinter printer;
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

FWCore/MessageLogger/src/JobReport.cc Outdated
{
std::lock_guard<std::mutex> lock(write_mutex);
msg << skipped << "\n";
skipped->Accept(&printer);
Copy link
Contributor

Choose a reason for hiding this comment

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

Please keep consistent indentation

FWCore/MessageLogger/src/JobReport.cc
@@ -725,7 +742,7 @@ namespace edm {
JobReport::dumpFiles(void) {
std::ostringstream msg;


tinyxml2::XMLDocument doc;
Copy link
Contributor

Choose a reason for hiding this comment

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

Will having the doc outside of the loop mean it will accumulate memory until the loop finishes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The last commit is using a method to delete the document nodes when the doc is used to create new text objects inside loops.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-24503/6370

@cmsbuild
Copy link
Contributor

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

@mrodozov
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 11, 2018 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30339/console Started: 2018/09/11 18:12

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 6, 2018

-1
@mrodozov This pull request cannot be automatically merged, could you please rebase it?

You can see the log for git cms-merge-topic here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-24503/30909/git-merge-result

@smuzaffar smuzaffar modified the milestones: CMSSW_10_3_X, CMSSW_10_4_X Oct 10, 2018
@fabiocos
Copy link
Contributor

please test

I would suggest to merge this PR and then #24810

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 11, 2018 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30979/console Started: 2018/10/11 13:50

@cmsbuild
Copy link
Contributor

+1
Tested at: 7cd589d
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-24503/30979/summary.html

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 2995443
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2995244
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 134 log files, 14 edm output root files, 32 DQM output files

@fabiocos
Copy link
Contributor

@qliphy @efeyazgan @alberto-sanchez ping

@alberto-sanchez
Copy link
Member

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 1ae4a7f into cms-sw:master Oct 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dr15Jones Dr15Jones Dr15Jones requested changes

Assignees
No one assigned
Labels
code-checks-approved comparison-available core-approved fully-signed generators-approved orp-approved tests-approved
Projects
None yet
Milestone
CMSSW_10_4_X
Development

Successfully merging this pull request may close these issues.

None yet