Merge lp:~ted/ubuntu-app-launch/oom-adjust-file into lp:ubuntu-app-launch/14.10
Proposed by
Ted Gould
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Charles Kerr | ||||
Approved revision: | 179 | ||||
Merged at revision: | 173 | ||||
Proposed branch: | lp:~ted/ubuntu-app-launch/oom-adjust-file | ||||
Merge into: | lp:ubuntu-app-launch/14.10 | ||||
Diff against target: |
193 lines (+72/-19) 4 files modified
libubuntu-app-launch/ubuntu-app-launch.c (+40/-17) tests/libual-test.cc (+26/-2) upstart-jobs/application-click.conf.in (+3/-0) upstart-jobs/application-legacy.conf.in (+3/-0) |
||||
To merge this branch: | bzr merge lp:~ted/ubuntu-app-launch/oom-adjust-file | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+235992@code.launchpad.net |
Commit message
Set OOM adjustment without using temporary files.
Description of the change
Fixes the OOM adjustment code which was using set_file_contents, which should work in theory, but internally it works by creating a temp file and renaming it. Which doesn't really work in /proc. So now going with the good ol' fwrite.
Also, figured out how to test this code. So now we're checking values.
To post a comment you must log in.
PASSED: Continuous integration, rev:179 jenkins. qa.ubuntu. com/job/ upstart- app-launch- ci/300/ jenkins. qa.ubuntu. com/job/ upstart- app-launch- utopic- amd64-ci/ 39 jenkins. qa.ubuntu. com/job/ upstart- app-launch- utopic- armhf-ci/ 39 jenkins. qa.ubuntu. com/job/ upstart- app-launch- utopic- i386-ci/ 39
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/upstart- app-launch- ci/300/ rebuild
http://