You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2014/07/31 22:09:18 UTC
[3/5] git commit: Fixed namespace and todo styles in mesos source
Fixed namespace and todo styles in mesos source
Review: https://reviews.apache.org/r/23596
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/db8235ee
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/db8235ee
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/db8235ee
Branch: refs/heads/master
Commit: db8235ee8b029e363d378a021695fbf0008b97c5
Parents: 0e89e6d
Author: Timothy Chen <tn...@apache.org>
Authored: Thu Jul 31 11:55:40 2014 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Thu Jul 31 12:22:40 2014 -0700
----------------------------------------------------------------------
include/mesos/values.hpp | 6 +++---
src/common/factory.hpp | 6 ++++--
src/common/protobuf_utils.hpp | 2 +-
src/common/status_utils.hpp | 7 +++----
src/common/type_utils.hpp | 2 +-
src/common/values.cpp | 4 ++--
src/examples/utils.hpp | 2 +-
src/exec/exec.cpp | 2 +-
src/linux/cgroups.cpp | 4 ++--
src/linux/routing/link/link.hpp | 4 ++--
src/linux/routing/route.cpp | 4 ++--
src/linux/routing/route.hpp | 4 ++--
src/master/constants.cpp | 4 ++--
src/master/constants.hpp | 4 ++--
src/master/flags.hpp | 4 ++--
src/master/master.cpp | 5 +++--
src/master/repairer.cpp | 4 ++--
src/python/native/mesos_executor_driver_impl.cpp | 3 ++-
src/python/native/mesos_executor_driver_impl.hpp | 3 ++-
src/python/native/mesos_scheduler_driver_impl.hpp | 3 ++-
src/python/native/module.cpp | 2 +-
src/python/native/module.hpp | 3 ++-
src/sched/sched.cpp | 9 +++++----
src/slave/flags.hpp | 4 ++--
src/slave/gc.cpp | 4 ++--
src/slave/gc.hpp | 4 ++--
src/slave/slave.cpp | 3 ++-
27 files changed, 57 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/include/mesos/values.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/values.hpp b/include/mesos/values.hpp
index 1bbf2ca..c61f9e8 100644
--- a/include/mesos/values.hpp
+++ b/include/mesos/values.hpp
@@ -61,9 +61,9 @@ namespace values {
Try<Value> parse(const std::string& text);
-} // namespace values
-} // namespace internal
+} // namespace values {
+} // namespace internal {
-} // namespace mesos
+} // namespace mesos {
#endif // __VALUES_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/common/factory.hpp
----------------------------------------------------------------------
diff --git a/src/common/factory.hpp b/src/common/factory.hpp
index cca7888..ade0503 100644
--- a/src/common/factory.hpp
+++ b/src/common/factory.hpp
@@ -31,7 +31,7 @@
// based on a registered name for each subclass. To use them:
//
// 1) In a header file, call DECLARE_FACTORY(T, P).
-//
+//
// 2) In a source file, call DEFINE_FACTORY(T, P) { block }, where the block
// calls registerClass<C>("name") for each subclass C of T to register.
//
@@ -113,7 +113,9 @@ protected:
}
};
-}}}
+} // namespace factory {
+} // namespace internal {
+} // namespace mesos {
#endif
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/common/protobuf_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.hpp b/src/common/protobuf_utils.hpp
index 21f3a02..809e4b2 100644
--- a/src/common/protobuf_utils.hpp
+++ b/src/common/protobuf_utils.hpp
@@ -52,7 +52,7 @@ Task createTask(const TaskInfo& task,
// Helper function that creates a MasterInfo from UPID.
MasterInfo createMasterInfo(const process::UPID& pid);
-} // namespace protobuf
+} // namespace protobuf {
} // namespace internal {
} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/common/status_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/status_utils.hpp b/src/common/status_utils.hpp
index 972955d..c51a8c6 100644
--- a/src/common/status_utils.hpp
+++ b/src/common/status_utils.hpp
@@ -41,9 +41,8 @@ inline std::string WSTRINGIFY(int status)
return message;
}
-} // namespace status
-} // namespace internal
-} // namespace mesos
+} // namespace status {
+} // namespace internal {
+} // namespace mesos {
#endif // __STATUS_UTILS_HPP__
-
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/common/type_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/type_utils.hpp b/src/common/type_utils.hpp
index b6a2f4e..480c088 100644
--- a/src/common/type_utils.hpp
+++ b/src/common/type_utils.hpp
@@ -365,6 +365,6 @@ inline std::ostream& operator << (
} // namespace log {
} // namespace internal {
-} // namespace mesos
+} // namespace mesos {
#endif // __TYPE_UTILS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/common/values.cpp
----------------------------------------------------------------------
diff --git a/src/common/values.cpp b/src/common/values.cpp
index e90c572..c524459 100644
--- a/src/common/values.cpp
+++ b/src/common/values.cpp
@@ -191,7 +191,7 @@ static void add(Value::Ranges* result, int64_t begin, int64_t end)
range->set_end(end);
}
-}
+} // namespace ranges {
// Coalesce the given 'range' into already coalesced 'ranges'.
@@ -588,4 +588,4 @@ bool operator == (const Value::Text& left, const Value::Text& right)
return left.value() == right.value();
}
-} // namespace mesos
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/examples/utils.hpp
----------------------------------------------------------------------
diff --git a/src/examples/utils.hpp b/src/examples/utils.hpp
index e8b68f8..2427507 100644
--- a/src/examples/utils.hpp
+++ b/src/examples/utils.hpp
@@ -40,6 +40,6 @@ inline double getScalarResource(const Offer& offer, const std::string& name)
return value;
}
-} // namespace mesos
+} // namespace mesos {
#endif // __EXAMPLES_UTILS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index e09ac8d..15d41eb 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -469,7 +469,7 @@ protected:
stopwatch.start();
}
- // TODO: Pass an argument to shutdown to tell it this is abnormal?
+ // TODO(benh): Pass an argument to shutdown to tell it this is abnormal?
executor->shutdown(driver);
VLOG(1) << "Executor::shutdown took " << stopwatch.elapsed();
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/linux/cgroups.cpp
----------------------------------------------------------------------
diff --git a/src/linux/cgroups.cpp b/src/linux/cgroups.cpp
index 6a73dd7..af6be22 100644
--- a/src/linux/cgroups.cpp
+++ b/src/linux/cgroups.cpp
@@ -1060,7 +1060,7 @@ Try<set<pid_t> > tasks(
return pids;
}
-} // namespace internal
+} // namespace internal {
// NOTE: It is possible for a process pid to be in more than one cgroup if it
@@ -1685,7 +1685,7 @@ Future<Nothing> discard(Future<Nothing> future)
return future;
}
-} // namespace
+} // namespace {
Future<Nothing> destroy(
const string& hierarchy,
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/linux/routing/link/link.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/link/link.hpp b/src/linux/routing/link/link.hpp
index 9b0cbe9..7e5b79e 100644
--- a/src/linux/routing/link/link.hpp
+++ b/src/linux/routing/link/link.hpp
@@ -113,7 +113,7 @@ Try<bool> setMTU(const std::string& link, unsigned int mtu);
// Returns the statistics of the link.
Result<hashmap<std::string, uint64_t> > statistics(const std::string& link);
-} // namespace link
-} // namespace routing
+} // namespace link {
+} // namespace routing {
#endif // __LINUX_ROUTING_LINK_LINK_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/linux/routing/route.cpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/route.cpp b/src/linux/routing/route.cpp
index 00d41fa..8086034 100644
--- a/src/linux/routing/route.cpp
+++ b/src/linux/routing/route.cpp
@@ -136,5 +136,5 @@ Result<net::IP> defaultGateway()
return None();
}
-} // namespace route
-} // namespace routing
+} // namespace route {
+} // namespace routing {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/linux/routing/route.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/route.hpp b/src/linux/routing/route.hpp
index 435b981..f443e06 100644
--- a/src/linux/routing/route.hpp
+++ b/src/linux/routing/route.hpp
@@ -59,7 +59,7 @@ Try<std::vector<Rule> > table();
// Returns the default gateway of this host.
Result<net::IP> defaultGateway();
-} // namespace route
-} // namespace routing
+} // namespace route {
+} // namespace routing {
#endif // __LINUX_ROUTING_ROUTE_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/master/constants.cpp
----------------------------------------------------------------------
diff --git a/src/master/constants.cpp b/src/master/constants.cpp
index ea583a9..faa1503 100644
--- a/src/master/constants.cpp
+++ b/src/master/constants.cpp
@@ -42,6 +42,6 @@ const Duration WHITELIST_WATCH_INTERVAL = Seconds(5);
const uint32_t TASK_LIMIT = 100;
const std::string MASTER_INFO_LABEL = "info";
const Duration ZOOKEEPER_SESSION_TIMEOUT = Seconds(10);
-} // namespace mesos {
-} // namespace internal {
} // namespace master {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/master/constants.hpp
----------------------------------------------------------------------
diff --git a/src/master/constants.hpp b/src/master/constants.hpp
index 8ace682..3b4d68b 100644
--- a/src/master/constants.hpp
+++ b/src/master/constants.hpp
@@ -96,8 +96,8 @@ extern const std::string MASTER_INFO_LABEL;
// TODO(vinod): Master detector/contender should use this timeout.
extern const Duration ZOOKEEPER_SESSION_TIMEOUT;
-} // namespace mesos {
-} // namespace internal {
} // namespace master {
+} // namespace internal {
+} // namespace mesos {
#endif // __MASTER_CONSTANTS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/master/flags.hpp
----------------------------------------------------------------------
diff --git a/src/master/flags.hpp b/src/master/flags.hpp
index 848d28b..2b92de3 100644
--- a/src/master/flags.hpp
+++ b/src/master/flags.hpp
@@ -314,8 +314,8 @@ public:
Option<RateLimits> rate_limits;
};
-} // namespace mesos {
-} // namespace internal {
} // namespace master {
+} // namespace internal {
+} // namespace mesos {
#endif // __MASTER_FLAGS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 273a516..77f2536 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1428,8 +1428,9 @@ void Master::_reregisterFramework(
// pid, given the existing libprocess primitives (PID does not
// identify the libprocess Process instance).
- // TODO: Should we check whether the new scheduler has given
- // us a different framework name, user name or executor info?
+ // TODO(benh): Should we check whether the new scheduler has
+ // given us a different framework name, user name or executor
+ // info?
LOG(INFO) << "Framework " << frameworkInfo.id() << " failed over";
failoverFramework(framework, from);
} else if (from != framework->pid) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/master/repairer.cpp
----------------------------------------------------------------------
diff --git a/src/master/repairer.cpp b/src/master/repairer.cpp
index 151b4ed..454e137 100644
--- a/src/master/repairer.cpp
+++ b/src/master/repairer.cpp
@@ -41,6 +41,6 @@ Repairer::~Repairer()
}
-} // namespace mesos {
-} // namespace internal {
} // namespace master {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/python/native/mesos_executor_driver_impl.cpp
----------------------------------------------------------------------
diff --git a/src/python/native/mesos_executor_driver_impl.cpp b/src/python/native/mesos_executor_driver_impl.cpp
index 407d8d1..16b9bc1 100644
--- a/src/python/native/mesos_executor_driver_impl.cpp
+++ b/src/python/native/mesos_executor_driver_impl.cpp
@@ -345,4 +345,5 @@ PyObject* MesosExecutorDriverImpl_sendFrameworkMessage(
return PyInt_FromLong(status); // Sets an exception if creating the int fails
}
-}} /* namespace mesos { namespace python { */
+} // namespace python {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/python/native/mesos_executor_driver_impl.hpp
----------------------------------------------------------------------
diff --git a/src/python/native/mesos_executor_driver_impl.hpp b/src/python/native/mesos_executor_driver_impl.hpp
index ce0571f..7245414 100644
--- a/src/python/native/mesos_executor_driver_impl.hpp
+++ b/src/python/native/mesos_executor_driver_impl.hpp
@@ -99,6 +99,7 @@ PyObject* MesosExecutorDriverImpl_sendFrameworkMessage(
MesosExecutorDriverImpl* self,
PyObject* args);
-}} /* namespace mesos { namespace python { */
+} // namespace python {
+} // namespace mesos {
#endif /* MESOS_EXECUTOR_DRIVER_IMPL_HPP */
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/python/native/mesos_scheduler_driver_impl.hpp
----------------------------------------------------------------------
diff --git a/src/python/native/mesos_scheduler_driver_impl.hpp b/src/python/native/mesos_scheduler_driver_impl.hpp
index 772227e..8c285ae 100644
--- a/src/python/native/mesos_scheduler_driver_impl.hpp
+++ b/src/python/native/mesos_scheduler_driver_impl.hpp
@@ -119,6 +119,7 @@ PyObject* MesosSchedulerDriverImpl_reconcileTasks(
MesosSchedulerDriverImpl* self,
PyObject* args);
-}} /* namespace mesos { namespace python { */
+} // namespace python {
+} // namespace mesos {
#endif /* MESOS_SCHEDULER_DRIVER_IMPL_HPP */
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/python/native/module.cpp
----------------------------------------------------------------------
diff --git a/src/python/native/module.cpp b/src/python/native/module.cpp
index b947126..f523c1f 100644
--- a/src/python/native/module.cpp
+++ b/src/python/native/module.cpp
@@ -67,7 +67,7 @@ PyMethodDef MODULE_METHODS[] = {
{NULL, NULL, 0, NULL} /* Sentinel */
};
-} /* end namespace */
+} // namespace {
/**
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/python/native/module.hpp
----------------------------------------------------------------------
diff --git a/src/python/native/module.hpp b/src/python/native/module.hpp
index 1be2e38..1c35e2e 100644
--- a/src/python/native/module.hpp
+++ b/src/python/native/module.hpp
@@ -132,6 +132,7 @@ PyObject* createPythonProtobuf(const T& t, const char* typeName)
str.size());
}
-}} /* namespace mesos { namespace python { */
+} // namespace python {
+} // namespace mesos {
#endif /* MODULE_HPP */
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index c2da5bb..cbc5291 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -1289,10 +1289,11 @@ Status MesosSchedulerDriver::stop(bool failover)
dispatch(process, &SchedulerProcess::stop, failover);
}
- // TODO: It might make more sense to clean up our local cluster here than in
- // the destructor. However, what would be even better is to allow multiple
- // local clusters to exist (i.e. not use global vars in local.cpp) so that
- // ours can just be an instance variable in MesosSchedulerDriver.
+ // TODO(benh): It might make more sense to clean up our local
+ // cluster here than in the destructor. However, what would be even
+ // better is to allow multiple local clusters to exist (i.e. not use
+ // global vars in local.cpp) so that ours can just be an instance
+ // variable in MesosSchedulerDriver.
bool aborted = status == DRIVER_ABORTED;
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/slave/flags.hpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp
index 79742dd..146c401 100644
--- a/src/slave/flags.hpp
+++ b/src/slave/flags.hpp
@@ -339,8 +339,8 @@ public:
#endif
};
-} // namespace mesos {
-} // namespace internal {
} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
#endif // __SLAVE_FLAGS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/slave/gc.cpp
----------------------------------------------------------------------
diff --git a/src/slave/gc.cpp b/src/slave/gc.cpp
index 3720255..73136dd 100644
--- a/src/slave/gc.cpp
+++ b/src/slave/gc.cpp
@@ -206,6 +206,6 @@ void GarbageCollector::prune(const Duration& d)
dispatch(process, &GarbageCollectorProcess::prune, d);
}
-} // namespace mesos {
-} // namespace internal {
} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/slave/gc.hpp
----------------------------------------------------------------------
diff --git a/src/slave/gc.hpp b/src/slave/gc.hpp
index 7b6fb83..8f9398b 100644
--- a/src/slave/gc.hpp
+++ b/src/slave/gc.hpp
@@ -128,8 +128,8 @@ private:
process::Timer timer;
};
-} // namespace mesos {
-} // namespace internal {
} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
#endif // __SLAVE_GC_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/db8235ee/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index d59c514..8e40c5b 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -880,7 +880,8 @@ void Slave::doReliableRegistration(const Duration& duration)
} else {
// Re-registering, so send tasks running.
ReregisterSlaveMessage message;
- message.mutable_slave_id()->CopyFrom(info.id()); // TODO: deprecate this.
+ // TODO(bmahler): deprecate this.
+ message.mutable_slave_id()->CopyFrom(info.id());
message.mutable_slave()->CopyFrom(info);
foreachvalue (Framework* framework, frameworks) {