Nux

Merge lp://staging/~3v1n0/nux/memory-fixes into lp://staging/nux

  1. memory-fixes
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 822
Merged at revision: 802
Proposed branch: lp://staging/~3v1n0/nux/memory-fixes
Merge into: lp://staging/nux
Diff against target: 1216 lines (+224/-377)
11 files modified
Nux/CairoWrapper.h (+0/-4)
Nux/TimerProc.cpp (+179/-318)
Nux/TimerProc.h (+7/-9)
NuxCore/Property-inl.h (+8/-6)
NuxCore/Property.h (+0/-15)
NuxGraphics/GraphicsDisplayX11.cpp (+14/-1)
NuxGraphics/XICClient.cpp (+2/-0)
configure.ac (+2/-2)
tests/Helpers.h (+0/-6)
tests/Makefile.am (+12/-14)
tests/gtest-nuxcore-properties.cpp (+0/-2)
To merge this branch: bzr merge lp://staging/~3v1n0/nux/memory-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+175648@code.staging.launchpad.net

Commit message

TimerProc: use std::shared_ptr to ref TimerObject in TimerHandle and a std::deque in TimerHandler

This fix several memory leaks that we are getting when the timer runs and makes the code more
maintainable.
Also various memory errors leaks.

Description of the change

After running unity tests under valgrind, I've found some bad memory usage around... Read write/errors, access to uninitialized variables and leaks. More important leaks in XGetIMValues and TimerProc, that at that point I've rewritten to use stl containers that handles std::shared_pointer's for the happiness of everybody. ;)

To post a comment you must log in.
lp://staging/~3v1n0/nux/memory-fixes updated
821. By Marco Trevisan (Treviño)

TimerProc: update copyright

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:820
http://jenkins.qa.ubuntu.com/job/nux-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM, but we need to get a unity branch out as well that bumps the ABI

review: Needs Fixing
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Local approved, waiting to merged the unity branch nux at the same time :) (hopefully all goes well!)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:821
http://jenkins.qa.ubuntu.com/job/nux-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/58/rebuild

review: Approve (continuous-integration)
lp://staging/~3v1n0/nux/memory-fixes updated
822. By Marco Trevisan (Treviño)

Property-inl.h: dont use namespace std::placeholders, or everything will inherit it.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM still

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:822
http://jenkins.qa.ubuntu.com/job/nux-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/60/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches