You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/03/18 21:21:15 UTC
mesos git commit: Cleaned up formatting in executor library.
Repository: mesos
Updated Branches:
refs/heads/master cdc381aac -> 888c8af0b
Cleaned up formatting in executor library.
The general pattern for formatting the code is to
reduce jaggedness and increase readability.
Review: https://reviews.apache.org/r/44651/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/888c8af0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/888c8af0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/888c8af0
Branch: refs/heads/master
Commit: 888c8af0bb7ef1170c19ab2f0ec6a38dd8d945e0
Parents: cdc381a
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Fri Mar 18 13:20:25 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Mar 18 13:20:25 2016 -0700
----------------------------------------------------------------------
src/exec/exec.cpp | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/888c8af0/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index 7417861..ede16f4 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -111,18 +111,19 @@ protected:
class ExecutorProcess : public ProtobufProcess<ExecutorProcess>
{
public:
- ExecutorProcess(const UPID& _slave,
- MesosExecutorDriver* _driver,
- Executor* _executor,
- const SlaveID& _slaveId,
- const FrameworkID& _frameworkId,
- const ExecutorID& _executorId,
- bool _local,
- const string& _directory,
- bool _checkpoint,
- const Duration& _recoveryTimeout,
- std::recursive_mutex* _mutex,
- Latch* _latch)
+ ExecutorProcess(
+ const UPID& _slave,
+ MesosExecutorDriver* _driver,
+ Executor* _executor,
+ const SlaveID& _slaveId,
+ const FrameworkID& _frameworkId,
+ const ExecutorID& _executorId,
+ bool _local,
+ const string& _directory,
+ bool _checkpoint,
+ const Duration& _recoveryTimeout,
+ std::recursive_mutex* _mutex,
+ Latch* _latch)
: ProcessBase(ID::generate("executor")),
slave(_slave),
driver(_driver),
@@ -202,11 +203,12 @@ protected:
send(slave, message);
}
- void registered(const ExecutorInfo& executorInfo,
- const FrameworkID& frameworkId,
- const FrameworkInfo& frameworkInfo,
- const SlaveID& slaveId,
- const SlaveInfo& slaveInfo)
+ void registered(
+ const ExecutorInfo& executorInfo,
+ const FrameworkID& frameworkId,
+ const FrameworkInfo& frameworkInfo,
+ const SlaveID& slaveId,
+ const SlaveInfo& slaveInfo)
{
if (aborted.load()) {
VLOG(1) << "Ignoring registered message from slave " << slaveId
@@ -358,10 +360,11 @@ protected:
tasks.erase(taskId);
}
- void frameworkMessage(const SlaveID& slaveId,
- const FrameworkID& frameworkId,
- const ExecutorID& executorId,
- const string& data)
+ void frameworkMessage(
+ const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
if (aborted.load()) {
VLOG(1) << "Ignoring framework message because the driver is aborted!";