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.

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

Fix memory usage in PPSUtilities and PPSProtonTransport #26583

Merged
merged 2 commits into from May 2, 2019

Conversation

Dr15Jones
Copy link
Contributor

PR description:

  • Removed the use of non-const global variables in PPSUtilities. This was spotted by the static analyzer.
  • Moved variables from pointers to just type in PPSProtonTransport. This also fixes a double delete in HectorTransport.

PR validation:

The code compiles.

The variables are now passed as arguments to the appropriate
functions.
Moved variables to be stack based instead of heap based
Fixed a double delete happening in TotemTransport. The pointer was
passed to m_beamPart and then deleted in the function and then later
is deleted from m_beamPart.
@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

The code-checks are being triggered in jenkins.


if(m_verbosity) LogDebug("HectorTransportEventProcessing") <<
"HectorTransport:filterPPS: barcode = " << line << " x= "<< x1_ctpps <<" y= " << y1_ctpps;

m_beamPart[line] = p_out;
m_xAtTrPoint[line] = x1_ctpps;
m_yAtTrPoint[line] = y1_ctpps;
delete p_out; p_out = nullptr;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This delete was invalidating the value of m_beamPart[line].second since the object has been deleted. This was then later deleted again in ProtonTransport::clear().

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26583/9509

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

FastSimulation/CTPPSFastTrackingProducer
SimTransport/PPSProtonTransport
Utilities/PPS

@cmsbuild, @ssekmen, @lveldere, @mdhildreth, @civanch can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @matt-komm, @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
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/34441/console Started: 2019/05/01 17:42

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2019

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3211964
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3211759
  • DQMHistoTests: Total skipped: 204
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@civanch
Copy link
Contributor

civanch commented May 2, 2019

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented May 2, 2019

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

fabiocos commented May 2, 2019

+1

@cmsbuild cmsbuild merged commit c21977c into cms-sw:master May 2, 2019
@Dr15Jones Dr15Jones deleted the noGlobalsPPSUtilities branch May 10, 2019 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants