Internal deprecation 1: Removed mesos::internal namespace. The namespace is redundant as it encapsulates a different namespace in most cases.
While most of the changes remove the "internal" namespace from the sources, there are two particular occasions where we do something extra. In src/master/main.cpp and src/tests/state_tests.cpp, we disambiguate `state::*` by doing a `using namespace mesos::state`. Review: https://reviews.apache.org/r/30295 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c418577 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c418577 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c418577 Branch: refs/heads/master Commit: 7c418577a2be6128bbe7ab82676e7f175c80b799 Parents: 17285e7 Author: Kapil Arya <[email protected]> Authored: Thu Feb 5 14:10:49 2015 -0800 Committer: Niklas Q. Nielsen <[email protected]> Committed: Thu Feb 5 14:10:49 2015 -0800 ---------------------------------------------------------------------- include/mesos/executor.hpp | 7 ++-- include/mesos/scheduler.hpp | 11 +++--- include/mesos/values.hpp | 2 -- src/authentication/authenticatee.hpp | 2 -- src/authentication/authenticator.hpp | 2 -- src/authentication/cram_md5/authenticatee.hpp | 2 -- src/authentication/cram_md5/authenticator.hpp | 2 -- src/authentication/cram_md5/auxprop.cpp | 2 -- src/authentication/cram_md5/auxprop.hpp | 2 -- src/authorizer/authorizer.cpp | 2 -- src/authorizer/authorizer.hpp | 2 -- src/cli/execute.cpp | 1 - src/cli/resolve.cpp | 1 - src/common/attributes.cpp | 4 --- src/common/attributes.hpp | 4 --- src/common/build.cpp | 2 -- src/common/build.hpp | 2 -- src/common/date_utils.cpp | 2 -- src/common/date_utils.hpp | 2 -- src/common/factory.hpp | 6 ++-- src/common/http.cpp | 2 -- src/common/http.hpp | 9 ++--- src/common/lock.cpp | 2 -- src/common/lock.hpp | 2 -- src/common/protobuf_utils.cpp | 2 -- src/common/protobuf_utils.hpp | 2 -- src/common/resources.cpp | 2 +- src/common/type_utils.cpp | 3 +- src/common/values.cpp | 2 -- src/credentials/credentials.hpp | 2 -- src/docker/docker.cpp | 2 +- src/examples/balloon_framework.cpp | 1 - src/examples/load_generator_framework.cpp | 4 +-- src/examples/low_level_scheduler_libprocess.cpp | 4 +-- src/examples/low_level_scheduler_pthread.cpp | 4 +-- src/examples/test_authentication_modules.cpp | 8 ++--- src/examples/test_framework.cpp | 4 +-- src/examples/test_hook_module.cpp | 1 - src/examples/test_isolator_module.cpp | 8 ++--- src/exec/exec.cpp | 5 +-- src/files/files.cpp | 2 -- src/files/files.hpp | 2 -- src/health-check/main.cpp | 6 ++-- src/hook/hook.hpp | 2 -- src/hook/manager.cpp | 2 -- src/hook/manager.hpp | 2 -- src/java/jni/org_apache_mesos_Log.cpp | 2 +- .../org_apache_mesos_state_AbstractState.cpp | 2 +- .../jni/org_apache_mesos_state_LevelDBState.cpp | 2 +- .../jni/org_apache_mesos_state_LogState.cpp | 4 +-- .../jni/org_apache_mesos_state_Variable.cpp | 2 +- .../org_apache_mesos_state_ZooKeeperState.cpp | 2 +- src/jvm/jvm.cpp | 2 +- src/launcher/executor.cpp | 6 ++-- src/launcher/fetcher.cpp | 3 +- src/linux/cgroups.cpp | 2 +- src/linux/fs.cpp | 2 -- src/linux/fs.hpp | 2 -- src/local/flags.hpp | 2 -- src/local/local.cpp | 30 ++++++++--------- src/local/local.hpp | 2 -- src/local/main.cpp | 6 ++-- src/log/catchup.cpp | 2 -- src/log/catchup.hpp | 2 -- src/log/consensus.cpp | 2 -- src/log/consensus.hpp | 4 +-- src/log/coordinator.cpp | 2 -- src/log/coordinator.hpp | 2 -- src/log/leveldb.cpp | 4 +-- src/log/leveldb.hpp | 4 +-- src/log/log.cpp | 2 -- src/log/log.hpp | 2 -- src/log/main.cpp | 3 +- src/log/recover.cpp | 2 -- src/log/recover.hpp | 2 -- src/log/replica.cpp | 2 -- src/log/replica.hpp | 4 +-- src/log/storage.hpp | 4 +-- src/log/tool.hpp | 2 -- src/log/tool/benchmark.cpp | 2 -- src/log/tool/benchmark.hpp | 2 -- src/log/tool/initialize.cpp | 2 -- src/log/tool/initialize.hpp | 2 -- src/log/tool/read.cpp | 2 -- src/log/tool/read.hpp | 2 -- src/log/tool/replica.cpp | 2 -- src/log/tool/replica.hpp | 2 -- src/logging/flags.hpp | 2 -- src/logging/logging.cpp | 2 -- src/logging/logging.hpp | 2 -- src/master/allocator.hpp | 2 -- src/master/constants.cpp | 2 -- src/master/constants.hpp | 2 -- src/master/contender.cpp | 2 -- src/master/contender.hpp | 2 -- src/master/detector.cpp | 2 -- src/master/detector.hpp | 2 -- src/master/drf_sorter.cpp | 2 -- src/master/drf_sorter.hpp | 2 -- src/master/flags.hpp | 2 -- src/master/hierarchical_allocator_process.hpp | 6 +--- src/master/http.cpp | 4 +-- src/master/main.cpp | 16 +++++---- src/master/master.cpp | 2 -- src/master/master.hpp | 2 -- src/master/metrics.cpp | 2 -- src/master/metrics.hpp | 2 -- src/master/registrar.cpp | 6 ++-- src/master/registrar.hpp | 2 -- src/master/repairer.cpp | 2 -- src/master/repairer.hpp | 2 -- src/master/sorter.hpp | 2 -- src/master/validation.cpp | 2 -- src/master/validation.hpp | 2 -- src/messages/messages.hpp | 4 +++ src/module/authenticatee.hpp | 10 +++--- src/module/authenticator.hpp | 10 +++--- src/module/hook.hpp | 10 +++--- src/module/isolator.hpp | 10 +++--- src/module/manager.cpp | 1 - src/module/manager.hpp | 6 ++-- src/sched/constants.cpp | 2 -- src/sched/constants.hpp | 2 -- src/sched/flags.hpp | 2 -- src/sched/sched.cpp | 11 +++--- src/scheduler/scheduler.cpp | 3 +- src/slave/constants.cpp | 2 -- src/slave/constants.hpp | 2 -- src/slave/containerizer/composing.cpp | 2 -- src/slave/containerizer/composing.hpp | 2 -- src/slave/containerizer/containerizer.cpp | 2 -- src/slave/containerizer/containerizer.hpp | 2 -- src/slave/containerizer/docker.cpp | 4 +-- src/slave/containerizer/docker.hpp | 2 -- .../containerizer/external_containerizer.cpp | 2 -- .../containerizer/external_containerizer.hpp | 2 -- src/slave/containerizer/fetcher.cpp | 2 -- src/slave/containerizer/fetcher.hpp | 2 -- src/slave/containerizer/isolator.cpp | 2 -- src/slave/containerizer/isolator.hpp | 2 -- .../isolators/cgroups/constants.hpp | 2 -- .../isolators/cgroups/cpushare.cpp | 2 -- .../isolators/cgroups/cpushare.hpp | 2 -- .../containerizer/isolators/cgroups/mem.cpp | 2 -- .../containerizer/isolators/cgroups/mem.hpp | 2 -- .../isolators/cgroups/perf_event.cpp | 2 -- .../isolators/cgroups/perf_event.hpp | 2 -- .../isolators/filesystem/shared.cpp | 2 -- .../isolators/filesystem/shared.hpp | 2 -- .../containerizer/isolators/namespaces/pid.cpp | 2 -- .../containerizer/isolators/namespaces/pid.hpp | 2 -- .../containerizer/isolators/network/helper.cpp | 2 +- .../isolators/network/port_mapping.cpp | 4 +-- .../isolators/network/port_mapping.hpp | 2 -- src/slave/containerizer/isolators/posix.hpp | 6 ++-- .../containerizer/isolators/posix/disk.cpp | 2 -- .../containerizer/isolators/posix/disk.hpp | 2 -- src/slave/containerizer/launcher.cpp | 2 -- src/slave/containerizer/launcher.hpp | 2 -- src/slave/containerizer/linux_launcher.cpp | 2 -- src/slave/containerizer/linux_launcher.hpp | 2 -- src/slave/containerizer/mesos/containerizer.cpp | 2 -- src/slave/containerizer/mesos/containerizer.hpp | 2 -- src/slave/containerizer/mesos/launch.cpp | 2 -- src/slave/containerizer/mesos/launch.hpp | 2 -- src/slave/containerizer/mesos/main.cpp | 2 +- src/slave/flags.hpp | 2 -- src/slave/gc.cpp | 2 -- src/slave/gc.hpp | 2 -- src/slave/graceful_shutdown.cpp | 2 -- src/slave/graceful_shutdown.hpp | 2 -- src/slave/http.cpp | 4 +-- src/slave/main.cpp | 4 +-- src/slave/metrics.cpp | 2 -- src/slave/metrics.hpp | 2 -- src/slave/monitor.cpp | 2 -- src/slave/monitor.hpp | 2 -- src/slave/paths.cpp | 2 -- src/slave/paths.hpp | 2 -- src/slave/slave.cpp | 2 -- src/slave/slave.hpp | 2 -- src/slave/state.cpp | 2 -- src/slave/state.hpp | 4 +-- src/slave/status_update_manager.cpp | 2 -- src/slave/status_update_manager.hpp | 2 -- src/state/in_memory.cpp | 2 -- src/state/in_memory.hpp | 2 -- src/state/leveldb.cpp | 2 -- src/state/leveldb.hpp | 2 -- src/state/log.cpp | 4 +-- src/state/log.hpp | 2 -- src/state/protobuf.hpp | 2 -- src/state/state.hpp | 2 -- src/state/storage.hpp | 4 +-- src/state/zookeeper.cpp | 2 -- src/state/zookeeper.hpp | 2 -- src/tests/attributes_tests.cpp | 1 - src/tests/authentication_tests.cpp | 7 ++-- src/tests/authorization_tests.cpp | 3 +- src/tests/cgroups_isolator_tests.cpp | 3 +- src/tests/cgroups_tests.cpp | 2 +- src/tests/cluster.hpp | 2 -- src/tests/common/http_tests.cpp | 1 - src/tests/composing_containerizer_tests.cpp | 5 ++- src/tests/containerizer.cpp | 2 -- src/tests/containerizer.hpp | 2 -- src/tests/containerizer_tests.cpp | 3 +- src/tests/cram_md5_authentication_tests.cpp | 4 +-- src/tests/credentials_tests.cpp | 9 +++-- src/tests/disk_quota_tests.cpp | 13 ++++---- src/tests/docker_containerizer_tests.cpp | 17 +++++----- src/tests/docker_tests.cpp | 3 +- src/tests/environment.cpp | 2 -- src/tests/environment.hpp | 2 -- src/tests/exception_tests.cpp | 7 ++-- src/tests/external_containerizer_test.cpp | 9 +++-- src/tests/fault_tolerance_tests.cpp | 13 ++++---- src/tests/fetcher_tests.cpp | 13 ++++---- src/tests/files_tests.cpp | 4 +-- src/tests/flags.cpp | 2 -- src/tests/flags.hpp | 2 -- src/tests/fs_tests.cpp | 1 - src/tests/gc_tests.cpp | 11 +++--- src/tests/group_tests.cpp | 4 +-- src/tests/health_check_tests.cpp | 15 ++++----- src/tests/hierarchical_allocator_tests.cpp | 11 +++--- src/tests/hook_tests.cpp | 7 ++-- src/tests/isolator.hpp | 2 -- src/tests/isolator_tests.cpp | 34 +++++++++---------- src/tests/log_tests.cpp | 5 ++- src/tests/logging_tests.cpp | 2 +- src/tests/main.cpp | 8 ++--- src/tests/master_allocator_tests.cpp | 15 ++++----- src/tests/master_authorization_tests.cpp | 9 +++-- src/tests/master_contender_detector_tests.cpp | 35 ++++++++++---------- src/tests/master_slave_reconciliation_tests.cpp | 9 +++-- src/tests/master_tests.cpp | 17 +++++----- src/tests/master_validation_tests.cpp | 4 +-- src/tests/mesos.cpp | 2 -- src/tests/mesos.hpp | 2 -- src/tests/metrics_tests.cpp | 7 ++-- src/tests/module.cpp | 3 +- src/tests/module.hpp | 2 -- src/tests/module_tests.cpp | 5 ++- src/tests/monitor_tests.cpp | 3 +- src/tests/ns_tests.cpp | 2 +- src/tests/partition_tests.cpp | 9 +++-- src/tests/paths_tests.cpp | 2 -- src/tests/port_mapping_tests.cpp | 20 +++++------ src/tests/protobuf_io_tests.cpp | 3 +- src/tests/rate_limiting_tests.cpp | 9 ++--- src/tests/reconciliation_tests.cpp | 7 ++-- src/tests/registrar_tests.cpp | 17 ++++------ src/tests/registrar_zookeeper_tests.cpp | 7 ++-- src/tests/repair_tests.cpp | 5 ++- src/tests/resource_offers_tests.cpp | 9 +++-- src/tests/resources_tests.cpp | 5 ++- src/tests/scheduler_tests.cpp | 9 +++-- src/tests/script.cpp | 2 -- src/tests/script.hpp | 4 +-- src/tests/shutdown_tests.cpp | 9 +++-- src/tests/slave_recovery_tests.cpp | 18 +++++----- src/tests/slave_tests.cpp | 17 +++++----- src/tests/sorter_tests.cpp | 2 +- src/tests/state_tests.cpp | 35 ++++++++++---------- src/tests/status_update_manager_tests.cpp | 7 ++-- src/tests/utils.cpp | 2 -- src/tests/utils.hpp | 2 -- src/tests/values_tests.cpp | 3 +- src/tests/zookeeper.cpp | 2 -- src/tests/zookeeper.hpp | 4 +-- src/tests/zookeeper_test_server.cpp | 2 -- src/tests/zookeeper_test_server.hpp | 2 -- src/tests/zookeeper_tests.cpp | 4 +-- src/usage/main.cpp | 2 +- src/usage/usage.cpp | 2 -- src/usage/usage.hpp | 2 -- src/watcher/whitelist_watcher.cpp | 2 -- src/watcher/whitelist_watcher.hpp | 2 -- 279 files changed, 368 insertions(+), 789 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/include/mesos/executor.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/executor.hpp b/include/mesos/executor.hpp index f3cd3cc..cf82b04 100644 --- a/include/mesos/executor.hpp +++ b/include/mesos/executor.hpp @@ -50,10 +50,7 @@ namespace mesos { // A few forward declarations. class ExecutorDriver; - -namespace internal { class ExecutorProcess; -} // Callback interface to be implemented by frameworks' executors. Note // that only one callback will be invoked at a time, so it is not @@ -229,12 +226,12 @@ public: virtual Status sendFrameworkMessage(const std::string& data); private: - friend class internal::ExecutorProcess; + friend class ExecutorProcess; Executor* executor; // Libprocess process for communicating with slave. - internal::ExecutorProcess* process; + ExecutorProcess* process; // Mutex to enforce all non-callbacks are execute serially. pthread_mutex_t mutex; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/include/mesos/scheduler.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/scheduler.hpp b/include/mesos/scheduler.hpp index 9d6a205..31256c1 100644 --- a/include/mesos/scheduler.hpp +++ b/include/mesos/scheduler.hpp @@ -47,17 +47,14 @@ namespace mesos { // A few forward declarations. +class MasterDetector; class SchedulerDriver; +class SchedulerProcess; namespace scheduler { class MesosProcess; } // namespace scheduler { -namespace internal { -class MasterDetector; -class SchedulerProcess; -} // namespace internal { - // Callback interface to be implemented by frameworks' schedulers. // Note that only one callback will be invoked at a time, so it is not @@ -402,7 +399,7 @@ public: protected: // Used to detect (i.e., choose) the master. - internal::MasterDetector* detector; + MasterDetector* detector; private: void initialize(); @@ -412,7 +409,7 @@ private: std::string master; // Used for communicating with the master. - internal::SchedulerProcess* process; + SchedulerProcess* process; // URL for the master (e.g., zk://, file://, etc). std::string url; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/include/mesos/values.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/values.hpp b/include/mesos/values.hpp index c61f9e8..e957677 100644 --- a/include/mesos/values.hpp +++ b/include/mesos/values.hpp @@ -56,13 +56,11 @@ Value::Set& operator -= (Value::Set& left, const Value::Set& right); std::ostream& operator << (std::ostream& stream, const Value::Text& value); bool operator == (const Value::Text& left, const Value::Text& right); -namespace internal { namespace values { Try<Value> parse(const std::string& text); } // namespace values { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authentication/authenticatee.hpp ---------------------------------------------------------------------- diff --git a/src/authentication/authenticatee.hpp b/src/authentication/authenticatee.hpp index 361083b..95798d7 100644 --- a/src/authentication/authenticatee.hpp +++ b/src/authentication/authenticatee.hpp @@ -27,7 +27,6 @@ #include <stout/try.hpp> namespace mesos { -namespace internal { class Authenticatee { @@ -52,7 +51,6 @@ public: const mesos::Credential& credential) = 0; }; -} // namespace internal { } // namespace mesos { #endif // __AUTHENTICATEE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authentication/authenticator.hpp ---------------------------------------------------------------------- diff --git a/src/authentication/authenticator.hpp b/src/authentication/authenticator.hpp index 460494a..abc2a23 100644 --- a/src/authentication/authenticator.hpp +++ b/src/authentication/authenticator.hpp @@ -28,7 +28,6 @@ #include <stout/try.hpp> namespace mesos { -namespace internal { // Note that this interface definition is not hardened yet and will // slightly change within the next release. See MESOS-2050. @@ -51,7 +50,6 @@ public: virtual process::Future<Option<std::string>> authenticate(void) = 0; }; -} // namespace internal { } // namespace mesos { #endif // __AUTHENTICATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authentication/cram_md5/authenticatee.hpp ---------------------------------------------------------------------- diff --git a/src/authentication/cram_md5/authenticatee.hpp b/src/authentication/cram_md5/authenticatee.hpp index 5d35598..70e1509 100644 --- a/src/authentication/cram_md5/authenticatee.hpp +++ b/src/authentication/cram_md5/authenticatee.hpp @@ -41,7 +41,6 @@ #include "messages/messages.hpp" namespace mesos { -namespace internal { namespace cram_md5 { // Forward declaration. @@ -420,7 +419,6 @@ inline process::Future<bool> CRAMMD5Authenticatee::authenticate( } } // namespace cram_md5 { -} // namespace internal { } // namespace mesos { #endif //__AUTHENTICATION_CRAM_MD5_AUTHENTICATEE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authentication/cram_md5/authenticator.hpp ---------------------------------------------------------------------- diff --git a/src/authentication/cram_md5/authenticator.hpp b/src/authentication/cram_md5/authenticator.hpp index d739a02..fa34f76 100644 --- a/src/authentication/cram_md5/authenticator.hpp +++ b/src/authentication/cram_md5/authenticator.hpp @@ -43,7 +43,6 @@ #include "messages/messages.hpp" namespace mesos { -namespace internal { namespace cram_md5 { // Forward declaration. @@ -511,7 +510,6 @@ process::Future<Option<std::string>> CRAMMD5Authenticator::authenticate(void) } } // namespace cram_md5 { -} // namespace internal { } // namespace mesos { #endif //__AUTHENTICATION_CRAM_MD5_AUTHENTICATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authentication/cram_md5/auxprop.cpp ---------------------------------------------------------------------- diff --git a/src/authentication/cram_md5/auxprop.cpp b/src/authentication/cram_md5/auxprop.cpp index cf503a2..5ff9755 100644 --- a/src/authentication/cram_md5/auxprop.cpp +++ b/src/authentication/cram_md5/auxprop.cpp @@ -24,7 +24,6 @@ using std::list; using std::string; namespace mesos { -namespace internal { namespace cram_md5 { // Storage for the static members. @@ -200,5 +199,4 @@ int InMemoryAuxiliaryPropertyPlugin::initialize( } } // namespace cram_md5 { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authentication/cram_md5/auxprop.hpp ---------------------------------------------------------------------- diff --git a/src/authentication/cram_md5/auxprop.hpp b/src/authentication/cram_md5/auxprop.hpp index b894386..d036b11 100644 --- a/src/authentication/cram_md5/auxprop.hpp +++ b/src/authentication/cram_md5/auxprop.hpp @@ -30,7 +30,6 @@ #include <stout/option.hpp> namespace mesos { -namespace internal { namespace cram_md5 { struct Property @@ -90,7 +89,6 @@ private: }; } // namespace cram_md5 { -} // namespace internal { } // namespace mesos { #endif // __AUTHENTICATION_CRAM_MD5_AUXPROP_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authorizer/authorizer.cpp ---------------------------------------------------------------------- diff --git a/src/authorizer/authorizer.cpp b/src/authorizer/authorizer.cpp index 21e97e3..4f2b6a7 100644 --- a/src/authorizer/authorizer.cpp +++ b/src/authorizer/authorizer.cpp @@ -46,7 +46,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { class LocalAuthorizerProcess : public ProtobufProcess<LocalAuthorizerProcess> { @@ -278,5 +277,4 @@ Future<bool> LocalAuthorizer::authorize(const ACL::ShutdownFramework& request) process, static_cast<F>(&LocalAuthorizerProcess::authorize), request); } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/authorizer/authorizer.hpp ---------------------------------------------------------------------- diff --git a/src/authorizer/authorizer.hpp b/src/authorizer/authorizer.hpp index c039d94..66ddb92 100644 --- a/src/authorizer/authorizer.hpp +++ b/src/authorizer/authorizer.hpp @@ -31,7 +31,6 @@ #include "mesos/mesos.hpp" namespace mesos { -namespace internal { // Forward declaration. class LocalAuthorizerProcess; @@ -81,7 +80,6 @@ private: LocalAuthorizerProcess* process; }; -} // namespace internal { } // namespace mesos { #endif //__AUTHORIZER_AUTHORIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/cli/execute.cpp ---------------------------------------------------------------------- diff --git a/src/cli/execute.cpp b/src/cli/execute.cpp index 77deec9..ea74049 100644 --- a/src/cli/execute.cpp +++ b/src/cli/execute.cpp @@ -36,7 +36,6 @@ #include "hdfs/hdfs.hpp" using namespace mesos; -using namespace mesos::internal; using process::UPID; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/cli/resolve.cpp ---------------------------------------------------------------------- diff --git a/src/cli/resolve.cpp b/src/cli/resolve.cpp index a99b609..77bd443 100644 --- a/src/cli/resolve.cpp +++ b/src/cli/resolve.cpp @@ -33,7 +33,6 @@ #include "messages/messages.hpp" using namespace mesos; -using namespace mesos::internal; using process::Future; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/attributes.cpp ---------------------------------------------------------------------- diff --git a/src/common/attributes.cpp b/src/common/attributes.cpp index aab114e..33da50c 100644 --- a/src/common/attributes.cpp +++ b/src/common/attributes.cpp @@ -53,9 +53,6 @@ std::ostream& operator << (std::ostream& stream, const Attribute& attribute) } -namespace internal { - - bool Attributes::operator == (const Attributes& that) const { if (size() != that.size()) { @@ -231,5 +228,4 @@ Value::Text Attributes::get( } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/attributes.hpp ---------------------------------------------------------------------- diff --git a/src/common/attributes.hpp b/src/common/attributes.hpp index 0a043d5..844bdbf 100644 --- a/src/common/attributes.hpp +++ b/src/common/attributes.hpp @@ -32,9 +32,6 @@ namespace mesos { std::ostream& operator << (std::ostream& stream, const Attribute& attribute); -namespace internal { - - class Attributes { public: @@ -118,7 +115,6 @@ private: }; -} // namespace internal { } // namespace mesos { #endif // __ATTRIBUTES_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/build.cpp ---------------------------------------------------------------------- diff --git a/src/common/build.cpp b/src/common/build.cpp index 9bef16e..90bd719 100644 --- a/src/common/build.cpp +++ b/src/common/build.cpp @@ -26,7 +26,6 @@ #include "common/build.hpp" namespace mesos { -namespace internal { namespace build { const std::string DATE = BUILD_DATE; @@ -53,5 +52,4 @@ const Option<std::string> GIT_TAG = std::string(BUILD_GIT_TAG); const Option<std::string> GIT_TAG = None(); #endif } // namespace build { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/build.hpp ---------------------------------------------------------------------- diff --git a/src/common/build.hpp b/src/common/build.hpp index 7d61a06..9765c8f 100644 --- a/src/common/build.hpp +++ b/src/common/build.hpp @@ -21,7 +21,6 @@ #include <string> namespace mesos { -namespace internal { namespace build { extern const std::string DATE; @@ -34,7 +33,6 @@ extern const Option<std::string> GIT_BRANCH; extern const Option<std::string> GIT_TAG; } // namespace build { -} // namespace internal { } // namespace mesos { #endif // __BUILD_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/date_utils.cpp ---------------------------------------------------------------------- diff --git a/src/common/date_utils.cpp b/src/common/date_utils.cpp index c5268bc..a148fd8 100644 --- a/src/common/date_utils.cpp +++ b/src/common/date_utils.cpp @@ -23,7 +23,6 @@ using std::string; namespace mesos { -namespace internal { namespace DateUtils { // Get the current date in the format used for Mesos IDs (YYYYMMDD-hhmmss). @@ -39,5 +38,4 @@ string currentDate() } } // namespace DateUtils { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/date_utils.hpp ---------------------------------------------------------------------- diff --git a/src/common/date_utils.hpp b/src/common/date_utils.hpp index 5f14a06..b11c8e0 100644 --- a/src/common/date_utils.hpp +++ b/src/common/date_utils.hpp @@ -22,7 +22,6 @@ #include <string> namespace mesos { -namespace internal { /** * Utility functions for dealing with dates. @@ -35,7 +34,6 @@ std::string currentDate(); } // namespace DateUtils { -} // namespace internal { } // namespace mesos { #endif http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/factory.hpp ---------------------------------------------------------------------- diff --git a/src/common/factory.hpp b/src/common/factory.hpp index bdddcf8..26f545b 100644 --- a/src/common/factory.hpp +++ b/src/common/factory.hpp @@ -49,7 +49,7 @@ #define DECLARE_FACTORY(T, P) \ - class T##Factory : public ::mesos::internal::factory::Factory<T, P> { \ + class T##Factory : public ::mesos::factory::Factory<T, P> { \ T##Factory(); \ static T##Factory *instance; \ static void initialize(); \ @@ -76,7 +76,8 @@ // Helper classes for the factory macros. -namespace mesos { namespace internal { namespace factory { +namespace mesos { +namespace factory { template<typename T, typename P> class Creator { public: @@ -114,7 +115,6 @@ protected: }; } // namespace factory { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/http.cpp ---------------------------------------------------------------------- diff --git a/src/common/http.cpp b/src/common/http.cpp index 58a6065..576e2e4 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -32,7 +32,6 @@ using std::vector; namespace mesos { -namespace internal { // TODO(bmahler): Kill these in favor of automatic Proto->JSON // Conversion (when it becomes available). @@ -191,5 +190,4 @@ JSON::Object model( } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/http.hpp ---------------------------------------------------------------------- diff --git a/src/common/http.hpp b/src/common/http.hpp index afce7fe..bdb5948 100644 --- a/src/common/http.hpp +++ b/src/common/http.hpp @@ -25,14 +25,12 @@ #include <stout/json.hpp> -namespace mesos { - -class Resources; +#include "messages/messages.hpp" -namespace internal { +namespace mesos { class Attributes; -class Task; +class Resources; JSON::Object model(const Resources& resources); @@ -47,7 +45,6 @@ JSON::Object model( const TaskState& state, const std::vector<TaskStatus>& statuses); -} // namespace internal { } // namespace mesos { #endif // __COMMON_HTTP_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/lock.cpp ---------------------------------------------------------------------- diff --git a/src/common/lock.cpp b/src/common/lock.cpp index bb8ea3a..a52d3ff 100644 --- a/src/common/lock.cpp +++ b/src/common/lock.cpp @@ -19,7 +19,6 @@ #include "lock.hpp" namespace mesos { -namespace internal { Lock::Lock(pthread_mutex_t* _mutex) : mutex(_mutex), locked(false) @@ -51,5 +50,4 @@ Lock::~Lock() unlock(); } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/lock.hpp ---------------------------------------------------------------------- diff --git a/src/common/lock.hpp b/src/common/lock.hpp index 988dff5..fbe04e0 100644 --- a/src/common/lock.hpp +++ b/src/common/lock.hpp @@ -22,7 +22,6 @@ #include <pthread.h> namespace mesos { -namespace internal { // RAII class for locking pthread_mutexes. class Lock @@ -39,7 +38,6 @@ private: bool locked; }; -} // namespace internal { } // namespace mesos { #endif // __LOCK_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/protobuf_utils.cpp ---------------------------------------------------------------------- diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp index f9ca23a..345d96e 100644 --- a/src/common/protobuf_utils.cpp +++ b/src/common/protobuf_utils.cpp @@ -30,7 +30,6 @@ using std::string; namespace mesos { -namespace internal { namespace protobuf { bool isTerminalState(const TaskState& state) @@ -155,5 +154,4 @@ MasterInfo createMasterInfo(const process::UPID& pid) } } // namespace protobuf { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/protobuf_utils.hpp ---------------------------------------------------------------------- diff --git a/src/common/protobuf_utils.hpp b/src/common/protobuf_utils.hpp index a579391..82c6e4f 100644 --- a/src/common/protobuf_utils.hpp +++ b/src/common/protobuf_utils.hpp @@ -31,7 +31,6 @@ struct UPID; } namespace mesos { -namespace internal { namespace protobuf { bool isTerminalState(const TaskState& state); @@ -62,7 +61,6 @@ Option<bool> getTaskHealth(const Task& task); MasterInfo createMasterInfo(const process::UPID& pid); } // namespace protobuf { -} // namespace internal { } // namespace mesos { #endif // __PROTOBUF_UTILS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/resources.cpp ---------------------------------------------------------------------- diff --git a/src/common/resources.cpp b/src/common/resources.cpp index 308b886..98371f6 100644 --- a/src/common/resources.cpp +++ b/src/common/resources.cpp @@ -219,7 +219,7 @@ Try<Resource> Resources::parse( const string& value, const string& role) { - Try<Value> result = internal::values::parse(value); + Try<Value> result = values::parse(value); if (result.isError()) { return Error( "Failed to parse resource " + name + http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/type_utils.cpp ---------------------------------------------------------------------- diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp index fcc9eb0..890df56 100644 --- a/src/common/type_utils.cpp +++ b/src/common/type_utils.cpp @@ -138,8 +138,7 @@ bool operator == (const SlaveInfo& left, const SlaveInfo& right) { return left.hostname() == right.hostname() && Resources(left.resources()) == Resources(right.resources()) && - internal::Attributes(left.attributes()) == - internal::Attributes(right.attributes()) && + Attributes(left.attributes()) == Attributes(right.attributes()) && left.has_id() == right.has_id() && (!left.has_id() || (left.id() == right.id())) && left.has_checkpoint() == right.has_checkpoint() && http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/common/values.cpp ---------------------------------------------------------------------- diff --git a/src/common/values.cpp b/src/common/values.cpp index 597c452..242f2a0 100644 --- a/src/common/values.cpp +++ b/src/common/values.cpp @@ -40,7 +40,6 @@ using std::vector; namespace mesos { -namespace internal { namespace values { Try<Value> parse(const std::string& text) @@ -129,7 +128,6 @@ Try<Value> parse(const std::string& text) } } // namespace values { -} // namespace internal { ostream& operator << (ostream& stream, const Value::Scalar& scalar) http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/credentials/credentials.hpp ---------------------------------------------------------------------- diff --git a/src/credentials/credentials.hpp b/src/credentials/credentials.hpp index 4cdadb1..9965858 100644 --- a/src/credentials/credentials.hpp +++ b/src/credentials/credentials.hpp @@ -28,7 +28,6 @@ #include <stout/try.hpp> namespace mesos { -namespace internal { namespace credentials { inline Result<Credentials> read(const std::string& path) @@ -126,7 +125,6 @@ inline Result<Credential> readCredential(const std::string& path) } } // namespace credentials { -} // namespace internal { } // namespace mesos { #endif // __CREDENTIALS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index 3a485a2..94f16e7 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -43,7 +43,7 @@ using namespace mesos; -using namespace mesos::internal::slave; +using namespace mesos::slave; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/balloon_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/balloon_framework.cpp b/src/examples/balloon_framework.cpp index c2337ba..08bb613 100644 --- a/src/examples/balloon_framework.cpp +++ b/src/examples/balloon_framework.cpp @@ -37,7 +37,6 @@ #include "examples/utils.hpp" using namespace mesos; -using namespace mesos::internal; using std::cout; using std::endl; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/load_generator_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/load_generator_framework.cpp b/src/examples/load_generator_framework.cpp index 01a567b..f803d92 100644 --- a/src/examples/load_generator_framework.cpp +++ b/src/examples/load_generator_framework.cpp @@ -225,7 +225,7 @@ private: }; -class Flags : public mesos::internal::logging::Flags +class Flags : public mesos::logging::Flags { public: Flags() @@ -326,7 +326,7 @@ int main(int argc, char** argv) } // We want the logger to catch failure signals. - mesos::internal::logging::initialize(argv[0], flags, true); + mesos::logging::initialize(argv[0], flags, true); LoadGeneratorScheduler scheduler(flags.qps.get(), flags.duration); http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/low_level_scheduler_libprocess.cpp ---------------------------------------------------------------------- diff --git a/src/examples/low_level_scheduler_libprocess.cpp b/src/examples/low_level_scheduler_libprocess.cpp index a0ec131..cd04187 100644 --- a/src/examples/low_level_scheduler_libprocess.cpp +++ b/src/examples/low_level_scheduler_libprocess.cpp @@ -362,7 +362,7 @@ int main(int argc, char** argv) uri = path::join(os::getenv("MESOS_BUILD_DIR"), "src", "test-executor"); } - mesos::internal::logging::Flags flags; + mesos::logging::Flags flags; string role; flags.add(&role, @@ -388,7 +388,7 @@ int main(int argc, char** argv) } process::initialize(); - internal::logging::initialize(argv[0], flags, true); // Catch signals. + logging::initialize(argv[0], flags, true); // Catch signals. FrameworkInfo framework; framework.set_user(""); // Have Mesos fill in the current user. http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/low_level_scheduler_pthread.cpp ---------------------------------------------------------------------- diff --git a/src/examples/low_level_scheduler_pthread.cpp b/src/examples/low_level_scheduler_pthread.cpp index f05489a..f4bd4ac 100644 --- a/src/examples/low_level_scheduler_pthread.cpp +++ b/src/examples/low_level_scheduler_pthread.cpp @@ -422,7 +422,7 @@ int main(int argc, char** argv) uri = path::join(os::getenv("MESOS_BUILD_DIR"), "src", "test-executor"); } - mesos::internal::logging::Flags flags; + mesos::logging::Flags flags; string role; flags.add(&role, @@ -447,7 +447,7 @@ int main(int argc, char** argv) EXIT(1); } - internal::logging::initialize(argv[0], flags, true); // Catch signals. + logging::initialize(argv[0], flags, true); // Catch signals. FrameworkInfo framework; framework.set_user(""); // Have Mesos fill in the current user. http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/test_authentication_modules.cpp ---------------------------------------------------------------------- diff --git a/src/examples/test_authentication_modules.cpp b/src/examples/test_authentication_modules.cpp index 6d32573..fd59fe4 100644 --- a/src/examples/test_authentication_modules.cpp +++ b/src/examples/test_authentication_modules.cpp @@ -30,8 +30,8 @@ using namespace mesos; -using mesos::internal::Authenticatee; -using mesos::internal::Authenticator; +using mesos::Authenticatee; +using mesos::Authenticator; static bool compatible() { @@ -41,7 +41,7 @@ static bool compatible() static Authenticatee* createCRAMMD5Authenticatee(const Parameters& parameters) { - return new mesos::internal::cram_md5::CRAMMD5Authenticatee(); + return new mesos::cram_md5::CRAMMD5Authenticatee(); } @@ -57,7 +57,7 @@ mesos::modules::Module<Authenticatee> org_apache_mesos_TestCRAMMD5Authenticatee( static Authenticator* createCRAMMD5Authenticator(const Parameters& parameters) { - return new mesos::internal::cram_md5::CRAMMD5Authenticator(); + return new mesos::cram_md5::CRAMMD5Authenticator(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/test_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/test_framework.cpp b/src/examples/test_framework.cpp index 7c062dc..3dfb6a0 100644 --- a/src/examples/test_framework.cpp +++ b/src/examples/test_framework.cpp @@ -191,7 +191,7 @@ int main(int argc, char** argv) uri = string(getenv("MESOS_BUILD_DIR")) + "/src/test-executor"; } - mesos::internal::logging::Flags flags; + mesos::logging::Flags flags; string role; flags.add(&role, @@ -216,7 +216,7 @@ int main(int argc, char** argv) exit(1); } - internal::logging::initialize(argv[0], flags, true); // Catch signals. + logging::initialize(argv[0], flags, true); // Catch signals. ExecutorInfo executor; executor.mutable_executor_id()->set_value("default"); http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/test_hook_module.cpp ---------------------------------------------------------------------- diff --git a/src/examples/test_hook_module.cpp b/src/examples/test_hook_module.cpp index 04fd43e..573ccb3 100644 --- a/src/examples/test_hook_module.cpp +++ b/src/examples/test_hook_module.cpp @@ -33,7 +33,6 @@ using std::string; using namespace mesos; -using namespace mesos::internal; // Must be kept in sync with variables of the same name in // tests/hook_tests.cpp. http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/examples/test_isolator_module.cpp ---------------------------------------------------------------------- diff --git a/src/examples/test_isolator_module.cpp b/src/examples/test_isolator_module.cpp index dc107a1..3b92b04 100644 --- a/src/examples/test_isolator_module.cpp +++ b/src/examples/test_isolator_module.cpp @@ -29,10 +29,10 @@ using namespace mesos; -using mesos::internal::slave::Flags; -using mesos::internal::slave::Isolator; -using mesos::internal::slave::PosixCpuIsolatorProcess; -using mesos::internal::slave::PosixMemIsolatorProcess; +using mesos::slave::Flags; +using mesos::slave::Isolator; +using mesos::slave::PosixCpuIsolatorProcess; +using mesos::slave::PosixMemIsolatorProcess; // The sole purpose of this function is just to exercise the http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/exec/exec.cpp ---------------------------------------------------------------------- diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp index aada246..38c8ee7 100644 --- a/src/exec/exec.cpp +++ b/src/exec/exec.cpp @@ -58,8 +58,7 @@ #include "slave/state.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; +using namespace mesos::slave; using namespace process; @@ -69,7 +68,6 @@ using process::wait; // Necessary on some OS's to disambiguate. namespace mesos { -namespace internal { // A custom executor can be non-cooperative as it can block the @@ -584,7 +582,6 @@ private: LinkedHashMap<TaskID, TaskInfo> tasks; // Unacknowledged tasks. }; -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/files/files.cpp ---------------------------------------------------------------------- diff --git a/src/files/files.cpp b/src/files/files.cpp index 7b10240..58a74b1 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -52,7 +52,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { class FilesProcess : public Process<FilesProcess> { @@ -472,5 +471,4 @@ void Files::detach(const string& name) dispatch(process, &FilesProcess::detach, name); } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/files/files.hpp ---------------------------------------------------------------------- diff --git a/src/files/files.hpp b/src/files/files.hpp index 818087b..c8322d1 100644 --- a/src/files/files.hpp +++ b/src/files/files.hpp @@ -35,7 +35,6 @@ #include <stout/path.hpp> namespace mesos { -namespace internal { // Forward declarations. class FilesProcess; @@ -140,7 +139,6 @@ inline JSON::Object jsonFileInfo(const std::string& path, return file; } -} // namespace internal { } // namespace mesos { #endif // __FILES_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/health-check/main.cpp ---------------------------------------------------------------------- diff --git a/src/health-check/main.cpp b/src/health-check/main.cpp index a4ce742..260b872 100644 --- a/src/health-check/main.cpp +++ b/src/health-check/main.cpp @@ -60,7 +60,6 @@ using std::vector; using process::UPID; namespace mesos { -namespace internal { using namespace process; @@ -251,7 +250,6 @@ private: process::Time startTime; }; -} // namespace internal { } // namespace mesos { @@ -359,7 +357,7 @@ int main(int argc, char** argv) TaskID taskID; taskID.set_value(flags.task_id.get()); - internal::HealthCheckerProcess process( + HealthCheckerProcess process( check.get(), flags.executor.get(), taskID); @@ -368,7 +366,7 @@ int main(int argc, char** argv) process::Future<Nothing> checking = process::dispatch( - process, &internal::HealthCheckerProcess::healthCheck); + process, &HealthCheckerProcess::healthCheck); checking.await(); http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/hook/hook.hpp ---------------------------------------------------------------------- diff --git a/src/hook/hook.hpp b/src/hook/hook.hpp index 9401e03..e31b7c9 100644 --- a/src/hook/hook.hpp +++ b/src/hook/hook.hpp @@ -28,7 +28,6 @@ #include "slave/slave.hpp" namespace mesos { -namespace internal { class Hook { @@ -70,7 +69,6 @@ public: } }; -} // namespace internal { } // namespace mesos { #endif // __HOOK_HOOK_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/hook/manager.cpp ---------------------------------------------------------------------- diff --git a/src/hook/manager.cpp b/src/hook/manager.cpp index 6bf1ef7..c14dcca 100644 --- a/src/hook/manager.cpp +++ b/src/hook/manager.cpp @@ -39,7 +39,6 @@ using std::vector; using mesos::modules::ModuleManager; namespace mesos { -namespace internal { static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static hashmap<string, Hook*> availableHooks; @@ -147,5 +146,4 @@ void HookManager::slaveRemoveExecutorHook( } } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/hook/manager.hpp ---------------------------------------------------------------------- diff --git a/src/hook/manager.hpp b/src/hook/manager.hpp index aadc17a..2de59b7 100644 --- a/src/hook/manager.hpp +++ b/src/hook/manager.hpp @@ -28,7 +28,6 @@ #include "messages/messages.hpp" namespace mesos { -namespace internal { class HookManager { @@ -54,7 +53,6 @@ public: const ExecutorInfo& executorInfo); }; -} // namespace internal { } // namespace mesos { #endif // __HOOK_MANAGER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/java/jni/org_apache_mesos_Log.cpp ---------------------------------------------------------------------- diff --git a/src/java/jni/org_apache_mesos_Log.cpp b/src/java/jni/org_apache_mesos_Log.cpp index 1e1d821..3261b61 100644 --- a/src/java/jni/org_apache_mesos_Log.cpp +++ b/src/java/jni/org_apache_mesos_Log.cpp @@ -33,7 +33,7 @@ #include "org_apache_mesos_Log_Writer.h" using namespace mesos; -using namespace mesos::internal::log; +using namespace mesos::log; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/java/jni/org_apache_mesos_state_AbstractState.cpp ---------------------------------------------------------------------- diff --git a/src/java/jni/org_apache_mesos_state_AbstractState.cpp b/src/java/jni/org_apache_mesos_state_AbstractState.cpp index 1accc8a..d7e6cb5 100644 --- a/src/java/jni/org_apache_mesos_state_AbstractState.cpp +++ b/src/java/jni/org_apache_mesos_state_AbstractState.cpp @@ -14,7 +14,7 @@ #include "construct.hpp" #include "convert.hpp" -using namespace mesos::internal::state; +using namespace mesos::state; using process::Future; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/java/jni/org_apache_mesos_state_LevelDBState.cpp ---------------------------------------------------------------------- diff --git a/src/java/jni/org_apache_mesos_state_LevelDBState.cpp b/src/java/jni/org_apache_mesos_state_LevelDBState.cpp index 30f6309..27e8905 100644 --- a/src/java/jni/org_apache_mesos_state_LevelDBState.cpp +++ b/src/java/jni/org_apache_mesos_state_LevelDBState.cpp @@ -8,7 +8,7 @@ #include "construct.hpp" #include "convert.hpp" -using namespace mesos::internal::state; +using namespace mesos::state; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/java/jni/org_apache_mesos_state_LogState.cpp ---------------------------------------------------------------------- diff --git a/src/java/jni/org_apache_mesos_state_LogState.cpp b/src/java/jni/org_apache_mesos_state_LogState.cpp index 6382b9c..dc1e49d 100644 --- a/src/java/jni/org_apache_mesos_state_LogState.cpp +++ b/src/java/jni/org_apache_mesos_state_LogState.cpp @@ -12,8 +12,8 @@ #include "construct.hpp" #include "convert.hpp" -using namespace mesos::internal::log; -using namespace mesos::internal::state; +using namespace mesos::log; +using namespace mesos::state; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/java/jni/org_apache_mesos_state_Variable.cpp ---------------------------------------------------------------------- diff --git a/src/java/jni/org_apache_mesos_state_Variable.cpp b/src/java/jni/org_apache_mesos_state_Variable.cpp index 4d840ce..b600996 100644 --- a/src/java/jni/org_apache_mesos_state_Variable.cpp +++ b/src/java/jni/org_apache_mesos_state_Variable.cpp @@ -4,7 +4,7 @@ #include "state/state.hpp" -using namespace mesos::internal::state; +using namespace mesos::state; extern "C" { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp ---------------------------------------------------------------------- diff --git a/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp b/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp index c40e685..7b81760 100644 --- a/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp +++ b/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp @@ -10,7 +10,7 @@ #include "construct.hpp" #include "convert.hpp" -using namespace mesos::internal::state; +using namespace mesos::state; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/jvm/jvm.cpp ---------------------------------------------------------------------- diff --git a/src/jvm/jvm.cpp b/src/jvm/jvm.cpp index d33a655..38fedfc 100644 --- a/src/jvm/jvm.cpp +++ b/src/jvm/jvm.cpp @@ -60,7 +60,7 @@ Try<Jvm*> Jvm::create( std::string libJvmPath = os::getenv("JAVA_JVM_LIBRARY", false); if (libJvmPath.empty()) { - libJvmPath = mesos::internal::build::JAVA_JVM_LIBRARY; + libJvmPath = mesos::build::JAVA_JVM_LIBRARY; } static DynamicLibrary* libJvm = new DynamicLibrary(); http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/launcher/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp index 1cf28f1..8c2f2e6 100644 --- a/src/launcher/executor.cpp +++ b/src/launcher/executor.cpp @@ -59,7 +59,7 @@ #include "slave/graceful_shutdown.hpp" using process::wait; // Necessary on some OS's to disambiguate. -using namespace mesos::internal::slave; +using namespace mesos::slave; using std::cout; using std::cerr; @@ -68,7 +68,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { using namespace process; @@ -590,7 +589,6 @@ private: CommandExecutorProcess* process; }; -} // namespace internal { } // namespace mesos { @@ -683,7 +681,7 @@ int main(int argc, char** argv) if (path.empty()) { path = os::realpath(dirname(argv[0])).get(); } - mesos::internal::CommandExecutor executor(override, path, shutdownTimeout); + mesos::CommandExecutor executor(override, path, shutdownTimeout); mesos::MesosExecutorDriver driver(&executor); return driver.run() == mesos::DRIVER_STOPPED ? 0 : 1; } http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/launcher/fetcher.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp index fed0105..5b2d86d 100644 --- a/src/launcher/fetcher.cpp +++ b/src/launcher/fetcher.cpp @@ -35,7 +35,6 @@ #include "logging/logging.hpp" using namespace mesos; -using namespace mesos::internal; using mesos::fetcher::FetcherInfo; @@ -257,7 +256,7 @@ int main(int argc, char* argv[]) { GOOGLE_PROTOBUF_VERIFY_VERSION; - mesos::internal::logging::Flags flags; + mesos::logging::Flags flags; Try<Nothing> load = flags.load("MESOS_", argc, argv); http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/linux/cgroups.cpp ---------------------------------------------------------------------- diff --git a/src/linux/cgroups.cpp b/src/linux/cgroups.cpp index 0b136e1..b6f75b1 100644 --- a/src/linux/cgroups.cpp +++ b/src/linux/cgroups.cpp @@ -62,7 +62,7 @@ using namespace process; // TODO(benh): Move linux/fs.hpp out of 'mesos- namespace. -using namespace mesos::internal; +using namespace mesos; using std::dec; using std::getline; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/linux/fs.cpp ---------------------------------------------------------------------- diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp index b01d14c..d17d3ab 100644 --- a/src/linux/fs.cpp +++ b/src/linux/fs.cpp @@ -30,7 +30,6 @@ namespace mesos { -namespace internal { namespace fs { @@ -179,5 +178,4 @@ Try<Nothing> unmount(const std::string& target, int flags) } // namespace fs { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/linux/fs.hpp ---------------------------------------------------------------------- diff --git a/src/linux/fs.hpp b/src/linux/fs.hpp index ac8b5f4..9368d36 100644 --- a/src/linux/fs.hpp +++ b/src/linux/fs.hpp @@ -32,7 +32,6 @@ namespace mesos { -namespace internal { namespace fs { @@ -142,7 +141,6 @@ Try<Nothing> unmount(const std::string& target, int flags = 0); } // namespace fs { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/local/flags.hpp ---------------------------------------------------------------------- diff --git a/src/local/flags.hpp b/src/local/flags.hpp index 54e8831..16be2ad 100644 --- a/src/local/flags.hpp +++ b/src/local/flags.hpp @@ -24,7 +24,6 @@ #include "logging/flags.hpp" namespace mesos { -namespace internal { namespace local { class Flags : public logging::Flags @@ -42,7 +41,6 @@ public: }; } // namespace local { -} // namespace internal { } // namespace mesos { #endif // __LOCAL_FLAGS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/local/local.cpp ---------------------------------------------------------------------- diff --git a/src/local/local.cpp b/src/local/local.cpp index 76e73a4..3b128c4 100644 --- a/src/local/local.cpp +++ b/src/local/local.cpp @@ -63,23 +63,23 @@ #include "state/protobuf.hpp" #include "state/storage.hpp" -using namespace mesos::internal; -using namespace mesos::internal::log; +using namespace mesos; +using namespace mesos::log; -using mesos::internal::master::allocator::Allocator; -using mesos::internal::master::allocator::AllocatorProcess; -using mesos::internal::master::allocator::DRFSorter; -using mesos::internal::master::allocator::HierarchicalDRFAllocatorProcess; +using mesos::master::allocator::Allocator; +using mesos::master::allocator::AllocatorProcess; +using mesos::master::allocator::DRFSorter; +using mesos::master::allocator::HierarchicalDRFAllocatorProcess; -using mesos::internal::master::Master; -using mesos::internal::master::Registrar; -using mesos::internal::master::Repairer; +using mesos::master::Master; +using mesos::master::Registrar; +using mesos::master::Repairer; -using mesos::internal::slave::Containerizer; -using mesos::internal::slave::Fetcher; -using mesos::internal::slave::GarbageCollector; -using mesos::internal::slave::Slave; -using mesos::internal::slave::StatusUpdateManager; +using mesos::slave::Containerizer; +using mesos::slave::Fetcher; +using mesos::slave::GarbageCollector; +using mesos::slave::Slave; +using mesos::slave::StatusUpdateManager; using process::Owned; using process::PID; @@ -93,7 +93,6 @@ using std::vector; namespace mesos { -namespace internal { namespace local { static Allocator* allocator = NULL; @@ -340,5 +339,4 @@ void shutdown() } } // namespace local { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/local/local.hpp ---------------------------------------------------------------------- diff --git a/src/local/local.hpp b/src/local/local.hpp index 0aa50ef..053434a 100644 --- a/src/local/local.hpp +++ b/src/local/local.hpp @@ -24,7 +24,6 @@ #include "local/flags.hpp" namespace mesos { -namespace internal { // Forward declarations. namespace master { @@ -51,7 +50,6 @@ process::PID<master::Master> launch( void shutdown(); } // namespace local { -} // namespace internal { } // namespace mesos { #endif // __MESOS_LOCAL_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/local/main.cpp ---------------------------------------------------------------------- diff --git a/src/local/main.cpp b/src/local/main.cpp index a641b9e..7f12142 100644 --- a/src/local/main.cpp +++ b/src/local/main.cpp @@ -33,10 +33,10 @@ #include "logging/logging.hpp" -using namespace mesos::internal; +using namespace mesos; -using mesos::internal::master::Master; -using mesos::internal::slave::Slave; +using mesos::master::Master; +using mesos::slave::Slave; using std::cerr; using std::endl; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/catchup.cpp ---------------------------------------------------------------------- diff --git a/src/log/catchup.cpp b/src/log/catchup.cpp index f7afc38..c33ecd8 100644 --- a/src/log/catchup.cpp +++ b/src/log/catchup.cpp @@ -38,7 +38,6 @@ using namespace process; using std::list; namespace mesos { -namespace internal { namespace log { class CatchUpProcess : public Process<CatchUpProcess> @@ -350,5 +349,4 @@ Future<Nothing> catchup( } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/catchup.hpp ---------------------------------------------------------------------- diff --git a/src/log/catchup.hpp b/src/log/catchup.hpp index 5e23b57..9767c24 100644 --- a/src/log/catchup.hpp +++ b/src/log/catchup.hpp @@ -33,7 +33,6 @@ #include "log/replica.hpp" namespace mesos { -namespace internal { namespace log { // Catches-up a set of log positions in the local replica. The user of @@ -53,7 +52,6 @@ extern process::Future<Nothing> catchup( const Duration& timeout = Seconds(10)); } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_CATCHUP_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/consensus.cpp ---------------------------------------------------------------------- diff --git a/src/log/consensus.cpp b/src/log/consensus.cpp index 59f80d0..7e33c69 100644 --- a/src/log/consensus.cpp +++ b/src/log/consensus.cpp @@ -40,7 +40,6 @@ using namespace process; using std::set; namespace mesos { -namespace internal { namespace log { class ExplicitPromiseProcess : public Process<ExplicitPromiseProcess> @@ -782,5 +781,4 @@ Future<Action> fill( } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/consensus.hpp ---------------------------------------------------------------------- diff --git a/src/log/consensus.hpp b/src/log/consensus.hpp index ba41601..102a65b 100644 --- a/src/log/consensus.hpp +++ b/src/log/consensus.hpp @@ -41,9 +41,10 @@ // to agree on previously written entries in the log. namespace mesos { -namespace internal { namespace log { +using namespace mesos::internal::log; + // Runs the promise phase (a.k.a., the prepare phase) in Paxos. This // phase has two purposes. First, the proposer asks promises from a // quorum of replicas not to accept writes from proposers with lower @@ -130,7 +131,6 @@ extern process::Future<Action> fill( uint64_t position); } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_CONSENSUS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/coordinator.cpp ---------------------------------------------------------------------- diff --git a/src/log/coordinator.cpp b/src/log/coordinator.cpp index fe0c5f9..9a4383d 100644 --- a/src/log/coordinator.cpp +++ b/src/log/coordinator.cpp @@ -40,7 +40,6 @@ using namespace process; using std::string; namespace mesos { -namespace internal { namespace log { class CoordinatorProcess : public Process<CoordinatorProcess> @@ -477,5 +476,4 @@ Future<Option<uint64_t> > Coordinator::truncate(uint64_t to) } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/coordinator.hpp ---------------------------------------------------------------------- diff --git a/src/log/coordinator.hpp b/src/log/coordinator.hpp index b8a475f..e00d34d 100644 --- a/src/log/coordinator.hpp +++ b/src/log/coordinator.hpp @@ -32,7 +32,6 @@ #include "log/replica.hpp" namespace mesos { -namespace internal { namespace log { // Forward declaration. @@ -76,7 +75,6 @@ private: }; } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_COORDINATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/leveldb.cpp ---------------------------------------------------------------------- diff --git a/src/log/leveldb.cpp b/src/log/leveldb.cpp index ad9e2f0..6441405 100644 --- a/src/log/leveldb.cpp +++ b/src/log/leveldb.cpp @@ -37,9 +37,10 @@ using std::string; namespace mesos { -namespace internal { namespace log { +using namespace mesos::internal::log; + class Varint64Comparator : public leveldb::Comparator { public: @@ -441,5 +442,4 @@ Try<Action> LevelDBStorage::read(uint64_t position) } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/leveldb.hpp ---------------------------------------------------------------------- diff --git a/src/log/leveldb.hpp b/src/log/leveldb.hpp index 40a6d6f..60ea949 100644 --- a/src/log/leveldb.hpp +++ b/src/log/leveldb.hpp @@ -28,9 +28,10 @@ #include "log/storage.hpp" namespace mesos { -namespace internal { namespace log { +using namespace mesos::internal::log; + // Concrete implementation of the storage interface using leveldb. class LevelDBStorage : public Storage { @@ -51,7 +52,6 @@ private: }; } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_LEVELDB_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/log.cpp ---------------------------------------------------------------------- diff --git a/src/log/log.cpp b/src/log/log.cpp index 598af69..cd7b6a8 100644 --- a/src/log/log.cpp +++ b/src/log/log.cpp @@ -46,7 +46,6 @@ using std::set; using std::string; namespace mesos { -namespace internal { namespace log { class LogProcess : public Process<LogProcess> @@ -867,5 +866,4 @@ Future<Option<Log::Position> > Log::Writer::truncate(const Log::Position& to) } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/log.hpp ---------------------------------------------------------------------- diff --git a/src/log/log.hpp b/src/log/log.hpp index 7c905c7..fac7d97 100644 --- a/src/log/log.hpp +++ b/src/log/log.hpp @@ -38,7 +38,6 @@ #include "zookeeper/group.hpp" namespace mesos { -namespace internal { namespace log { // Forward declarations. @@ -232,7 +231,6 @@ private: }; } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/main.cpp ---------------------------------------------------------------------- diff --git a/src/log/main.cpp b/src/log/main.cpp index 348e887..2027ba0 100644 --- a/src/log/main.cpp +++ b/src/log/main.cpp @@ -33,8 +33,7 @@ #include "log/tool/replica.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::log; +using namespace mesos::log; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/recover.cpp ---------------------------------------------------------------------- diff --git a/src/log/recover.cpp b/src/log/recover.cpp index 679741b..0ca7371 100644 --- a/src/log/recover.cpp +++ b/src/log/recover.cpp @@ -46,7 +46,6 @@ using namespace process; using std::set; namespace mesos { -namespace internal { namespace log { // This class is responsible for executing the log recover protocol. @@ -641,5 +640,4 @@ Future<Owned<Replica> > recover( } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/recover.hpp ---------------------------------------------------------------------- diff --git a/src/log/recover.hpp b/src/log/recover.hpp index 6243c18..11e144e 100644 --- a/src/log/recover.hpp +++ b/src/log/recover.hpp @@ -31,7 +31,6 @@ #include "log/replica.hpp" namespace mesos { -namespace internal { namespace log { // Recovers a replica by catching up enough missing positions. A @@ -58,7 +57,6 @@ extern process::Future<process::Owned<Replica> > recover( bool autoInitialize = false); } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_RECOVER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/replica.cpp ---------------------------------------------------------------------- diff --git a/src/log/replica.cpp b/src/log/replica.cpp index dedfde4..2b748b3 100644 --- a/src/log/replica.cpp +++ b/src/log/replica.cpp @@ -44,7 +44,6 @@ using std::list; using std::string; namespace mesos { -namespace internal { namespace log { namespace protocol { @@ -822,5 +821,4 @@ PID<ReplicaProcess> Replica::pid() const } } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/replica.hpp ---------------------------------------------------------------------- diff --git a/src/log/replica.hpp b/src/log/replica.hpp index 33d3f1d..7563ecd 100644 --- a/src/log/replica.hpp +++ b/src/log/replica.hpp @@ -33,9 +33,10 @@ #include "messages/log.hpp" namespace mesos { -namespace internal { namespace log { +using namespace mesos::internal::log; + namespace protocol { // Some replica protocol declarations. @@ -102,7 +103,6 @@ private: }; } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_REPLICA_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/storage.hpp ---------------------------------------------------------------------- diff --git a/src/log/storage.hpp b/src/log/storage.hpp index 60bf37f..5d238e7 100644 --- a/src/log/storage.hpp +++ b/src/log/storage.hpp @@ -30,9 +30,10 @@ #include "messages/log.hpp" namespace mesos { -namespace internal { namespace log { +using namespace mesos::internal::log; + // Abstract interface for reading and writing records. class Storage { @@ -59,7 +60,6 @@ public: }; } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_STORAGE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool.hpp ---------------------------------------------------------------------- diff --git a/src/log/tool.hpp b/src/log/tool.hpp index 656d3f6..3905159 100644 --- a/src/log/tool.hpp +++ b/src/log/tool.hpp @@ -25,7 +25,6 @@ #include <stout/try.hpp> namespace mesos { -namespace internal { namespace log { namespace tool { @@ -45,7 +44,6 @@ public: } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_TOOL_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/benchmark.cpp ---------------------------------------------------------------------- diff --git a/src/log/tool/benchmark.cpp b/src/log/tool/benchmark.cpp index 54d7898..096298e 100644 --- a/src/log/tool/benchmark.cpp +++ b/src/log/tool/benchmark.cpp @@ -52,7 +52,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace log { namespace tool { @@ -278,5 +277,4 @@ Try<Nothing> Benchmark::execute(int argc, char** argv) } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/benchmark.hpp ---------------------------------------------------------------------- diff --git a/src/log/tool/benchmark.hpp b/src/log/tool/benchmark.hpp index e0109e2..d519a69 100644 --- a/src/log/tool/benchmark.hpp +++ b/src/log/tool/benchmark.hpp @@ -27,7 +27,6 @@ #include "logging/flags.hpp" namespace mesos { -namespace internal { namespace log { namespace tool { @@ -62,7 +61,6 @@ private: } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_TOOL_BENCHMARK_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/initialize.cpp ---------------------------------------------------------------------- diff --git a/src/log/tool/initialize.cpp b/src/log/tool/initialize.cpp index ccda7fb..f3d6337 100644 --- a/src/log/tool/initialize.cpp +++ b/src/log/tool/initialize.cpp @@ -36,7 +36,6 @@ using std::ostringstream; using std::string; namespace mesos { -namespace internal { namespace log { namespace tool { @@ -144,5 +143,4 @@ Try<Nothing> Initialize::execute(int argc, char** argv) } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/initialize.hpp ---------------------------------------------------------------------- diff --git a/src/log/tool/initialize.hpp b/src/log/tool/initialize.hpp index 10ac269..f55225f 100644 --- a/src/log/tool/initialize.hpp +++ b/src/log/tool/initialize.hpp @@ -28,7 +28,6 @@ #include "logging/flags.hpp" namespace mesos { -namespace internal { namespace log { namespace tool { @@ -57,7 +56,6 @@ private: } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_TOOL_INITIALIZE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/read.cpp ---------------------------------------------------------------------- diff --git a/src/log/tool/read.cpp b/src/log/tool/read.cpp index d141385..4c6c30d 100644 --- a/src/log/tool/read.cpp +++ b/src/log/tool/read.cpp @@ -40,7 +40,6 @@ using std::ostringstream; using std::string; namespace mesos { -namespace internal { namespace log { namespace tool { @@ -186,5 +185,4 @@ Try<Nothing> Read::execute(int argc, char** argv) } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/read.hpp ---------------------------------------------------------------------- diff --git a/src/log/tool/read.hpp b/src/log/tool/read.hpp index 9a6971b..1a077de 100644 --- a/src/log/tool/read.hpp +++ b/src/log/tool/read.hpp @@ -30,7 +30,6 @@ #include "logging/flags.hpp" namespace mesos { -namespace internal { namespace log { namespace tool { @@ -61,7 +60,6 @@ private: } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_TOOL_READ_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/replica.cpp ---------------------------------------------------------------------- diff --git a/src/log/tool/replica.cpp b/src/log/tool/replica.cpp index 3985fc7..0edc70a 100644 --- a/src/log/tool/replica.cpp +++ b/src/log/tool/replica.cpp @@ -37,7 +37,6 @@ using std::ostringstream; using std::string; namespace mesos { -namespace internal { namespace log { namespace tool { @@ -146,5 +145,4 @@ Try<Nothing> Replica::execute(int argc, char** argv) } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/log/tool/replica.hpp ---------------------------------------------------------------------- diff --git a/src/log/tool/replica.hpp b/src/log/tool/replica.hpp index 7140c7e..9d8dfd0 100644 --- a/src/log/tool/replica.hpp +++ b/src/log/tool/replica.hpp @@ -29,7 +29,6 @@ #include "logging/flags.hpp" namespace mesos { -namespace internal { namespace log { namespace tool { @@ -62,7 +61,6 @@ private: } // namespace tool { } // namespace log { -} // namespace internal { } // namespace mesos { #endif // __LOG_TOOL_REPLICA_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/logging/flags.hpp ---------------------------------------------------------------------- diff --git a/src/logging/flags.hpp b/src/logging/flags.hpp index 4facb33..30b59b6 100644 --- a/src/logging/flags.hpp +++ b/src/logging/flags.hpp @@ -25,7 +25,6 @@ #include <stout/option.hpp> namespace mesos { -namespace internal { namespace logging { class Flags : public virtual flags::FlagsBase @@ -80,7 +79,6 @@ public: }; } // namespace logging { -} // namespace internal { } // namespace mesos { #endif // __LOGGING_FLAGS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/logging/logging.cpp ---------------------------------------------------------------------- diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp index 6b14575..9ae91d1 100644 --- a/src/logging/logging.cpp +++ b/src/logging/logging.cpp @@ -59,7 +59,6 @@ extern "C" void __cxa_pure_virtual() namespace mesos { -namespace internal { namespace logging { // Persistent copy of argv0 since InitGoogleLogging requires the @@ -233,5 +232,4 @@ Try<string> getLogFile(google::LogSeverity severity) } } // namespace logging { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/logging/logging.hpp ---------------------------------------------------------------------- diff --git a/src/logging/logging.hpp b/src/logging/logging.hpp index f204d61..1984f9b 100644 --- a/src/logging/logging.hpp +++ b/src/logging/logging.hpp @@ -26,7 +26,6 @@ #include "logging/flags.hpp" namespace mesos { -namespace internal { namespace logging { void initialize( @@ -44,7 +43,6 @@ Try<std::string> getLogFile(google::LogSeverity severity); google::LogSeverity getLogSeverity(const std::string& logging_level); } // namespace logging { -} // namespace internal { } // namespace mesos { #endif // __LOGGING_LOGGING_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/allocator.hpp ---------------------------------------------------------------------- diff --git a/src/master/allocator.hpp b/src/master/allocator.hpp index 44a7695..2149ea4 100644 --- a/src/master/allocator.hpp +++ b/src/master/allocator.hpp @@ -39,7 +39,6 @@ #include "messages/messages.hpp" namespace mesos { -namespace internal { namespace master { class Master; // Forward declaration. @@ -394,7 +393,6 @@ inline void Allocator::reviveOffers( } // namespace allocator { } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __ALLOCATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/constants.cpp ---------------------------------------------------------------------- diff --git a/src/master/constants.cpp b/src/master/constants.cpp index 9ee17e9..d3d0f71 100644 --- a/src/master/constants.cpp +++ b/src/master/constants.cpp @@ -25,7 +25,6 @@ #include "master/constants.hpp" namespace mesos { -namespace internal { namespace master { const int MAX_OFFERS_PER_FRAMEWORK = 50; @@ -45,5 +44,4 @@ const Duration ZOOKEEPER_SESSION_TIMEOUT = Seconds(10); const std::string DEFAULT_AUTHENTICATOR = "crammd5"; } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/constants.hpp ---------------------------------------------------------------------- diff --git a/src/master/constants.hpp b/src/master/constants.hpp index c386eab..ad3fe81 100644 --- a/src/master/constants.hpp +++ b/src/master/constants.hpp @@ -27,7 +27,6 @@ #include <stout/duration.hpp> namespace mesos { -namespace internal { namespace master { // TODO(benh): Add units after constants. @@ -109,7 +108,6 @@ extern const Duration ZOOKEEPER_SESSION_TIMEOUT; extern const std::string DEFAULT_AUTHENTICATOR; } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __MASTER_CONSTANTS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/contender.cpp ---------------------------------------------------------------------- diff --git a/src/master/contender.cpp b/src/master/contender.cpp index c1bf82b..2270400 100644 --- a/src/master/contender.cpp +++ b/src/master/contender.cpp @@ -38,7 +38,6 @@ using namespace process; using namespace zookeeper; namespace mesos { -namespace internal { using namespace master; @@ -226,5 +225,4 @@ Future<Future<Nothing> > ZooKeeperMasterContenderProcess::contend() return candidacy.get(); } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/contender.hpp ---------------------------------------------------------------------- diff --git a/src/master/contender.hpp b/src/master/contender.hpp index 76beb5f..8e3e25a 100644 --- a/src/master/contender.hpp +++ b/src/master/contender.hpp @@ -34,7 +34,6 @@ #include "zookeeper/url.hpp" namespace mesos { -namespace internal { extern const Duration MASTER_CONTENDER_ZK_SESSION_TIMEOUT; @@ -127,7 +126,6 @@ private: ZooKeeperMasterContenderProcess* process; }; -} // namespace internal { } // namespace mesos { #endif // __MASTER_CONTENDER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/detector.cpp ---------------------------------------------------------------------- diff --git a/src/master/detector.cpp b/src/master/detector.cpp index 700eb9d..ebeca61 100644 --- a/src/master/detector.cpp +++ b/src/master/detector.cpp @@ -51,7 +51,6 @@ using std::set; using std::string; namespace mesos { -namespace internal { const Duration MASTER_DETECTOR_ZK_SESSION_TIMEOUT = Seconds(10); @@ -465,5 +464,4 @@ Future<Option<MasterInfo> > ZooKeeperMasterDetector::detect( return dispatch(process, &ZooKeeperMasterDetectorProcess::detect, previous); } -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/detector.hpp ---------------------------------------------------------------------- diff --git a/src/master/detector.hpp b/src/master/detector.hpp index 2905e2b..4810748 100644 --- a/src/master/detector.hpp +++ b/src/master/detector.hpp @@ -35,7 +35,6 @@ #include "zookeeper/url.hpp" namespace mesos { -namespace internal { extern const Duration MASTER_DETECTOR_ZK_SESSION_TIMEOUT; @@ -128,7 +127,6 @@ private: ZooKeeperMasterDetectorProcess* process; }; -} // namespace internal { } // namespace mesos { #endif // __MASTER_DETECTOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/drf_sorter.cpp ---------------------------------------------------------------------- diff --git a/src/master/drf_sorter.cpp b/src/master/drf_sorter.cpp index 584e26c..0e4974c 100644 --- a/src/master/drf_sorter.cpp +++ b/src/master/drf_sorter.cpp @@ -26,7 +26,6 @@ using std::string; namespace mesos { -namespace internal { namespace master { namespace allocator { @@ -291,5 +290,4 @@ set<Client, DRFComparator>::iterator DRFSorter::find(const string& name) } // namespace allocator { } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/drf_sorter.hpp ---------------------------------------------------------------------- diff --git a/src/master/drf_sorter.hpp b/src/master/drf_sorter.hpp index 5a66313..8a16d28 100644 --- a/src/master/drf_sorter.hpp +++ b/src/master/drf_sorter.hpp @@ -30,7 +30,6 @@ namespace mesos { -namespace internal { namespace master { namespace allocator { @@ -125,7 +124,6 @@ private: } // namespace allocator { } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __DRF_SORTER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/flags.hpp ---------------------------------------------------------------------- diff --git a/src/master/flags.hpp b/src/master/flags.hpp index e9f6fff..df2e9cb 100644 --- a/src/master/flags.hpp +++ b/src/master/flags.hpp @@ -38,7 +38,6 @@ #include "messages/messages.hpp" namespace mesos { -namespace internal { namespace master { class Flags : public logging::Flags @@ -411,7 +410,6 @@ public: }; } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __MASTER_FLAGS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/hierarchical_allocator_process.hpp ---------------------------------------------------------------------- diff --git a/src/master/hierarchical_allocator_process.hpp b/src/master/hierarchical_allocator_process.hpp index 6b44892..10fa6ec 100644 --- a/src/master/hierarchical_allocator_process.hpp +++ b/src/master/hierarchical_allocator_process.hpp @@ -40,7 +40,6 @@ #include "master/sorter.hpp" namespace mesos { -namespace internal { namespace master { namespace allocator { @@ -399,7 +398,6 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::deactivateFramework( } -namespace internal { // TODO(bmahler): Generalize this. template <typename Iterable> @@ -412,7 +410,6 @@ Resources sum(const Iterable& resources) return total; } -} // namespace internal { template <class RoleSorter, class FrameworkSorter> @@ -445,7 +442,7 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::addSlave( slaves[slaveId] = Slave(); slaves[slaveId].total = total; - slaves[slaveId].available = total - internal::sum(used.values()); + slaves[slaveId].available = total - sum(used.values()); slaves[slaveId].activated = true; slaves[slaveId].checkpoint = slaveInfo.checkpoint(); slaves[slaveId].hostname = slaveInfo.hostname(); @@ -916,7 +913,6 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::allocatable( } // namespace allocator { } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __HIERARCHICAL_ALLOCATOR_PROCESS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 3981b18..138624d 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -76,11 +76,10 @@ using std::vector; namespace mesos { -namespace internal { namespace master { // Pull in model overrides from common. -using mesos::internal::model; +using mesos::model; // Pull in definitions from process. using process::http::Response; @@ -887,5 +886,4 @@ Result<Credential> Master::Http::authenticate(const Request& request) } // namespace master { -} // namespace internal { } // namespace mesos {
