dbus-cpp

Merge lp://staging/~thomas-voss/dbus-cpp/fix-race-in-timeouts into lp://staging/dbus-cpp

  1. fix-race-in-timeouts
  2. Merge into trunk
Proposed by Thomas Voß
Status: Needs review
Proposed branch: lp://staging/~thomas-voss/dbus-cpp/fix-race-in-timeouts
Merge into: lp://staging/dbus-cpp
Diff against target: 2653 lines (+1524/-471)
26 files modified
CMakeLists.txt (+1/-1)
debian/control (+5/-3)
debian/libdbus-cpp1.1.symbols (+2/-0)
debian/libdbus-cpp1.1.symbols.32bit (+905/-0)
debian/libdbus-cpp1.1.symbols.64bit (+498/-395)
debian/libdbus-cpp1.1.symbols.amd64 (+2/-0)
debian/libdbus-cpp1.1.symbols.arm64 (+2/-0)
debian/libdbus-cpp1.1.symbols.armhf (+2/-0)
debian/libdbus-cpp1.1.symbols.i386 (+2/-0)
debian/libdbus-cpp1.1.symbols.powerpc (+2/-0)
debian/libdbus-cpp1.1.symbols.ppc64el (+2/-0)
debian/rules (+5/-2)
include/core/dbus/compiler.h (+1/-0)
include/core/dbus/message_router.h (+2/-2)
include/core/dbus/types/variant.h (+3/-3)
src/core/dbus/asio/executor.cpp (+28/-4)
src/core/dbus/introspection_parser.cpp (+1/-0)
tests/codec_test.cpp (+9/-7)
tests/dbus_test.cpp (+1/-1)
tests/executor_test.cpp (+2/-2)
tests/service_test.cpp (+14/-6)
tests/service_watcher_test.cpp (+9/-9)
tests/sig_term_catcher.h (+7/-20)
tests/signal_delivery_test.cpp (+15/-15)
tests/stl_codec_test.cpp (+1/-1)
tests/test_service.h (+3/-0)
To merge this branch: bzr merge lp://staging/~thomas-voss/dbus-cpp/fix-race-in-timeouts
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+207808@code.staging.launchpad.net

Commit message

Fix race when cancelling timeouts.

Description of the change

Fix race when cancelling timeouts.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/110/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/110/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/131/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~thomas-voss/dbus-cpp/fix-race-in-timeouts updated
64. By Thomas Voß

Revert package version to 1 for PPA build.

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

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/132/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/111/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/111/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/132/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~thomas-voss/dbus-cpp/fix-race-in-timeouts updated
65. By Thomas Voß

Also adjust minor library version.

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

FAILED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/133/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/113/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/112/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/133/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

is this going to land?

Reply

Unmerged revisions

65. By Thomas Voß

Also adjust minor library version.

64. By Thomas Voß

Revert package version to 1 for PPA build.

63. By Thomas Voß

Fix race when cancelling timeouts.

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