Cleaned up `using` statements. A source file should typically not contain both `using xyz::foo` and `xyz::foo`.
Review: https://reviews.apache.org/r/57157/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0e0d3279 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0e0d3279 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0e0d3279 Branch: refs/heads/master Commit: 0e0d3279724c5162b4e5940487dece3ecd2bdd74 Parents: c9dfe1e Author: Neil Conway <[email protected]> Authored: Tue Feb 28 16:14:12 2017 -0800 Committer: Neil Conway <[email protected]> Committed: Tue Feb 28 16:14:29 2017 -0800 ---------------------------------------------------------------------- src/linux/capabilities.cpp | 17 +++++++-------- src/master/weights_handler.cpp | 2 +- src/slave/containerizer/docker.cpp | 2 +- .../isolators/cgroups/subsystems/net_cls.cpp | 4 ++-- .../mesos/isolators/gpu/allocator.cpp | 4 ++-- .../cni/plugins/port_mapper/port_mapper.cpp | 2 +- .../containerizer/mesos/linux_launcher.cpp | 22 ++++++++++---------- src/slave/containerizer/mesos/paths.cpp | 8 +++---- src/slave/flags.cpp | 6 +++--- src/tests/container_logger_tests.cpp | 4 ++-- .../containerizer/mesos_containerizer_tests.cpp | 4 ++-- src/tests/containerizer/rootfs.cpp | 4 ++-- 12 files changed, 39 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/linux/capabilities.cpp ---------------------------------------------------------------------- diff --git a/src/linux/capabilities.cpp b/src/linux/capabilities.cpp index 9f46bd0..b9d65df 100644 --- a/src/linux/capabilities.cpp +++ b/src/linux/capabilities.cpp @@ -31,7 +31,6 @@ using std::hex; using std::ostream; -using std::set; using std::string; using std::vector; @@ -104,7 +103,7 @@ struct SyscallPayload // Helper function to convert capability set to bitset. -static uint64_t toCapabilityBitset(const set<Capability>& capabilities) +static uint64_t toCapabilityBitset(const std::set<Capability>& capabilities) { uint64_t result = 0; @@ -119,9 +118,9 @@ static uint64_t toCapabilityBitset(const set<Capability>& capabilities) // Helper function to convert capability bitset to std::set. -static set<Capability> toCapabilitySet(uint64_t bitset) +static std::set<Capability> toCapabilitySet(uint64_t bitset) { - set<Capability> result; + std::set<Capability> result; for (int i = 0; i < MAX_CAPABILITY; i++) { if ((bitset & (1ULL << i)) != 0) { @@ -133,7 +132,7 @@ static set<Capability> toCapabilitySet(uint64_t bitset) } -set<Capability> ProcessCapabilities::get(const Type& type) const +std::set<Capability> ProcessCapabilities::get(const Type& type) const { switch (type) { case EFFECTIVE: return effective; @@ -319,7 +318,7 @@ Try<Nothing> Capabilities::setKeepCaps() } -set<Capability> Capabilities::getAllSupportedCapabilities() +std::set<Capability> Capabilities::getAllSupportedCapabilities() { std::set<Capability> result; @@ -342,9 +341,9 @@ Capability convert(const CapabilityInfo::Capability& capability) } -set<Capability> convert(const CapabilityInfo& capabilityInfo) +std::set<Capability> convert(const CapabilityInfo& capabilityInfo) { - set<Capability> result; + std::set<Capability> result; foreach (int value, capabilityInfo.capabilities()) { result.insert(convert(static_cast<CapabilityInfo::Capability>(value))); @@ -354,7 +353,7 @@ set<Capability> convert(const CapabilityInfo& capabilityInfo) } -CapabilityInfo convert(const set<Capability>& capabilities) +CapabilityInfo convert(const std::set<Capability>& capabilities) { CapabilityInfo capabilityInfo; http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/master/weights_handler.cpp ---------------------------------------------------------------------- diff --git a/src/master/weights_handler.cpp b/src/master/weights_handler.cpp index 4f6a4cd..d8047f2 100644 --- a/src/master/weights_handler.cpp +++ b/src/master/weights_handler.cpp @@ -342,7 +342,7 @@ Future<bool> Master::WeightsHandler::authorizeUpdateWeights( } return await(authorizations) - .then([](const std::list<Future<bool>>& authorizations) + .then([](const list<Future<bool>>& authorizations) -> Future<bool> { // Compute a disjunction. foreach (const Future<bool>& authorization, authorizations) { http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 7d801fb..823a39e 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -1427,7 +1427,7 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess( // be overwritten if they are specified by the framework. This might cause // applications to not work, but upon overriding system defaults, it becomes // the overidder's problem. - Option<std::map<string, string>> systemEnvironment = + Option<map<string, string>> systemEnvironment = process::internal::getSystemEnvironment(); foreachpair(const string& key, const string& value, systemEnvironment.get()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp index 2608df1..ba563a4 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp @@ -448,8 +448,8 @@ Future<Nothing> NetClsSubsystem::cleanup( Result<NetClsHandle> NetClsSubsystem::recoverHandle( - const std::string& hierarchy, - const std::string& cgroup) + const string& hierarchy, + const string& cgroup) { Try<uint32_t> classid = cgroups::net_cls::classid(hierarchy, cgroup); if (classid.isError()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp b/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp index 2e72269..c288ad6 100644 --- a/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp +++ b/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp @@ -249,7 +249,7 @@ class NvidiaGpuAllocatorProcess : public process::Process<NvidiaGpuAllocatorProcess> { public: - NvidiaGpuAllocatorProcess(const std::set<Gpu>& gpus) + NvidiaGpuAllocatorProcess(const set<Gpu>& gpus) : available(gpus) {} Future<set<Gpu>> allocate(size_t count) @@ -314,7 +314,7 @@ struct NvidiaGpuAllocator::Data process::terminate(process); } - const std::set<Gpu> gpus; + const set<Gpu> gpus; PID<NvidiaGpuAllocatorProcess> process; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp index d0cf80b..1be8c23 100644 --- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp +++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp @@ -491,7 +491,7 @@ Try<Option<string>, PluginError> PortMapper::execute() Result<spec::NetworkInfo> PortMapper::delegate(const string& command) { - map<std::string, std::string> environment; + map<string, string> environment; environment["CNI_COMMAND"] = command; environment["CNI_IFNAME"] = cniIfName; http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/linux_launcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/linux_launcher.cpp b/src/slave/containerizer/mesos/linux_launcher.cpp index a3409dc..80c9ab2 100644 --- a/src/slave/containerizer/mesos/linux_launcher.cpp +++ b/src/slave/containerizer/mesos/linux_launcher.cpp @@ -64,21 +64,21 @@ class LinuxLauncherProcess : public Process<LinuxLauncherProcess> public: LinuxLauncherProcess( const Flags& flags, - const std::string& freezerHierarchy, - const Option<std::string>& systemdHierarchy); + const string& freezerHierarchy, + const Option<string>& systemdHierarchy); virtual process::Future<hashset<ContainerID>> recover( const std::list<mesos::slave::ContainerState>& states); virtual Try<pid_t> fork( const ContainerID& containerId, - const std::string& path, - const std::vector<std::string>& argv, + const string& path, + const vector<string>& argv, const process::Subprocess::IO& in, const process::Subprocess::IO& out, const process::Subprocess::IO& err, const flags::FlagsBase* flags, - const Option<std::map<std::string, std::string>>& environment, + const Option<std::map<string, string>>& environment, const Option<int>& enterNamespaces, const Option<int>& cloneNamespaces); @@ -109,16 +109,16 @@ private: // Helper for determining the cgroup for a container (i.e., the path // in a cgroup subsystem). - std::string cgroup(const ContainerID& containerId); + string cgroup(const ContainerID& containerId); // Helper for parsing the cgroup path to determine the container ID // it belongs to. Option<ContainerID> parse(const string& cgroup); - static const std::string subsystem; + static const string subsystem; const Flags flags; - const std::string freezerHierarchy; - const Option<std::string> systemdHierarchy; + const string freezerHierarchy; + const Option<string> systemdHierarchy; hashmap<ContainerID, Container> containers; }; @@ -205,7 +205,7 @@ Future<hashset<ContainerID>> LinuxLauncher::recover( Try<pid_t> LinuxLauncher::fork( const ContainerID& containerId, const string& path, - const vector<std::string>& argv, + const vector<string>& argv, const process::Subprocess::IO& in, const process::Subprocess::IO& out, const process::Subprocess::IO& err, @@ -330,7 +330,7 @@ Future<hashset<ContainerID>> LinuxLauncherProcess::recover( // still in the `MESOS_EXECUTORS_SLICE`. If they are not, warn the // operator that resource isolation may be invalidated. if (systemdHierarchy.isSome()) { - Result<std::set<pid_t>> mesosExecutorSlicePids = cgroups::processes( + Result<set<pid_t>> mesosExecutorSlicePids = cgroups::processes( systemdHierarchy.get(), systemd::mesos::MESOS_EXECUTORS_SLICE); http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/paths.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/paths.cpp b/src/slave/containerizer/mesos/paths.cpp index c1770ce..ed4bbd2 100644 --- a/src/slave/containerizer/mesos/paths.cpp +++ b/src/slave/containerizer/mesos/paths.cpp @@ -160,7 +160,7 @@ string getContainerIOSwitchboardPidPath( Result<pid_t> getContainerIOSwitchboardPid( - const std::string& runtimeDir, + const string& runtimeDir, const ContainerID& containerId) { const string path = getContainerIOSwitchboardPidPath( @@ -230,8 +230,8 @@ Result<unix::Address> getContainerIOSwitchboardAddress( #endif // __WINDOWS__ -std::string getContainerForceDestroyOnRecoveryPath( - const std::string& runtimeDir, +string getContainerForceDestroyOnRecoveryPath( + const string& runtimeDir, const ContainerID& containerId) { return path::join( @@ -241,7 +241,7 @@ std::string getContainerForceDestroyOnRecoveryPath( bool getContainerForceDestroyOnRecovery( - const std::string& runtimeDir, + const string& runtimeDir, const ContainerID& containerId) { const string path = getContainerForceDestroyOnRecoveryPath( http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/flags.cpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index 8de2643..4637ca6 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -216,12 +216,12 @@ mesos::internal::slave::Flags::Flags() "not across reboots). This directory will be cleared on reboot.\n" "(Example: `/var/run/mesos`)", []() -> string { - Try<std::string> var = os::var(); + Try<string> var = os::var(); if (var.isSome()) { #ifdef __WINDOWS__ - const std::string prefix(var.get()); + const string prefix(var.get()); #else - const std::string prefix(path::join(var.get(), "run")); + const string prefix(path::join(var.get(), "run")); #endif // __WINDOWS__ // We check for access on the prefix because the remainder http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/tests/container_logger_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp index 589d6a9..5f2a7b0 100644 --- a/src/tests/container_logger_tests.cpp +++ b/src/tests/container_logger_tests.cpp @@ -434,7 +434,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions) AWAIT_READY(offers); EXPECT_NE(0u, offers.get().size()); - const std::string customConfig = "some-custom-logrotate-option"; + const string customConfig = "some-custom-logrotate-option"; TaskInfo task = createTask(offers.get()[0], "exit 0"); @@ -479,7 +479,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions) string stdoutPath = path::join(sandboxDirectory, "stdout.logrotate.conf"); ASSERT_TRUE(os::exists(stdoutPath)); - Try<std::string> stdoutConfig = os::read(stdoutPath); + Try<string> stdoutConfig = os::read(stdoutPath); ASSERT_SOME(stdoutConfig); ASSERT_TRUE(strings::contains(stdoutConfig.get(), customConfig)); http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/tests/containerizer/mesos_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp index 039f197..683807f 100644 --- a/src/tests/containerizer/mesos_containerizer_tests.cpp +++ b/src/tests/containerizer/mesos_containerizer_tests.cpp @@ -682,12 +682,12 @@ TEST_F(MesosContainerizerExecuteTest, ROOT_SandboxFileOwnership) // Verify that stdout is owned by the task user. struct stat s; - std::string stdoutPath = path::join(sandbox, "stdout"); + string stdoutPath = path::join(sandbox, "stdout"); EXPECT_EQ(0, ::stat(stdoutPath.c_str(), &s)); EXPECT_EQ(uid.get(), s.st_uid); // Verify that stderr is owned by the task user. - std::string stderrPath = path::join(sandbox, "stderr"); + string stderrPath = path::join(sandbox, "stderr"); EXPECT_EQ(0, ::stat(stderrPath.c_str(), &s)); EXPECT_EQ(uid.get(), s.st_uid); http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/tests/containerizer/rootfs.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/rootfs.cpp b/src/tests/containerizer/rootfs.cpp index 513c1b5..fdfecc6 100644 --- a/src/tests/containerizer/rootfs.cpp +++ b/src/tests/containerizer/rootfs.cpp @@ -125,7 +125,7 @@ Try<process::Owned<Rootfs>> LinuxRootfs::create(const string& root) return Error("Failed to parse ld.so cache: " + cache.error()); } - const std::vector<string> programs = { + const vector<string> programs = { "/bin/echo", "/bin/ls", "/bin/ping", @@ -156,7 +156,7 @@ Try<process::Owned<Rootfs>> LinuxRootfs::create(const string& root) } } - const std::vector<string> directories = { + const vector<string> directories = { "/proc", "/sys", "/dev",
