Repository: mesos Updated Branches: refs/heads/1.3.x 44e0fb949 -> ea246f505
Explicitly marked functions `override` in cgroup subsystems. This patch adds `override` keywords to functions overriding `virtual` base class functions. This explicitness helps in a subsequent patch in refactoring the `Subsystem` base class interface. Review: https://reviews.apache.org/r/66634/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0a57de02 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0a57de02 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0a57de02 Branch: refs/heads/1.3.x Commit: 0a57de02622f98c03932736ba91ae20994f1834a Parents: 44e0fb9 Author: Benjamin Bannier <benjamin.bann...@mesosphere.io> Authored: Fri May 11 00:54:20 2018 -0700 Committer: Gilbert Song <songzihao1...@gmail.com> Committed: Fri May 11 01:06:28 2018 -0700 ---------------------------------------------------------------------- .../isolators/cgroups/subsystems/blkio.hpp | 4 +-- .../mesos/isolators/cgroups/subsystems/cpu.hpp | 12 ++++----- .../isolators/cgroups/subsystems/cpuacct.hpp | 8 +++--- .../isolators/cgroups/subsystems/cpuset.hpp | 4 +-- .../isolators/cgroups/subsystems/devices.hpp | 16 +++++------ .../isolators/cgroups/subsystems/hugetlb.hpp | 4 +-- .../isolators/cgroups/subsystems/memory.hpp | 28 ++++++++++---------- .../isolators/cgroups/subsystems/net_cls.hpp | 24 ++++++++--------- .../isolators/cgroups/subsystems/net_prio.hpp | 4 +-- .../isolators/cgroups/subsystems/perf_event.hpp | 22 +++++++-------- .../mesos/isolators/cgroups/subsystems/pids.hpp | 4 +-- 11 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp index a2c575c..553928d 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp @@ -42,9 +42,9 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~BlkioSubsystem() {} + ~BlkioSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_BLKIO_NAME; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp index 282a761..01d14ab 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp @@ -42,21 +42,21 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~CpuSubsystem() {} + ~CpuSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_CPU_NAME; }; - virtual process::Future<Nothing> update( + process::Future<Nothing> update( const ContainerID& containerId, const std::string& cgroup, - const Resources& resources); + const Resources& resources) override; - virtual process::Future<ResourceStatistics> usage( + process::Future<ResourceStatistics> usage( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; private: CpuSubsystem(const Flags& flags, const std::string& hierarchy); http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp index e4977da..60d348c 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp @@ -42,16 +42,16 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~CpuacctSubsystem() {} + ~CpuacctSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_CPUACCT_NAME; } - virtual process::Future<ResourceStatistics> usage( + process::Future<ResourceStatistics> usage( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; private: CpuacctSubsystem(const Flags& flags, const std::string& hierarchy); http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp index b5d712a..1360d0f 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp @@ -42,9 +42,9 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~CpusetSubsystem() {} + ~CpusetSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_CPUSET_NAME; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp index 4ab224e..4f48ca0 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp @@ -46,24 +46,24 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~DevicesSubsystem() {} + ~DevicesSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_DEVICES_NAME; } - virtual process::Future<Nothing> prepare( + process::Future<Nothing> prepare( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> recover( + process::Future<Nothing> recover( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> cleanup( + process::Future<Nothing> cleanup( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; private: DevicesSubsystem( http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp index 2740713..98d50a6 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp @@ -42,9 +42,9 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~HugetlbSubsystem() {} + ~HugetlbSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_HUGETLB_NAME; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp index d79fda3..654ccb9 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp @@ -48,37 +48,37 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~MemorySubsystem() {} + ~MemorySubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_MEMORY_NAME; } - virtual process::Future<Nothing> prepare( + process::Future<Nothing> prepare( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> recover( + process::Future<Nothing> recover( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<mesos::slave::ContainerLimitation> watch( + process::Future<mesos::slave::ContainerLimitation> watch( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> update( + process::Future<Nothing> update( const ContainerID& containerId, const std::string& cgroup, - const Resources& resources); + const Resources& resources) override; - virtual process::Future<ResourceStatistics> usage( + process::Future<ResourceStatistics> usage( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> cleanup( + process::Future<Nothing> cleanup( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; private: struct Info http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp index bcaa161..be36659 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp @@ -137,33 +137,33 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~NetClsSubsystem() {} + ~NetClsSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_NET_CLS_NAME; } - virtual process::Future<Nothing> recover( + process::Future<Nothing> recover( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> prepare( + process::Future<Nothing> prepare( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> isolate( + process::Future<Nothing> isolate( const ContainerID& containerId, const std::string& cgroup, - pid_t pid); + pid_t pid) override; - virtual process::Future<ContainerStatus> status( + process::Future<ContainerStatus> status( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> cleanup( + process::Future<Nothing> cleanup( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; private: NetClsSubsystem( http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp index 002c689..e6bb83f 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp @@ -42,9 +42,9 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~NetPrioSubsystem() {} + ~NetPrioSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_NET_PRIO_NAME; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp index 14c0e79..a55cdef 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp @@ -48,31 +48,31 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~PerfEventSubsystem() {} + ~PerfEventSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_PERF_EVENT_NAME; } - virtual process::Future<Nothing> prepare( + process::Future<Nothing> prepare( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> recover( + process::Future<Nothing> recover( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<ResourceStatistics> usage( + process::Future<ResourceStatistics> usage( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; - virtual process::Future<Nothing> cleanup( + process::Future<Nothing> cleanup( const ContainerID& containerId, - const std::string& cgroup); + const std::string& cgroup) override; protected: - virtual void initialize(); + void initialize() override; private: PerfEventSubsystem( http://git-wip-us.apache.org/repos/asf/mesos/blob/0a57de02/src/slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp index cb6c919..e0f344d 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp @@ -42,9 +42,9 @@ public: const Flags& flags, const std::string& hierarchy); - virtual ~PidsSubsystem() {} + ~PidsSubsystem() override = default; - virtual std::string name() const + std::string name() const override { return CGROUP_SUBSYSTEM_PIDS_NAME; };
