Moved user of stout's `Set` to `std::set`. After the move to C++11 stout's `Set` offers no benefits over `std::set`, and will be removed in a subsequent change set.
Review: https://reviews.apache.org/r/52036/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3e0ed792 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3e0ed792 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3e0ed792 Branch: refs/heads/master Commit: 3e0ed792331ba9a56ceb79501e176f1c23f46cb5 Parents: e2e99de Author: Benjamin Bannier <benjamin.bann...@mesosphere.io> Authored: Wed Sep 21 14:08:12 2016 +0200 Committer: Michael Park <mp...@apache.org> Committed: Wed Sep 21 17:38:53 2016 +0200 ---------------------------------------------------------------------- src/linux/capabilities.cpp | 39 ++++++++------------ src/linux/capabilities.hpp | 25 +++++-------- src/log/log.cpp | 2 +- src/slave/containerizer/mesos/launch.cpp | 4 +- .../containerizer/capabilities_test_helper.cpp | 4 +- src/tests/containerizer/capabilities_tests.cpp | 6 ++- 6 files changed, 37 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3e0ed792/src/linux/capabilities.cpp ---------------------------------------------------------------------- diff --git a/src/linux/capabilities.cpp b/src/linux/capabilities.cpp index abaf721..3e30c4d 100644 --- a/src/linux/capabilities.cpp +++ b/src/linux/capabilities.cpp @@ -20,7 +20,6 @@ #include <sys/prctl.h> -#include <set> #include <string> #include <stout/numify.hpp> @@ -105,7 +104,7 @@ struct SyscallPayload // Helper function to convert capability set to bitset. -static uint64_t toCapabilityBitset(const Set<Capability>& capabilities) +static uint64_t toCapabilityBitset(const set<Capability>& capabilities) { uint64_t result = 0; @@ -119,10 +118,10 @@ static uint64_t toCapabilityBitset(const Set<Capability>& capabilities) } -// Helper function to convert capability bitset to Set. -static Set<Capability> toCapabilitySet(uint64_t bitset) +// Helper function to convert capability bitset to std::set. +static set<Capability> toCapabilitySet(uint64_t bitset) { - Set<Capability> result; + set<Capability> result; for (int i = 0; i < MAX_CAPABILITY; i++) { if ((bitset & (1ULL << i)) != 0) { @@ -134,7 +133,7 @@ static Set<Capability> toCapabilitySet(uint64_t bitset) } -Set<Capability> ProcessCapabilities::get(const Type& type) const +set<Capability> ProcessCapabilities::get(const Type& type) const { switch (type) { case EFFECTIVE: return effective; @@ -149,7 +148,7 @@ Set<Capability> ProcessCapabilities::get(const Type& type) const void ProcessCapabilities::set( const Type& type, - const Set<Capability>& capabilities) + const std::set<Capability>& capabilities) { switch (type) { case EFFECTIVE: effective = capabilities; return; @@ -254,7 +253,7 @@ Try<ProcessCapabilities> Capabilities::get() const capabilities.set(PERMITTED, toCapabilitySet(payload.permitted())); capabilities.set(INHERITABLE, toCapabilitySet(payload.inheritable())); - Set<Capability> bounding; + std::set<Capability> bounding; // TODO(bbannier): Parse bounding set from the `CapBnd` entry in // `/proc/self/status`. @@ -320,9 +319,9 @@ Try<Nothing> Capabilities::setKeepCaps() } -Set<Capability> Capabilities::getAllSupportedCapabilities() +set<Capability> Capabilities::getAllSupportedCapabilities() { - Set<Capability> result; + std::set<Capability> result; for (int i = 0; i <= lastCap; i++) { result.insert(Capability(i)); @@ -343,9 +342,9 @@ Capability convert(const CapabilityInfo::Capability& capability) } -Set<Capability> convert(const CapabilityInfo& capabilityInfo) +set<Capability> convert(const CapabilityInfo& capabilityInfo) { - Set<Capability> result; + set<Capability> result; foreach (int value, capabilityInfo.capabilities()) { result.insert(convert(static_cast<CapabilityInfo::Capability>(value))); @@ -355,7 +354,7 @@ Set<Capability> convert(const CapabilityInfo& capabilityInfo) } -CapabilityInfo convert(const Set<Capability>& capabilities) +CapabilityInfo convert(const set<Capability>& capabilities) { CapabilityInfo capabilityInfo; @@ -429,20 +428,14 @@ ostream& operator<<(ostream& stream, const Type& type) } -ostream& operator<<(ostream& stream, const Set<Capability>& capabilities) -{ - return stream << stringify(capabilities); -} - - ostream& operator<<(ostream& stream, const ProcessCapabilities& capabilities) { return stream << "{" - << EFFECTIVE << ": " << capabilities.effective << ", " - << PERMITTED << ": " << capabilities.permitted << ", " - << INHERITABLE << ": " << capabilities.inheritable << ", " - << BOUNDING << ": " << capabilities.bounding + << EFFECTIVE << ": " << stringify(capabilities.effective) << ", " + << PERMITTED << ": " << stringify(capabilities.permitted) << ", " + << INHERITABLE << ": " << stringify(capabilities.inheritable) << ", " + << BOUNDING << ": " << stringify(capabilities.bounding) << "}"; } http://git-wip-us.apache.org/repos/asf/mesos/blob/3e0ed792/src/linux/capabilities.hpp ---------------------------------------------------------------------- diff --git a/src/linux/capabilities.hpp b/src/linux/capabilities.hpp index e3203f8..9c0bcf4 100644 --- a/src/linux/capabilities.hpp +++ b/src/linux/capabilities.hpp @@ -17,13 +17,13 @@ #ifndef __LINUX_CAPABILITIES_HPP__ #define __LINUX_CAPABILITIES_HPP__ +#include <set> #include <string> #include <vector> #include <stout/flags.hpp> #include <stout/nothing.hpp> #include <stout/protobuf.hpp> -#include <stout/set.hpp> #include <stout/try.hpp> #include <mesos/mesos.hpp> @@ -93,8 +93,8 @@ enum Type class ProcessCapabilities { public: - Set<Capability> get(const Type& type) const; - void set(const Type& type, const Set<Capability>& capabilities); + std::set<Capability> get(const Type& type) const; + void set(const Type& type, const std::set<Capability>& capabilities); void add(const Type& type, const Capability& capability); void drop(const Type& type, const Capability& capability); @@ -103,10 +103,10 @@ private: std::ostream& stream, const ProcessCapabilities& set); - Set<Capability> effective; - Set<Capability> permitted; - Set<Capability> inheritable; - Set<Capability> bounding; + std::set<Capability> effective; + std::set<Capability> permitted; + std::set<Capability> inheritable; + std::set<Capability> bounding; }; @@ -165,7 +165,7 @@ public: * * @return the set of supported capabilities. */ - Set<Capability> getAllSupportedCapabilities(); + std::set<Capability> getAllSupportedCapabilities(); private: explicit Capabilities(int _lastCap) : lastCap(_lastCap) {} @@ -176,8 +176,8 @@ private: Capability convert(const CapabilityInfo::Capability& capability); -Set<Capability> convert(const CapabilityInfo& capabilityInfo); -CapabilityInfo convert(const Set<Capability>& capabilitySet); +std::set<Capability> convert(const CapabilityInfo& capabilityInfo); +CapabilityInfo convert(const std::set<Capability>& capabilitySet); std::ostream& operator<<( @@ -192,11 +192,6 @@ std::ostream& operator<<( std::ostream& operator<<( std::ostream& stream, - const Set<Capability>& capabilities); - - -std::ostream& operator<<( - std::ostream& stream, const ProcessCapabilities& capabilities); } // namespace capabilities { http://git-wip-us.apache.org/repos/asf/mesos/blob/3e0ed792/src/log/log.cpp ---------------------------------------------------------------------- diff --git a/src/log/log.cpp b/src/log/log.cpp index be511d9..2301eef 100644 --- a/src/log/log.cpp +++ b/src/log/log.cpp @@ -94,7 +94,7 @@ LogProcess::LogProcess( timeout, znode, auth, - Set<UPID>((UPID) replica->pid()))), + {replica->pid()})), autoInitialize(_autoInitialize), group(new zookeeper::Group(servers, timeout, znode, auth)), metrics(*this, metricsPrefix) {} http://git-wip-us.apache.org/repos/asf/mesos/blob/3e0ed792/src/slave/containerizer/mesos/launch.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/launch.cpp b/src/slave/containerizer/mesos/launch.cpp index fc51e04..48ec370 100644 --- a/src/slave/containerizer/mesos/launch.cpp +++ b/src/slave/containerizer/mesos/launch.cpp @@ -21,6 +21,7 @@ #include <string.h> #include <iostream> +#include <set> #include <process/subprocess.hpp> @@ -42,6 +43,7 @@ using std::cerr; using std::cout; using std::endl; +using std::set; using std::string; using std::vector; @@ -436,7 +438,7 @@ int MesosContainerizerLaunch::execute() } // Set up requested capabilities. - Set<Capability> target = capabilities::convert(requestedCapabilities.get()); + set<Capability> target = capabilities::convert(requestedCapabilities.get()); capabilities->set(capabilities::EFFECTIVE, target); capabilities->set(capabilities::PERMITTED, target); http://git-wip-us.apache.org/repos/asf/mesos/blob/3e0ed792/src/tests/containerizer/capabilities_test_helper.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/capabilities_test_helper.cpp b/src/tests/containerizer/capabilities_test_helper.cpp index 4c617bf..2d7be6d 100644 --- a/src/tests/containerizer/capabilities_test_helper.cpp +++ b/src/tests/containerizer/capabilities_test_helper.cpp @@ -19,6 +19,7 @@ #include <string.h> #include <ostream> +#include <set> #include <string> #include <vector> @@ -37,6 +38,7 @@ namespace capabilities = mesos::internal::capabilities; using std::cerr; +using std::set; using std::endl; using std::string; using std::vector; @@ -122,7 +124,7 @@ int CapabilitiesTestHelper::execute() } } - Set<Capability> target = capabilities::convert(flags.capabilities.get()); + set<Capability> target = capabilities::convert(flags.capabilities.get()); capabilities->set(capabilities::EFFECTIVE, target); capabilities->set(capabilities::PERMITTED, target); http://git-wip-us.apache.org/repos/asf/mesos/blob/3e0ed792/src/tests/containerizer/capabilities_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/capabilities_tests.cpp b/src/tests/containerizer/capabilities_tests.cpp index 3ba4640..215b1c1 100644 --- a/src/tests/containerizer/capabilities_tests.cpp +++ b/src/tests/containerizer/capabilities_tests.cpp @@ -16,6 +16,7 @@ #include <errno.h> +#include <set> #include <string> #include <vector> @@ -32,6 +33,7 @@ #include "tests/containerizer/capabilities_test_helper.hpp" +using std::set; using std::string; using std::vector; @@ -55,7 +57,7 @@ class CapabilitiesTest : public ::testing::Test public: // Launch 'ping' using the given capabilities and user. Try<Subprocess> ping( - const Set<Capability>& capabilities, + const set<Capability>& capabilities, const Option<string>& user = None()) { CapabilitiesTestHelper helper; @@ -150,7 +152,7 @@ TEST_F(CapabilitiesTest, ROOT_PingWithNoNetRawCapsChangeUser) // that were specified in the file permitted set during 'exec'. TEST_F(CapabilitiesTest, ROOT_PingWithJustNetRawSysAdminCap) { - Set<Capability> capabilities = { + set<Capability> capabilities = { capabilities::NET_RAW, capabilities::NET_ADMIN };
