Merge lp://staging/~ted/ubuntu-app-launch/app-object-signals into lp://staging/ubuntu-app-launch
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Ted Gould | ||||
| Approved revision: | 314 | ||||
| Merged at revision: | 275 | ||||
| Proposed branch: | lp://staging/~ted/ubuntu-app-launch/app-object-signals | ||||
| Merge into: | lp://staging/ubuntu-app-launch | ||||
| Diff against target: |
3388 lines (+1673/-939) 24 files modified
libubuntu-app-launch/application-impl-base.cpp (+15/-16) libubuntu-app-launch/application.cpp (+5/-0) libubuntu-app-launch/helper.h (+12/-0) libubuntu-app-launch/libubuntu-app-launch.map (+1/-0) libubuntu-app-launch/registry-impl.cpp (+565/-29) libubuntu-app-launch/registry-impl.h (+88/-11) libubuntu-app-launch/registry.cpp (+49/-6) libubuntu-app-launch/registry.h (+123/-14) libubuntu-app-launch/ubuntu-app-launch.cpp (+298/-436) tests/CMakeLists.txt (+1/-0) tests/failure-test.cc (+123/-96) tests/libual-cpp-test.cc (+192/-141) tools/CMakeLists.txt (+21/-2) tools/ubuntu-app-info.cpp (+18/-9) tools/ubuntu-app-launch.cpp (+56/-68) tools/ubuntu-app-list-pids.cpp (+7/-3) tools/ubuntu-app-list.cpp (+1/-1) tools/ubuntu-app-pid.cpp (+8/-4) tools/ubuntu-app-stop.cpp (+7/-3) tools/ubuntu-app-triplet.cpp (+1/-1) tools/ubuntu-app-watch.cpp (+61/-88) tools/ubuntu-helper-list.cpp (+1/-1) tools/ubuntu-helper-start.cpp (+10/-5) tools/ubuntu-helper-stop.cpp (+10/-5) |
||||
| To merge this branch: | bzr merge lp://staging/~ted/ubuntu-app-launch/app-object-signals | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Needs Fixing | ||
| Charles Kerr (community) | Approve | ||
| unity-api-1-bot | continuous-integration | Needs Fixing | |
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-05-16.
Commit message
Change signals into C++ core::signal objects
Description of the change
This branch, on its own, is reshuffling the chairs on the deck of the Titanic. We're mostly setting up the branches to abstract out Upstart and Systemd but need to get the signals converted first. This is a "small" step on that road.
All of the signals now come from the Registry and then the C signals use the default registry to register against. The C signals also keep track of context as the previous C API was GLib based and that's what GLib callers would expect. The C++ signals require marshalling to the appropriate thread if needed.
There is also the addition of the manager interface, but we're not yet in this branch actually blocking the startup of apps based on it. Though the interface is designed to do that in the future.
Lastly, the C++ signals also have a space for the instance, but the signals would have to be changed. Saving that for the next branch to avoid complicating this one as little as possible. There are several TODOs in the code because of this.
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| Michael Terry (mterry) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| Ted Gould (ted) | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| Charles Kerr (charlesk) wrote | # |
| Ted Gould (ted) | # |
| Ted Gould (ted) wrote | # |
| Ted Gould (ted) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
FAILED: Continuous integration, rev:232
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://