diff options
author | Håvard Pettersen <havardpe@oath.com> | 2022-04-06 12:18:08 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2022-04-08 13:45:13 +0000 |
commit | 9fbcf76d088740aacf535e6482f86c833cfae871 (patch) | |
tree | c62dcd0f9cdcee9876b37c60f741958c14147f80 /vbench | |
parent | 69454cef2fe53694eb5541e5f622a4e973c081bf (diff) |
remove FastOS_Application
fixup (per application):
- maybe ignore SIGPIPE
- wire argc/argv
untangle Vespa Test Framework
strip down deprecated TestApp
Diffstat (limited to 'vbench')
-rw-r--r-- | vbench/src/apps/dumpurl/dumpurl.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/vbench/src/apps/dumpurl/dumpurl.cpp b/vbench/src/apps/dumpurl/dumpurl.cpp index 515f4b5ae3e..9de22fc0887 100644 --- a/vbench/src/apps/dumpurl/dumpurl.cpp +++ b/vbench/src/apps/dumpurl/dumpurl.cpp @@ -3,17 +3,11 @@ #include <vbench/http/http_result_handler.h> #include <vbench/http/server_spec.h> #include <vbench/http/http_client.h> -#include <vespa/fastos/app.h> +#include <vespa/vespalib/util/signalhandler.h> #include <vespa/vespalib/net/crypto_engine.h> using namespace vbench; -class App : public FastOS_Application -{ -public: - int Main() override; -}; - struct MyHttpHandler : public HttpResultHandler { void handleHeader(const string &name, const string &value) override { fprintf(stderr, "got header: '%s': '%s'\n", name.c_str(), value.c_str()); @@ -27,20 +21,14 @@ struct MyHttpHandler : public HttpResultHandler { } }; -int -App::Main() -{ - if (_argc != 4) { +int main(int argc, char **argv) { + vespalib::SignalHandler::PIPE.ignore(); + if (argc != 4) { printf("usage: dumpurl <host> <port> <url>\n"); return -1; } auto null_crypto = std::make_shared<vespalib::NullCryptoEngine>(); MyHttpHandler myHandler; - bool ok = HttpClient::fetch(*null_crypto, ServerSpec(_argv[1], atoi(_argv[2])), _argv[3], myHandler); + bool ok = HttpClient::fetch(*null_crypto, ServerSpec(argv[1], atoi(argv[2])), argv[3], myHandler); return ok ? 0 : 1; } - -int main(int argc, char **argv) { - App app; - return app.Entry(argc, argv); -} |