You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jp...@apache.org on 2018/07/17 21:25:06 UTC
[2/7] mesos git commit: Apply the `override` keyword to libprocess.
Apply the `override` keyword to libprocess.
Review: https://reviews.apache.org/r/67867/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a51f0d66
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a51f0d66
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a51f0d66
Branch: refs/heads/master
Commit: a51f0d66a2c01b1f05550b44522f6a05e995e052
Parents: 5affcfd
Author: James Peach <jp...@apache.org>
Authored: Tue Jul 17 09:30:49 2018 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jul 17 14:23:01 2018 -0700
----------------------------------------------------------------------
3rdparty/libprocess/README.md | 2 +-
3rdparty/libprocess/examples/example.cpp | 4 ++--
3rdparty/libprocess/include/process/async.hpp | 2 +-
3rdparty/libprocess/include/process/collect.hpp | 8 ++++----
3rdparty/libprocess/include/process/event.hpp | 16 ++++++++--------
3rdparty/libprocess/include/process/filter.hpp | 8 ++++----
3rdparty/libprocess/include/process/firewall.hpp | 6 +++---
3rdparty/libprocess/include/process/gmock.hpp | 15 ++++++++-------
3rdparty/libprocess/include/process/grpc.hpp | 2 +-
3rdparty/libprocess/include/process/gtest.hpp | 2 +-
3rdparty/libprocess/include/process/help.hpp | 2 +-
3rdparty/libprocess/include/process/limiter.hpp | 2 +-
3rdparty/libprocess/include/process/logging.hpp | 4 ++--
.../libprocess/include/process/metrics/counter.hpp | 4 ++--
.../libprocess/include/process/metrics/metrics.hpp | 2 +-
.../include/process/metrics/pull_gauge.hpp | 4 ++--
.../include/process/metrics/push_gauge.hpp | 4 ++--
.../libprocess/include/process/metrics/timer.hpp | 2 +-
3rdparty/libprocess/include/process/process.hpp | 4 ++--
3rdparty/libprocess/include/process/profiler.hpp | 4 ++--
3rdparty/libprocess/include/process/protobuf.hpp | 4 ++--
3rdparty/libprocess/include/process/reap.hpp | 2 +-
3rdparty/libprocess/include/process/run.hpp | 2 +-
3rdparty/libprocess/include/process/sequence.hpp | 2 +-
3rdparty/libprocess/include/process/system.hpp | 6 +++---
3rdparty/libprocess/src/encoder.hpp | 16 ++++++++--------
3rdparty/libprocess/src/http.cpp | 6 +++---
3rdparty/libprocess/src/http_proxy.hpp | 2 +-
3rdparty/libprocess/src/memory_profiler.hpp | 4 ++--
3rdparty/libprocess/src/poll_socket.hpp | 16 ++++++++--------
3rdparty/libprocess/src/process.cpp | 6 +++---
3rdparty/libprocess/src/tests/benchmarks.cpp | 10 +++++-----
3rdparty/libprocess/src/tests/http_tests.cpp | 6 +++---
3rdparty/libprocess/src/tests/metrics_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/process_tests.cpp | 16 ++++++++--------
3rdparty/libprocess/src/tests/profiler_tests.cpp | 2 +-
36 files changed, 100 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/README.md
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/README.md b/3rdparty/libprocess/README.md
index 9846ece..f25914e 100644
--- a/3rdparty/libprocess/README.md
+++ b/3rdparty/libprocess/README.md
@@ -384,7 +384,7 @@ using namespace process::http;
class HttpProcess : public Process<HttpProcess>
{
protected:
- virtual void initialize()
+ void initialize() override
{
route("/testing", None(), [](const Request& request) {
return testing(request.query);
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/examples/example.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/examples/example.cpp b/3rdparty/libprocess/examples/example.cpp
index 0db2d03..3bbe209 100644
--- a/3rdparty/libprocess/examples/example.cpp
+++ b/3rdparty/libprocess/examples/example.cpp
@@ -31,7 +31,7 @@ class MyProcess : public Process<MyProcess>
{
public:
MyProcess(): ProcessBase("my-process") {}
- virtual ~MyProcess() {}
+ ~MyProcess() override {}
Future<int> func1()
{
@@ -66,7 +66,7 @@ public:
}
protected:
- virtual void initialize()
+ void initialize() override
{
// route("/vars", None(), &MyProcess::vars);
route("/vars", None(), [=](const Request& request) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/async.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/async.hpp b/3rdparty/libprocess/include/process/async.hpp
index 116c90c..a704bee 100644
--- a/3rdparty/libprocess/include/process/async.hpp
+++ b/3rdparty/libprocess/include/process/async.hpp
@@ -71,7 +71,7 @@ private:
friend class AsyncExecutor;
AsyncExecutorProcess() : ProcessBase(ID::generate("__async_executor__")) {}
- virtual ~AsyncExecutorProcess() {}
+ ~AsyncExecutorProcess() override {}
// Not copyable, not assignable.
AsyncExecutorProcess(const AsyncExecutorProcess&);
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/collect.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/collect.hpp b/3rdparty/libprocess/include/process/collect.hpp
index 5263f01..7318a4a 100644
--- a/3rdparty/libprocess/include/process/collect.hpp
+++ b/3rdparty/libprocess/include/process/collect.hpp
@@ -127,13 +127,13 @@ public:
promise(_promise),
ready(0) {}
- virtual ~CollectProcess()
+ ~CollectProcess() override
{
delete promise;
}
protected:
- virtual void initialize()
+ void initialize() override
{
// Stop this nonsense if nobody cares.
promise->future().onDiscard(defer(this, &CollectProcess::discarded));
@@ -210,12 +210,12 @@ public:
promise(_promise),
ready(0) {}
- virtual ~AwaitProcess()
+ ~AwaitProcess() override
{
delete promise;
}
- virtual void initialize()
+ void initialize() override
{
// Stop this nonsense if nobody cares.
promise->future().onDiscard(defer(this, &AwaitProcess::discarded));
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/event.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/event.hpp b/3rdparty/libprocess/include/process/event.hpp
index ec64eb7..d96db74 100644
--- a/3rdparty/libprocess/include/process/event.hpp
+++ b/3rdparty/libprocess/include/process/event.hpp
@@ -71,7 +71,7 @@ struct Event
struct IsVisitor : EventVisitor
{
explicit IsVisitor(bool* _result) : result(_result) {}
- virtual void visit(const T&) { *result = true; }
+ void visit(const T&) override { *result = true; }
bool* result;
} visitor(&result);
visit(&visitor);
@@ -85,7 +85,7 @@ struct Event
struct AsVisitor : EventVisitor
{
explicit AsVisitor(const T** _result) : result(_result) {}
- virtual void visit(const T& t) { *result = &t; }
+ void visit(const T& t) override { *result = &t; }
const T** result;
} visitor(&result);
visit(&visitor);
@@ -152,7 +152,7 @@ struct HttpEvent : Event
HttpEvent& operator=(HttpEvent&&) = default;
HttpEvent& operator=(const HttpEvent&) = delete;
- virtual ~HttpEvent()
+ ~HttpEvent() override
{
if (response) {
// Fail the response in case it wasn't set.
@@ -268,7 +268,7 @@ inline Event::operator JSON::Object() const
{
explicit Visitor(JSON::Object* _object) : object(_object) {}
- virtual void visit(const MessageEvent& event)
+ void visit(const MessageEvent& event) override
{
object->values["type"] = "MESSAGE";
@@ -280,7 +280,7 @@ inline Event::operator JSON::Object() const
object->values["body"] = message.body;
}
- virtual void visit(const HttpEvent& event)
+ void visit(const HttpEvent& event) override
{
object->values["type"] = "HTTP";
@@ -290,17 +290,17 @@ inline Event::operator JSON::Object() const
object->values["url"] = stringify(request.url);
}
- virtual void visit(const DispatchEvent& event)
+ void visit(const DispatchEvent& event) override
{
object->values["type"] = "DISPATCH";
}
- virtual void visit(const ExitedEvent& event)
+ void visit(const ExitedEvent& event) override
{
object->values["type"] = "EXITED";
}
- virtual void visit(const TerminateEvent& event)
+ void visit(const TerminateEvent& event) override
{
object->values["type"] = "TERMINATE";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/filter.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/filter.hpp b/3rdparty/libprocess/include/process/filter.hpp
index 3f4a827..79a1917 100644
--- a/3rdparty/libprocess/include/process/filter.hpp
+++ b/3rdparty/libprocess/include/process/filter.hpp
@@ -33,22 +33,22 @@ public:
explicit FilterVisitor(Filter* _filter, bool* _result)
: filter(_filter), result(_result) {}
- virtual void visit(const MessageEvent& event)
+ void visit(const MessageEvent& event) override
{
*result = filter->filter(event);
}
- virtual void visit(const DispatchEvent& event)
+ void visit(const DispatchEvent& event) override
{
*result = filter->filter(event);
}
- virtual void visit(const HttpEvent& event)
+ void visit(const HttpEvent& event) override
{
*result = filter->filter(event);
}
- virtual void visit(const ExitedEvent& event)
+ void visit(const ExitedEvent& event) override
{
*result = filter->filter(event);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/firewall.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/firewall.hpp b/3rdparty/libprocess/include/process/firewall.hpp
index 0a7b985..c0f48aa 100644
--- a/3rdparty/libprocess/include/process/firewall.hpp
+++ b/3rdparty/libprocess/include/process/firewall.hpp
@@ -72,11 +72,11 @@ class DisabledEndpointsFirewallRule : public FirewallRule
public:
explicit DisabledEndpointsFirewallRule(const hashset<std::string>& _paths);
- virtual ~DisabledEndpointsFirewallRule() {}
+ ~DisabledEndpointsFirewallRule() override {}
- virtual Option<http::Response> apply(
+ Option<http::Response> apply(
const network::inet::Socket&,
- const http::Request& request)
+ const http::Request& request) override
{
if (paths.contains(request.url.path)) {
return http::Forbidden("Endpoint '" + request.url.path + "' is disabled");
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/gmock.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/gmock.hpp b/3rdparty/libprocess/include/process/gmock.hpp
index b5ead1c..e30f586 100644
--- a/3rdparty/libprocess/include/process/gmock.hpp
+++ b/3rdparty/libprocess/include/process/gmock.hpp
@@ -193,8 +193,9 @@ private:
*future = promise.future();
}
- virtual typename ::testing::ActionInterface<F>::Result Perform(
+ typename ::testing::ActionInterface<F>::Result Perform(
const typename ::testing::ActionInterface<F>::ArgumentTuple& args)
+ override
{
const typename ::testing::ActionInterface<F>::Result result =
action.Perform(args);
@@ -258,10 +259,10 @@ class TestsFilter : public Filter
public:
TestsFilter() = default;
- virtual bool filter(const MessageEvent& event) { return handle(event); }
- virtual bool filter(const DispatchEvent& event) { return handle(event); }
- virtual bool filter(const HttpEvent& event) { return handle(event); }
- virtual bool filter(const ExitedEvent& event) { return handle(event); }
+ bool filter(const MessageEvent& event) override { return handle(event); }
+ bool filter(const DispatchEvent& event) override { return handle(event); }
+ bool filter(const HttpEvent& event) override { return handle(event); }
+ bool filter(const ExitedEvent& event) override { return handle(event); }
template <typename T>
bool handle(const T& t)
@@ -316,12 +317,12 @@ public:
return filter;
}
- virtual void OnTestProgramStart(const ::testing::UnitTest&)
+ void OnTestProgramStart(const ::testing::UnitTest&) override
{
started = true;
}
- virtual void OnTestEnd(const ::testing::TestInfo&)
+ void OnTestEnd(const ::testing::TestInfo&) override
{
if (filter != nullptr) {
// Remove the filter in libprocess _before_ deleting.
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/grpc.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/grpc.hpp b/3rdparty/libprocess/include/process/grpc.hpp
index bdafeb3..28a854f 100644
--- a/3rdparty/libprocess/include/process/grpc.hpp
+++ b/3rdparty/libprocess/include/process/grpc.hpp
@@ -275,7 +275,7 @@ private:
{
public:
RuntimeProcess();
- virtual ~RuntimeProcess();
+ ~RuntimeProcess() override;
void send(SendCallback callback);
void receive(ReceiveCallback callback);
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/gtest.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/gtest.hpp b/3rdparty/libprocess/include/process/gtest.hpp
index 79ea2b1..fd4de8a 100644
--- a/3rdparty/libprocess/include/process/gtest.hpp
+++ b/3rdparty/libprocess/include/process/gtest.hpp
@@ -48,7 +48,7 @@ public:
return listener;
}
- virtual void OnTestEnd(const ::testing::TestInfo&)
+ void OnTestEnd(const ::testing::TestInfo&) override
{
if (process::Clock::paused()) {
process::Clock::resume();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/help.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/help.hpp b/3rdparty/libprocess/include/process/help.hpp
index 3393b71..5208458 100644
--- a/3rdparty/libprocess/include/process/help.hpp
+++ b/3rdparty/libprocess/include/process/help.hpp
@@ -135,7 +135,7 @@ public:
friend void json(JSON::ObjectWriter* writer, const Help& help);
protected:
- virtual void initialize();
+ void initialize() override;
private:
// Handles the following:
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/limiter.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/limiter.hpp b/3rdparty/libprocess/include/process/limiter.hpp
index b4b6a7b..2e9e380 100644
--- a/3rdparty/libprocess/include/process/limiter.hpp
+++ b/3rdparty/libprocess/include/process/limiter.hpp
@@ -77,7 +77,7 @@ public:
CHECK_GT(permitsPerSecond, 0);
}
- virtual void finalize()
+ void finalize() override
{
foreach (Promise<Nothing>* promise, promises) {
promise->discard();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/logging.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/logging.hpp b/3rdparty/libprocess/include/process/logging.hpp
index aad7ce8..b145244 100644
--- a/3rdparty/libprocess/include/process/logging.hpp
+++ b/3rdparty/libprocess/include/process/logging.hpp
@@ -37,12 +37,12 @@ public:
CHECK(sizeof(FLAGS_v) == sizeof(int32_t));
}
- virtual ~Logging() {}
+ ~Logging() override {}
Future<Nothing> set_level(int level, const Duration& duration);
protected:
- virtual void initialize()
+ void initialize() override
{
route("/toggle", authenticationRealm, TOGGLE_HELP(), &This::toggle);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/metrics/counter.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/counter.hpp b/3rdparty/libprocess/include/process/metrics/counter.hpp
index 15aeeb5..f532d8b 100644
--- a/3rdparty/libprocess/include/process/metrics/counter.hpp
+++ b/3rdparty/libprocess/include/process/metrics/counter.hpp
@@ -36,9 +36,9 @@ public:
push(static_cast<double>(data->value.load()));
}
- virtual ~Counter() {}
+ ~Counter() override {}
- virtual Future<double> value() const
+ Future<double> value() const override
{
return static_cast<double>(data->value.load());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/metrics/metrics.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/metrics.hpp b/3rdparty/libprocess/include/process/metrics/metrics.hpp
index 3dc6bbf..75711ed 100644
--- a/3rdparty/libprocess/include/process/metrics/metrics.hpp
+++ b/3rdparty/libprocess/include/process/metrics/metrics.hpp
@@ -45,7 +45,7 @@ public:
const Option<Duration>& timeout);
protected:
- virtual void initialize();
+ void initialize() override;
private:
static std::string help();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/metrics/pull_gauge.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/pull_gauge.hpp b/3rdparty/libprocess/include/process/metrics/pull_gauge.hpp
index 5c2a227..aa9b463 100644
--- a/3rdparty/libprocess/include/process/metrics/pull_gauge.hpp
+++ b/3rdparty/libprocess/include/process/metrics/pull_gauge.hpp
@@ -56,9 +56,9 @@ public:
PullGauge(const std::string& name, const std::function<Future<double>()>& f)
: Metric(name, None()), data(new Data(f)) {}
- virtual ~PullGauge() {}
+ ~PullGauge() override {}
- virtual Future<double> value() const { return data->f(); }
+ Future<double> value() const override { return data->f(); }
private:
struct Data
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/metrics/push_gauge.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/push_gauge.hpp b/3rdparty/libprocess/include/process/metrics/push_gauge.hpp
index 5c39846..0dd2c20 100644
--- a/3rdparty/libprocess/include/process/metrics/push_gauge.hpp
+++ b/3rdparty/libprocess/include/process/metrics/push_gauge.hpp
@@ -51,9 +51,9 @@ public:
explicit PushGauge(const std::string& name)
: Metric(name, None()), data(new Data()) {}
- virtual ~PushGauge() {}
+ ~PushGauge() override {}
- virtual Future<double> value() const
+ Future<double> value() const override
{
return static_cast<double>(data->value.load());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/metrics/timer.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/timer.hpp b/3rdparty/libprocess/include/process/metrics/timer.hpp
index 0a9c022..8d91c0c 100644
--- a/3rdparty/libprocess/include/process/metrics/timer.hpp
+++ b/3rdparty/libprocess/include/process/metrics/timer.hpp
@@ -42,7 +42,7 @@ public:
: Metric(name + "_" + T::units(), window),
data(new Data()) {}
- Future<double> value() const
+ Future<double> value() const override
{
Future<double> value;
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/process.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/process.hpp b/3rdparty/libprocess/include/process/process.hpp
index c36df99..7c255ac 100644
--- a/3rdparty/libprocess/include/process/process.hpp
+++ b/3rdparty/libprocess/include/process/process.hpp
@@ -74,7 +74,7 @@ class ProcessBase : public EventConsumer
public:
explicit ProcessBase(const std::string& id = "");
- virtual ~ProcessBase();
+ ~ProcessBase() override;
const UPID& self() const { return pid; }
@@ -500,7 +500,7 @@ private:
template <typename T>
class Process : public virtual ProcessBase {
public:
- virtual ~Process() {}
+ ~Process() override {}
/**
* Returns the `PID` of the process.
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/profiler.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/profiler.hpp b/3rdparty/libprocess/include/process/profiler.hpp
index 74890ae..48375b4 100644
--- a/3rdparty/libprocess/include/process/profiler.hpp
+++ b/3rdparty/libprocess/include/process/profiler.hpp
@@ -28,10 +28,10 @@ public:
: ProcessBase("profiler"),
authenticationRealm(_authenticationRealm) {}
- virtual ~Profiler() {}
+ ~Profiler() override {}
protected:
- virtual void initialize()
+ void initialize() override
{
route("/start",
authenticationRealm,
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/protobuf.hpp b/3rdparty/libprocess/include/process/protobuf.hpp
index 5a75a83..45ac3aa 100644
--- a/3rdparty/libprocess/include/process/protobuf.hpp
+++ b/3rdparty/libprocess/include/process/protobuf.hpp
@@ -100,7 +100,7 @@ template <typename T>
class ProtobufProcess : public process::Process<T>
{
public:
- virtual ~ProtobufProcess() {}
+ ~ProtobufProcess() override {}
protected:
void consume(process::MessageEvent&& event) override
@@ -413,7 +413,7 @@ public:
install<Res>(&ReqResProcess<Req, Res>::response);
}
- virtual ~ReqResProcess()
+ ~ReqResProcess() override
{
// Discard the promise.
promise.discard();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/reap.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/reap.hpp b/3rdparty/libprocess/include/process/reap.hpp
index 628bc0a..ac72186 100644
--- a/3rdparty/libprocess/include/process/reap.hpp
+++ b/3rdparty/libprocess/include/process/reap.hpp
@@ -38,7 +38,7 @@ public:
Future<Option<int>> reap(pid_t pid);
protected:
- virtual void initialize();
+ void initialize() override;
void wait();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/run.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/run.hpp b/3rdparty/libprocess/include/process/run.hpp
index 0d282c9..e0bb2ee 100644
--- a/3rdparty/libprocess/include/process/run.hpp
+++ b/3rdparty/libprocess/include/process/run.hpp
@@ -35,7 +35,7 @@ public:
thunk(_thunk),
promise(_promise) {}
- virtual ~ThunkProcess() {}
+ ~ThunkProcess() override {}
protected:
void serve(Event&& event) override
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/sequence.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/sequence.hpp b/3rdparty/libprocess/include/process/sequence.hpp
index 24712b1..797d1f2 100644
--- a/3rdparty/libprocess/include/process/sequence.hpp
+++ b/3rdparty/libprocess/include/process/sequence.hpp
@@ -140,7 +140,7 @@ public:
}
protected:
- virtual void finalize()
+ void finalize() override
{
last.discard();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/include/process/system.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/system.hpp b/3rdparty/libprocess/include/process/system.hpp
index 81ded8a..8f32c9a 100644
--- a/3rdparty/libprocess/include/process/system.hpp
+++ b/3rdparty/libprocess/include/process/system.hpp
@@ -54,10 +54,10 @@ public:
self().id + "/mem_free_bytes",
defer(self(), &System::_mem_free_bytes)) {}
- virtual ~System() {}
+ ~System() override {}
protected:
- virtual void initialize()
+ void initialize() override
{
// TODO(dhamon): Check return values.
metrics::add(load_1min);
@@ -70,7 +70,7 @@ protected:
route("/stats.json", statsHelp(), &System::stats);
}
- virtual void finalize()
+ void finalize() override
{
metrics::remove(load_1min);
metrics::remove(load_5min);
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/encoder.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/encoder.hpp b/3rdparty/libprocess/src/encoder.hpp
index 70b5ec4..963a4ff 100644
--- a/3rdparty/libprocess/src/encoder.hpp
+++ b/3rdparty/libprocess/src/encoder.hpp
@@ -65,9 +65,9 @@ public:
DataEncoder(const std::string& _data)
: data(_data), index(0) {}
- virtual ~DataEncoder() {}
+ ~DataEncoder() override {}
- virtual Kind kind() const
+ Kind kind() const override
{
return Encoder::DATA;
}
@@ -80,14 +80,14 @@ public:
return data.data() + temp;
}
- virtual void backup(size_t length)
+ void backup(size_t length) override
{
if (index >= length) {
index -= length;
}
}
- virtual size_t remaining() const
+ size_t remaining() const override
{
return data.size() - index;
}
@@ -243,12 +243,12 @@ public:
CHECK_LE(_size, static_cast<size_t>(std::numeric_limits<off_t>::max()));
}
- virtual ~FileEncoder()
+ ~FileEncoder() override
{
CHECK_SOME(os::close(fd)) << "Failed to close file descriptor";
}
- virtual Kind kind() const
+ Kind kind() const override
{
return Encoder::FILE;
}
@@ -262,14 +262,14 @@ public:
return fd;
}
- virtual void backup(size_t length)
+ void backup(size_t length) override
{
if (index >= static_cast<off_t>(length)) {
index -= static_cast<off_t>(length);
}
}
- virtual size_t remaining() const
+ size_t remaining() const override
{
return static_cast<size_t>(size - index);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/http.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp
index dc38716..cbb9102 100644
--- a/3rdparty/libprocess/src/http.cpp
+++ b/3rdparty/libprocess/src/http.cpp
@@ -1214,7 +1214,7 @@ public:
}
protected:
- virtual void initialize()
+ void initialize() override
{
// Start the read loop on the socket. We read independently
// of the requests being sent in order to detect socket
@@ -1222,7 +1222,7 @@ protected:
read();
}
- virtual void finalize()
+ void finalize() override
{
disconnect("Connection object was destructed");
}
@@ -2138,7 +2138,7 @@ public:
}
protected:
- virtual void finalize()
+ void finalize() override
{
// If we started the accept loop then discard it and any clients
// we are already serving.
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/http_proxy.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http_proxy.hpp b/3rdparty/libprocess/src/http_proxy.hpp
index 5b6e7e8..bf55c2f 100644
--- a/3rdparty/libprocess/src/http_proxy.hpp
+++ b/3rdparty/libprocess/src/http_proxy.hpp
@@ -38,7 +38,7 @@ class HttpProxy : public Process<HttpProxy>
public:
explicit HttpProxy(const network::inet::Socket& _socket);
- virtual ~HttpProxy() {}
+ ~HttpProxy() override {}
// Enqueues the response to be sent once all previously enqueued
// responses have been processed (e.g., waited for and sent).
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/memory_profiler.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/memory_profiler.hpp b/3rdparty/libprocess/src/memory_profiler.hpp
index 617f8de..b5d88b0 100644
--- a/3rdparty/libprocess/src/memory_profiler.hpp
+++ b/3rdparty/libprocess/src/memory_profiler.hpp
@@ -39,10 +39,10 @@ class MemoryProfiler : public Process<MemoryProfiler>
{
public:
MemoryProfiler(const Option<std::string>& authenticationRealm);
- virtual ~MemoryProfiler() {}
+ ~MemoryProfiler() override {}
protected:
- virtual void initialize();
+ void initialize() override;
private:
static const std::string START_HELP();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/poll_socket.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/poll_socket.hpp b/3rdparty/libprocess/src/poll_socket.hpp
index eebd718..15b7902 100644
--- a/3rdparty/libprocess/src/poll_socket.hpp
+++ b/3rdparty/libprocess/src/poll_socket.hpp
@@ -27,16 +27,16 @@ public:
PollSocketImpl(int_fd s) : SocketImpl(s) {}
- virtual ~PollSocketImpl() {}
+ ~PollSocketImpl() override {}
// Implementation of the SocketImpl interface.
- virtual Try<Nothing> listen(int backlog);
- virtual Future<std::shared_ptr<SocketImpl>> accept();
- virtual Future<Nothing> connect(const Address& address);
- virtual Future<size_t> recv(char* data, size_t size);
- virtual Future<size_t> send(const char* data, size_t size);
- virtual Future<size_t> sendfile(int_fd fd, off_t offset, size_t size);
- virtual Kind kind() const { return SocketImpl::Kind::POLL; }
+ Try<Nothing> listen(int backlog) override;
+ Future<std::shared_ptr<SocketImpl>> accept() override;
+ Future<Nothing> connect(const Address& address) override;
+ Future<size_t> recv(char* data, size_t size) override;
+ Future<size_t> send(const char* data, size_t size) override;
+ Future<size_t> sendfile(int_fd fd, off_t offset, size_t size) override;
+ Kind kind() const override { return SocketImpl::Kind::POLL; }
};
} // namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index b3bd028..7c0a0bc 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -328,7 +328,7 @@ private:
handler(_handler) {}
protected:
- virtual void initialize()
+ void initialize() override
{
route("/", help, &RouteProcess::handle);
}
@@ -3906,7 +3906,7 @@ public:
duration(_duration),
waited(_waited) {}
- virtual void initialize()
+ void initialize() override
{
VLOG(3) << "Running waiter process for " << pid;
link(pid);
@@ -3914,7 +3914,7 @@ public:
}
private:
- virtual void exited(const UPID&)
+ void exited(const UPID&) override
{
VLOG(3) << "Waiter process waited for " << pid;
*waited = true;
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/tests/benchmarks.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/benchmarks.cpp b/3rdparty/libprocess/src/tests/benchmarks.cpp
index e63f116..aed90ed 100644
--- a/3rdparty/libprocess/src/tests/benchmarks.cpp
+++ b/3rdparty/libprocess/src/tests/benchmarks.cpp
@@ -93,10 +93,10 @@ public:
totalRequests(0),
concurrency(0) {}
- virtual ~ClientProcess() {}
+ ~ClientProcess() override {}
protected:
- virtual void initialize()
+ void initialize() override
{
install("pong", &ClientProcess::pong);
@@ -206,10 +206,10 @@ private:
class ServerProcess : public Process<ServerProcess>
{
public:
- virtual ~ServerProcess() {}
+ ~ServerProcess() override {}
protected:
- virtual void initialize()
+ void initialize() override
{
// TODO(bmahler): Move in the message when move support is added.
install("ping", &ServerProcess::ping);
@@ -306,7 +306,7 @@ class LinkerProcess : public Process<LinkerProcess>
public:
LinkerProcess(const UPID& _to) : to(_to) {}
- virtual void initialize()
+ void initialize() override
{
link(to);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index 5429034..acbd697 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -127,7 +127,7 @@ public:
Future<http::Response>(const http::Request&, const Option<Principal>&));
protected:
- virtual void initialize()
+ void initialize() override
{
route("/body", None(), &HttpProcess::body);
route("/pipe", None(), &HttpProcess::pipe);
@@ -1786,7 +1786,7 @@ public:
authenticate,
Future<AuthenticationResult>(const http::Request&));
- virtual string scheme() const { return "Basic"; }
+ string scheme() const override { return "Basic"; }
};
@@ -1802,7 +1802,7 @@ protected:
return authentication::setAuthenticator(realm, authenticator);
}
- virtual void TearDown()
+ void TearDown() override
{
foreach (const string& realm, realms) {
// We need to wait in order to ensure that the operation
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/metrics_tests.cpp b/3rdparty/libprocess/src/tests/metrics_tests.cpp
index a5b41ed..8590bdb 100644
--- a/3rdparty/libprocess/src/tests/metrics_tests.cpp
+++ b/3rdparty/libprocess/src/tests/metrics_tests.cpp
@@ -103,7 +103,7 @@ protected:
return authentication::setAuthenticator(realm, authenticator);
}
- virtual void TearDown()
+ void TearDown() override
{
foreach (const string& realm, realms) {
// We need to wait in order to ensure that the operation
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/tests/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp
index 2f8a823..8baf60d 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -701,7 +701,7 @@ class ExitedProcess : public Process<ExitedProcess>
public:
explicit ExitedProcess(const UPID& _pid) : pid(_pid) {}
- virtual void initialize()
+ void initialize() override
{
link(pid);
}
@@ -763,7 +763,7 @@ public:
// This is a workaround for mocking methods taking
// rvalue reference parameters.
// See https://github.com/google/googletest/issues/395
- void consume(MessageEvent&& event) { consume_(event.message); }
+ void consume(MessageEvent&& event) override { consume_(event.message); }
MOCK_METHOD1(consume_, void(const Message&));
};
@@ -771,7 +771,7 @@ public:
class ProcessRemoteLinkTest : public ::testing::Test
{
protected:
- virtual void SetUp()
+ void SetUp() override
{
// Spawn a process to coordinate with the subprocess (test-linkee).
// The `test-linkee` will send us a message when it has finished
@@ -820,7 +820,7 @@ protected:
}
}
- virtual void TearDown()
+ void TearDown() override
{
if (linkee.isSome()) {
os::killtree(linkee->pid(), SIGKILL);
@@ -1156,7 +1156,7 @@ class SettleProcess : public Process<SettleProcess>
public:
SettleProcess() : calledDispatch(false) {}
- virtual void initialize()
+ void initialize() override
{
os::sleep(Milliseconds(10));
delay(Seconds(0), self(), &SettleProcess::afterDelay);
@@ -1586,7 +1586,7 @@ public:
explicit FileServer(const string& _path)
: path(_path) {}
- virtual void initialize()
+ void initialize() override
{
provide("", path);
}
@@ -1785,7 +1785,7 @@ public:
PercentEncodedIDProcess()
: ProcessBase("id(42)") {}
- virtual void initialize()
+ void initialize() override
{
install("handler1", &Self::handler1);
route("/handler2", None(), &Self::handler2);
@@ -1856,7 +1856,7 @@ public:
explicit HTTPEndpointProcess(const string& id)
: ProcessBase(id) {}
- virtual void initialize()
+ void initialize() override
{
route(
"/handler1",
http://git-wip-us.apache.org/repos/asf/mesos/blob/a51f0d66/3rdparty/libprocess/src/tests/profiler_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/profiler_tests.cpp b/3rdparty/libprocess/src/tests/profiler_tests.cpp
index 995bd02..43e6af9 100644
--- a/3rdparty/libprocess/src/tests/profiler_tests.cpp
+++ b/3rdparty/libprocess/src/tests/profiler_tests.cpp
@@ -55,7 +55,7 @@ protected:
return authentication::setAuthenticator(realm, authenticator);
}
- virtual void TearDown()
+ void TearDown() override
{
foreach (const string& realm, realms) {
// We need to wait in order to ensure that the operation