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 2016/08/03 12:53:27 UTC
[2/7] mesos git commit: Libprocess: Added missing process IDs.
Libprocess: Added missing process IDs.
After this change, all libprocess actors receive a distinguishable
ID, making it possible to match the logging output or the output of
the "__process__" enpoint to the source actor.
Review: https://reviews.apache.org/r/50513/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/20062853
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/20062853
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/20062853
Branch: refs/heads/master
Commit: 20062853df5cddf37ce2c462621fda5b765cdc3c
Parents: 987fdef
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Aug 3 13:22:01 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Aug 3 13:45:06 2016 +0200
----------------------------------------------------------------------
3rdparty/libprocess/include/process/collect.hpp | 7 +++++--
3rdparty/libprocess/include/process/protobuf.hpp | 5 ++++-
3rdparty/libprocess/include/process/run.hpp | 4 +++-
3rdparty/libprocess/src/authenticator.cpp | 5 ++++-
4 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/20062853/3rdparty/libprocess/include/process/collect.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/collect.hpp b/3rdparty/libprocess/include/process/collect.hpp
index 5a92b72..fccf55a 100644
--- a/3rdparty/libprocess/include/process/collect.hpp
+++ b/3rdparty/libprocess/include/process/collect.hpp
@@ -20,6 +20,7 @@
#include <process/check.hpp>
#include <process/defer.hpp>
#include <process/future.hpp>
+#include <process/id.hpp>
#include <process/owned.hpp>
#include <process/process.hpp>
@@ -65,7 +66,8 @@ public:
CollectProcess(
const std::list<Future<T>>& _futures,
Promise<std::list<T>>* _promise)
- : futures(_futures),
+ : ProcessBase(ID::generate("__collect__")),
+ futures(_futures),
promise(_promise),
ready(0) {}
@@ -131,7 +133,8 @@ public:
AwaitProcess(
const std::list<Future<T>>& _futures,
Promise<std::list<Future<T>>>* _promise)
- : futures(_futures),
+ : ProcessBase(ID::generate("__await__")),
+ futures(_futures),
promise(_promise),
ready(0) {}
http://git-wip-us.apache.org/repos/asf/mesos/blob/20062853/3rdparty/libprocess/include/process/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/protobuf.hpp b/3rdparty/libprocess/include/process/protobuf.hpp
index 78ff40e..695c6e6 100644
--- a/3rdparty/libprocess/include/process/protobuf.hpp
+++ b/3rdparty/libprocess/include/process/protobuf.hpp
@@ -23,6 +23,7 @@
#include <process/defer.hpp>
#include <process/dispatch.hpp>
+#include <process/id.hpp>
#include <process/process.hpp>
#include <stout/hashmap.hpp>
@@ -950,7 +951,9 @@ class ReqResProcess : public ProtobufProcess<ReqResProcess<Req, Res> >
{
public:
ReqResProcess(const process::UPID& _pid, const Req& _req)
- : pid(_pid), req(_req)
+ : process::ProcessBase(process::ID::generate("__req_res__")),
+ pid(_pid),
+ req(_req)
{
ProtobufProcess<ReqResProcess<Req, Res> >::template
install<Res>(&ReqResProcess<Req, Res>::response);
http://git-wip-us.apache.org/repos/asf/mesos/blob/20062853/3rdparty/libprocess/include/process/run.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/run.hpp b/3rdparty/libprocess/include/process/run.hpp
index d141fb0..2c8b836 100644
--- a/3rdparty/libprocess/include/process/run.hpp
+++ b/3rdparty/libprocess/include/process/run.hpp
@@ -15,6 +15,7 @@
#include <memory> // TODO(benh): Replace shared_ptr with unique_ptr.
+#include <process/id.hpp>
#include <process/process.hpp>
#include <stout/lambda.hpp>
@@ -30,7 +31,8 @@ class ThunkProcess : public Process<ThunkProcess<R>>
public:
ThunkProcess(std::shared_ptr<lambda::function<R()>> _thunk,
std::shared_ptr<Promise<R>> _promise)
- : thunk(_thunk),
+ : ProcessBase(ID::generate("__thunk__")),
+ thunk(_thunk),
promise(_promise) {}
virtual ~ThunkProcess() {}
http://git-wip-us.apache.org/repos/asf/mesos/blob/20062853/3rdparty/libprocess/src/authenticator.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/authenticator.cpp b/3rdparty/libprocess/src/authenticator.cpp
index 55e8558..cfedb6f 100644
--- a/3rdparty/libprocess/src/authenticator.cpp
+++ b/3rdparty/libprocess/src/authenticator.cpp
@@ -11,6 +11,7 @@
// limitations under the License
#include <process/authenticator.hpp>
+#include <process/id.hpp>
#include <string>
#include <vector>
@@ -53,7 +54,9 @@ private:
BasicAuthenticatorProcess::BasicAuthenticatorProcess(
const string& realm,
const hashmap<string, string>& credentials)
- : realm_(realm), credentials_(credentials) {}
+ : ProcessBase(ID::generate("__basic_authenticator__")),
+ realm_(realm),
+ credentials_(credentials) {}
Future<AuthenticationResult> BasicAuthenticatorProcess::authenticate(