You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/11/13 20:53:14 UTC
[4/4] mesos git commit: Passed scheduler as a shared pointer into the
callback.
Passed scheduler as a shared pointer into the callback.
To ensure the lifetime of the scheduler is longer than the lifetime
of the scheduler library driver, pass scheduler as a shared_ptr.
Review: https://reviews.apache.org/r/63615/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/57eeef05
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/57eeef05
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/57eeef05
Branch: refs/heads/master
Commit: 57eeef05668bf73cbc3c0c38ca28dbf0b90ab8b1
Parents: 8194e7c
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Nov 13 21:52:35 2017 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Nov 13 21:52:35 2017 +0100
----------------------------------------------------------------------
src/tests/mesos.hpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/57eeef05/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 495c5a0..f251732 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -2358,22 +2358,20 @@ public:
TestMesos(
const std::string& master,
ContentType contentType,
- const std::shared_ptr<MockHTTPScheduler<Mesos, Event>>& _scheduler,
+ const std::shared_ptr<MockHTTPScheduler<Mesos, Event>>& scheduler,
const Option<std::shared_ptr<mesos::master::detector::MasterDetector>>&
detector = None())
: Mesos(
master,
contentType,
- // We don't pass the `_scheduler` shared pointer as the library
- // interface expects a `std::function` object.
lambda::bind(&MockHTTPScheduler<Mesos, Event>::connected,
- _scheduler.get(),
+ scheduler,
this),
lambda::bind(&MockHTTPScheduler<Mesos, Event>::disconnected,
- _scheduler.get(),
+ scheduler,
this),
lambda::bind(&MockHTTPScheduler<Mesos, Event>::events,
- _scheduler,
+ scheduler,
this,
lambda::_1),
v1::DEFAULT_CREDENTIAL,