aboutsummaryrefslogtreecommitdiffstats
path: root/vbench
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:22 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:22 +0200
commitd2742abc70129050b3ed28f1b7cb7a3e098f6da8 (patch)
tree346f391758bf89c7eb52919cf5f62d696942ab8a /vbench
parent3b12afea60df4bd9514f5d4195b9d018e307e9d0 (diff)
add override in vbench module
Diffstat (limited to 'vbench')
-rw-r--r--vbench/src/apps/dumpurl/dumpurl.cpp8
-rw-r--r--vbench/src/apps/vbench/vbench.cpp2
-rw-r--r--vbench/src/tests/dispatcher/dispatcher_test.cpp4
-rw-r--r--vbench/src/tests/handler_thread/handler_thread_test.cpp2
-rw-r--r--vbench/src/tests/socket/socket_test.cpp4
-rw-r--r--vbench/src/vbench/core/input_file_reader.h2
-rw-r--r--vbench/src/vbench/core/socket.h12
-rw-r--r--vbench/src/vbench/core/taintable.cpp2
-rw-r--r--vbench/src/vbench/http/benchmark_headers.cpp2
-rw-r--r--vbench/src/vbench/test/request_receptor.h2
-rw-r--r--vbench/src/vbench/test/simple_http_result_handler.h6
-rw-r--r--vbench/src/vbench/vbench/dropped_tagger.h2
-rw-r--r--vbench/src/vbench/vbench/ignore_before.h4
-rw-r--r--vbench/src/vbench/vbench/latency_analyzer.h4
-rw-r--r--vbench/src/vbench/vbench/qps_analyzer.h4
-rw-r--r--vbench/src/vbench/vbench/qps_tagger.h2
-rw-r--r--vbench/src/vbench/vbench/request.h6
-rw-r--r--vbench/src/vbench/vbench/request_dumper.h4
-rw-r--r--vbench/src/vbench/vbench/request_generator.h6
-rw-r--r--vbench/src/vbench/vbench/request_scheduler.h10
-rw-r--r--vbench/src/vbench/vbench/request_sink.h4
-rw-r--r--vbench/src/vbench/vbench/server_tagger.h2
-rw-r--r--vbench/src/vbench/vbench/vbench.h4
-rw-r--r--vbench/src/vbench/vbench/worker.h4
24 files changed, 51 insertions, 51 deletions
diff --git a/vbench/src/apps/dumpurl/dumpurl.cpp b/vbench/src/apps/dumpurl/dumpurl.cpp
index a3bbc9be714..706dd061763 100644
--- a/vbench/src/apps/dumpurl/dumpurl.cpp
+++ b/vbench/src/apps/dumpurl/dumpurl.cpp
@@ -9,18 +9,18 @@ using namespace vbench;
class App : public FastOS_Application
{
public:
- int Main();
+ int Main() override;
};
struct MyHttpHandler : public HttpResultHandler {
- virtual void handleHeader(const string &name, const string &value) {
+ virtual void handleHeader(const string &name, const string &value) override {
fprintf(stderr, "got header: '%s': '%s'\n", name.c_str(), value.c_str());
}
- virtual void handleContent(const Memory &data) {
+ virtual void handleContent(const Memory &data) override {
fprintf(stderr, "got data: %zu bytes\n", data.size);
fwrite(data.data, 1, data.size, stdout);
}
- virtual void handleFailure(const string &reason) {
+ virtual void handleFailure(const string &reason) override {
fprintf(stderr, "got FAILURE: '%s'\n", reason.c_str());
}
};
diff --git a/vbench/src/apps/vbench/vbench.cpp b/vbench/src/apps/vbench/vbench.cpp
index a2dca88f7d5..32af3d70c3d 100644
--- a/vbench/src/apps/vbench/vbench.cpp
+++ b/vbench/src/apps/vbench/vbench.cpp
@@ -17,7 +17,7 @@ typedef vespalib::SignalHandler SIG;
struct NotifyDone : public vespalib::Runnable {
vespalib::Gate &done;
NotifyDone(vespalib::Gate &d) : done(d) {}
- virtual void run() {
+ virtual void run() override {
done.countDown();
}
};
diff --git a/vbench/src/tests/dispatcher/dispatcher_test.cpp b/vbench/src/tests/dispatcher/dispatcher_test.cpp
index b4afafdaed5..284f7c55d8a 100644
--- a/vbench/src/tests/dispatcher/dispatcher_test.cpp
+++ b/vbench/src/tests/dispatcher/dispatcher_test.cpp
@@ -7,14 +7,14 @@ using namespace vbench;
struct MyHandler : public Handler<int> {
int value;
MyHandler() : value(-1) {}
- virtual void handle(std::unique_ptr<int> v) { value = (v.get() != 0) ? *v : 0; }
+ virtual void handle(std::unique_ptr<int> v) override { value = (v.get() != 0) ? *v : 0; }
};
struct Fetcher : public vespalib::Runnable {
Provider<int> &provider;
Handler<int> &handler;
Fetcher(Provider<int> &p, Handler<int> &h) : provider(p), handler(h) {}
- virtual void run() { handler.handle(provider.provide()); }
+ virtual void run() override { handler.handle(provider.provide()); }
};
TEST("dispatcher") {
diff --git a/vbench/src/tests/handler_thread/handler_thread_test.cpp b/vbench/src/tests/handler_thread/handler_thread_test.cpp
index 43f0c4d4a1b..a21bda82b6a 100644
--- a/vbench/src/tests/handler_thread/handler_thread_test.cpp
+++ b/vbench/src/tests/handler_thread/handler_thread_test.cpp
@@ -6,7 +6,7 @@ using namespace vbench;
struct MyHandler : Handler<int> {
std::vector<int> values;
- virtual void handle(std::unique_ptr<int> value) {
+ virtual void handle(std::unique_ptr<int> value) override {
values.push_back(*value);
vespalib::Thread::sleep(10); // for improved coverage
}
diff --git a/vbench/src/tests/socket/socket_test.cpp b/vbench/src/tests/socket/socket_test.cpp
index 02d4caed507..21c410f382e 100644
--- a/vbench/src/tests/socket/socket_test.cpp
+++ b/vbench/src/tests/socket/socket_test.cpp
@@ -34,7 +34,7 @@ struct Agent {
struct Client : public Agent, public vespalib::Runnable {
Client(Stream::UP s) : Agent(std::move(s)) {}
- virtual void run() {
+ virtual void run() override {
TEST_THREAD("client");
write("client-");
read("server-");
@@ -43,7 +43,7 @@ struct Client : public Agent, public vespalib::Runnable {
struct Server : public Agent, public vespalib::Runnable {
Server(Stream::UP s) : Agent(std::move(s)) {}
- virtual void run() {
+ virtual void run() override {
TEST_THREAD("server");
read("client-");
write("server-");
diff --git a/vbench/src/vbench/core/input_file_reader.h b/vbench/src/vbench/core/input_file_reader.h
index 79562fc0f43..410f0819d3b 100644
--- a/vbench/src/vbench/core/input_file_reader.h
+++ b/vbench/src/vbench/core/input_file_reader.h
@@ -34,7 +34,7 @@ public:
**/
bool readLine(string &dst);
- virtual const Taint &tainted() const { return _taint; }
+ virtual const Taint &tainted() const override { return _taint; }
};
} // namespace vbench
diff --git a/vbench/src/vbench/core/socket.h b/vbench/src/vbench/core/socket.h
index 358db8ead67..092a28952f4 100644
--- a/vbench/src/vbench/core/socket.h
+++ b/vbench/src/vbench/core/socket.h
@@ -30,12 +30,12 @@ public:
Socket(std::unique_ptr<FastOS_SocketInterface> socket);
Socket(const string host, int port);
virtual ~Socket();
- virtual bool eof() const { return _eof; }
- virtual Memory obtain();
- virtual Input &evict(size_t bytes);
- virtual WritableMemory reserve(size_t bytes);
- virtual Output &commit(size_t bytes);
- virtual const Taint &tainted() const { return _taint; }
+ virtual bool eof() const override { return _eof; }
+ virtual Memory obtain() override;
+ virtual Input &evict(size_t bytes) override;
+ virtual WritableMemory reserve(size_t bytes) override;
+ virtual Output &commit(size_t bytes) override;
+ virtual const Taint &tainted() const override { return _taint; }
};
} // namespace vbench
diff --git a/vbench/src/vbench/core/taintable.cpp b/vbench/src/vbench/core/taintable.cpp
index 5409379e02c..23e2745999a 100644
--- a/vbench/src/vbench/core/taintable.cpp
+++ b/vbench/src/vbench/core/taintable.cpp
@@ -9,7 +9,7 @@ namespace {
struct Untaintable : Taintable {
Taint taint;
- virtual const Taint &tainted() const { return taint; }
+ virtual const Taint &tainted() const override { return taint; }
virtual ~Untaintable() {}
};
diff --git a/vbench/src/vbench/http/benchmark_headers.cpp b/vbench/src/vbench/http/benchmark_headers.cpp
index df96f6a9dc7..e4bea82023d 100644
--- a/vbench/src/vbench/http/benchmark_headers.cpp
+++ b/vbench/src/vbench/http/benchmark_headers.cpp
@@ -77,7 +77,7 @@ BenchmarkHeaders::toString() const
struct HeaderToString : benchmark_headers::HeaderTraverser {
string &str;
HeaderToString(string &s) : str(s) {}
- virtual void header(const string &name, double value) {
+ virtual void header(const string &name, double value) override {
str += strfmt(" %s: %g\n", name.c_str(), value);
}
} headerToString(str);
diff --git a/vbench/src/vbench/test/request_receptor.h b/vbench/src/vbench/test/request_receptor.h
index 738f1336bc6..2de39e528e4 100644
--- a/vbench/src/vbench/test/request_receptor.h
+++ b/vbench/src/vbench/test/request_receptor.h
@@ -11,7 +11,7 @@ namespace vbench {
struct RequestReceptor : public Handler<Request> {
Request::UP request;
RequestReceptor() : request() {}
- virtual void handle(Request::UP req);
+ virtual void handle(Request::UP req) override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/test/simple_http_result_handler.h b/vbench/src/vbench/test/simple_http_result_handler.h
index f5ec1c36fcf..a58a4cea8af 100644
--- a/vbench/src/vbench/test/simple_http_result_handler.h
+++ b/vbench/src/vbench/test/simple_http_result_handler.h
@@ -19,9 +19,9 @@ private:
public:
SimpleHttpResultHandler();
- virtual void handleHeader(const string &name, const string &value);
- virtual void handleContent(const Memory &data);
- virtual void handleFailure(const string &reason);
+ virtual void handleHeader(const string &name, const string &value) override;
+ virtual void handleContent(const Memory &data) override;
+ virtual void handleFailure(const string &reason) override;
const std::vector<std::pair<string, string> > &headers() const {
return _headers;
}
diff --git a/vbench/src/vbench/vbench/dropped_tagger.h b/vbench/src/vbench/vbench/dropped_tagger.h
index 6c05dcdaf10..eb64d4b4be4 100644
--- a/vbench/src/vbench/vbench/dropped_tagger.h
+++ b/vbench/src/vbench/vbench/dropped_tagger.h
@@ -19,7 +19,7 @@ private:
public:
DroppedTagger(Handler<Request> &next);
- virtual void handle(Request::UP request);
+ virtual void handle(Request::UP request) override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/ignore_before.h b/vbench/src/vbench/vbench/ignore_before.h
index 0be0add60c4..d74a398efd8 100644
--- a/vbench/src/vbench/vbench/ignore_before.h
+++ b/vbench/src/vbench/vbench/ignore_before.h
@@ -22,8 +22,8 @@ private:
public:
IgnoreBefore(double time, Handler<Request> &next);
- virtual void handle(Request::UP request);
- virtual void report();
+ virtual void handle(Request::UP request) override;
+ virtual void report() override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/latency_analyzer.h b/vbench/src/vbench/vbench/latency_analyzer.h
index d69c85d0360..499f6f3b991 100644
--- a/vbench/src/vbench/vbench/latency_analyzer.h
+++ b/vbench/src/vbench/vbench/latency_analyzer.h
@@ -39,8 +39,8 @@ public:
string toString() const;
};
LatencyAnalyzer(Handler<Request> &next);
- virtual void handle(Request::UP request);
- virtual void report();
+ virtual void handle(Request::UP request) override;
+ virtual void report() override;
void addLatency(double latency);
Stats getStats() const;
};
diff --git a/vbench/src/vbench/vbench/qps_analyzer.h b/vbench/src/vbench/vbench/qps_analyzer.h
index bdc8b4cfe57..4b4b4997f62 100644
--- a/vbench/src/vbench/vbench/qps_analyzer.h
+++ b/vbench/src/vbench/vbench/qps_analyzer.h
@@ -24,8 +24,8 @@ private:
public:
QpsAnalyzer(Handler<Request> &next);
- virtual void handle(Request::UP request);
- virtual void report();
+ virtual void handle(Request::UP request) override;
+ virtual void report() override;
void addEndTime(double end);
};
diff --git a/vbench/src/vbench/vbench/qps_tagger.h b/vbench/src/vbench/vbench/qps_tagger.h
index fcd80b364bf..452ee8fb827 100644
--- a/vbench/src/vbench/vbench/qps_tagger.h
+++ b/vbench/src/vbench/vbench/qps_tagger.h
@@ -22,7 +22,7 @@ private:
public:
QpsTagger(double qps, Handler<Request> &next);
- virtual void handle(Request::UP request);
+ virtual void handle(Request::UP request) override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/request.h b/vbench/src/vbench/vbench/request.h
index 7da731d746f..4951c96fbab 100644
--- a/vbench/src/vbench/vbench/request.h
+++ b/vbench/src/vbench/vbench/request.h
@@ -68,9 +68,9 @@ public:
double latency() const { return (_endTime - _startTime); }
- virtual void handleHeader(const string &name, const string &value);
- virtual void handleContent(const Memory &data);
- virtual void handleFailure(const string &reason);
+ virtual void handleHeader(const string &name, const string &value) override;
+ virtual void handleContent(const Memory &data) override;
+ virtual void handleFailure(const string &reason) override;
const BenchmarkHeaders &headers() const { return _headers; }
diff --git a/vbench/src/vbench/vbench/request_dumper.h b/vbench/src/vbench/vbench/request_dumper.h
index 7005f71fbdf..aede956477c 100644
--- a/vbench/src/vbench/vbench/request_dumper.h
+++ b/vbench/src/vbench/vbench/request_dumper.h
@@ -21,8 +21,8 @@ private:
public:
RequestDumper(Handler<Request> &_next);
- virtual void handle(Request::UP request);
- virtual void report();
+ virtual void handle(Request::UP request) override;
+ virtual void report() override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/request_generator.h b/vbench/src/vbench/vbench/request_generator.h
index 5559a8ffcf1..38f2c7ad7f8 100644
--- a/vbench/src/vbench/vbench/request_generator.h
+++ b/vbench/src/vbench/vbench/request_generator.h
@@ -27,9 +27,9 @@ private:
public:
RequestGenerator(const string &inputFile,
Handler<Request> &next);
- void abort();
- virtual void run();
- virtual const Taint &tainted() const { return _input.tainted(); }
+ void abort() override;
+ virtual void run() override;
+ virtual const Taint &tainted() const override { return _input.tainted(); }
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/request_scheduler.h b/vbench/src/vbench/vbench/request_scheduler.h
index 09c7b7f0f34..1de61073d35 100644
--- a/vbench/src/vbench/vbench/request_scheduler.h
+++ b/vbench/src/vbench/vbench/request_scheduler.h
@@ -40,15 +40,15 @@ private:
HttpConnectionPool _connectionPool;
std::vector<Worker::UP> _workers;
- virtual void run();
+ virtual void run() override;
public:
typedef std::unique_ptr<RequestScheduler> UP;
RequestScheduler(Handler<Request> &next, size_t numWorkers);
void abort();
- virtual void handle(Request::UP request);
- virtual void start();
- virtual RequestScheduler &stop();
- virtual void join();
+ virtual void handle(Request::UP request) override;
+ virtual void start() override;
+ virtual RequestScheduler &stop() override;
+ virtual void join() override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/request_sink.h b/vbench/src/vbench/vbench/request_sink.h
index 27be9e7942e..37c6ce71fcc 100644
--- a/vbench/src/vbench/vbench/request_sink.h
+++ b/vbench/src/vbench/vbench/request_sink.h
@@ -15,8 +15,8 @@ class RequestSink : public Analyzer
{
public:
RequestSink();
- virtual void handle(Request::UP request);
- virtual void report();
+ virtual void handle(Request::UP request) override;
+ virtual void report() override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/server_tagger.h b/vbench/src/vbench/vbench/server_tagger.h
index c104b15bd53..6115873bb0c 100644
--- a/vbench/src/vbench/vbench/server_tagger.h
+++ b/vbench/src/vbench/vbench/server_tagger.h
@@ -23,7 +23,7 @@ private:
public:
ServerTagger(const ServerSpec &server,
Handler<Request> &next);
- virtual void handle(Request::UP request);
+ virtual void handle(Request::UP request) override;
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/vbench.h b/vbench/src/vbench/vbench/vbench.h
index f17e5d4c6b1..5796b3dab76 100644
--- a/vbench/src/vbench/vbench/vbench.h
+++ b/vbench/src/vbench/vbench/vbench.h
@@ -42,8 +42,8 @@ private:
public:
VBench(const vespalib::Slime &cfg);
void abort();
- virtual void run();
- virtual const Taint &tainted() const { return _taint; }
+ virtual void run() override;
+ virtual const Taint &tainted() const override { return _taint; }
};
} // namespace vbench
diff --git a/vbench/src/vbench/vbench/worker.h b/vbench/src/vbench/vbench/worker.h
index 14e79312ce2..cdadaf87cd3 100644
--- a/vbench/src/vbench/vbench/worker.h
+++ b/vbench/src/vbench/vbench/worker.h
@@ -33,12 +33,12 @@ private:
HttpConnectionPool &_pool;
Timer &_timer;
- virtual void run();
+ virtual void run() override;
public:
typedef std::unique_ptr<Worker> UP;
Worker(Provider<Request> &provider, Handler<Request> &next,
HttpConnectionPool &pool, Timer &timer);
- virtual void join() { _thread.join(); }
+ virtual void join() override { _thread.join(); }
};
} // namespace vbench