remove FastOS_Application

fixup (per application):
  - maybe ignore SIGPIPE
  - wire argc/argv
untangle Vespa Test Framework
strip down deprecated TestApp

10 files changed, 102 insertions, 130 deletions

diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index 61416fb06bd..0176337c466 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -3,28 +3,28 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("echo_client");
 
-class EchoClient : public FastOS_Application
+class EchoClient
 {
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 int
-EchoClient::Main()
+EchoClient::main(int argc, char **argv)
 {
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : echo_client <connectspec>\n");
         return 1;
     }
     fnet::frt::StandaloneFRT server;
     FRT_Supervisor & supervisor = server.supervisor();
 
-    FRT_Target *target = supervisor.GetTarget(_argv[1]);
+    FRT_Target *target = supervisor.GetTarget(argv[1]);
     FRT_RPCRequest *req = supervisor.AllocRPCRequest();
     FRT_Values *args = req->GetParams();
     req->SetMethodName("frt.rpc.echo");
@@ -90,9 +90,8 @@ EchoClient::Main()
     return 0;
 }
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     EchoClient myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
index 9d56db3fe0a..b41c40ba29d 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -3,7 +3,7 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("rpc_callback_client");
@@ -34,16 +34,16 @@ RPC::Init(FRT_Supervisor *s)
 }
 
 
-class MyApp : public FastOS_Application
+class MyApp
 {
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 int
-MyApp::Main()
+MyApp::main(int argc, char **argv)
 {
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : rpc_server <connectspec>\n");
         return 1;
     }
@@ -53,7 +53,7 @@ MyApp::Main()
     FRT_Supervisor & orb = server.supervisor();
     rpc.Init(&orb);
 
-    FRT_Target *target = orb.Get2WayTarget(_argv[1]);
+    FRT_Target *target = orb.Get2WayTarget(argv[1]);
     FRT_RPCRequest *req = orb.AllocRPCRequest();
 
     printf("invokeCnt: %d\n", rpc.invokeCnt);
@@ -108,9 +108,8 @@ MyApp::Main()
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     MyApp myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index 49792ddb893..37a819c6ee7 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -5,7 +5,7 @@
 #include <vespa/fnet/signalshutdown.h>
 #include <vespa/fnet/transport.h>
 
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <thread>
 
 #include <vespa/log/log.h>
@@ -49,17 +49,17 @@ RPC::Init(FRT_Supervisor *s)
 }
 
 
-class MyApp : public FastOS_Application
+class MyApp
 {
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 int
-MyApp::Main()
+MyApp::main(int argc, char **argv)
 {
     FNET_SignalShutDown::hookSignals();
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : rpc_server <listenspec>\n");
         return 1;
     }
@@ -67,16 +67,15 @@ MyApp::Main()
     fnet::frt::StandaloneFRT server;
     FRT_Supervisor & supervisor = server.supervisor();
     rpc.Init(&supervisor);
-    supervisor.Listen(_argv[1]);
+    supervisor.Listen(argv[1]);
     FNET_SignalShutDown ssd(*supervisor.GetTransport());
     server.supervisor().GetTransport()->WaitFinished();
     return 0;
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     MyApp myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index 6eb8758157c..acb20a880c9 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -3,28 +3,28 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("rpc_client");
 
-class RPCClient : public FastOS_Application
+class RPCClient
 {
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 int
-RPCClient::Main()
+RPCClient::main(int argc, char **argv)
 {
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : rpc_client <connectspec>\n");
         return 1;
     }
     fnet::frt::StandaloneFRT server;
     FRT_Supervisor & supervisor = server.supervisor();
 
-    FRT_Target *target = supervisor.GetTarget(_argv[1]);
+    FRT_Target *target = supervisor.GetTarget(argv[1]);
 
     const char *str1 = "abc";
     const char *str2 = "def";
@@ -86,9 +86,8 @@ RPCClient::Main()
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     RPCClient myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index 53adf262e35..9734342a24e 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -3,12 +3,12 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("vespa-rpc-info");
 
-class RPCInfo : public FastOS_Application
+class RPCInfo
 {
 public:
 
@@ -68,23 +68,23 @@ public:
         printf("\n");
     }
 
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 
 int
-RPCInfo::Main()
+RPCInfo::main(int argc, char **argv)
 {
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage : vespa-rpc-info <connectspec> [verbose]\n");
         return 1;
     }
 
-    bool verbose = (_argc > 2 && strcmp(_argv[2], "verbose") == 0);
+    bool verbose = (argc > 2 && strcmp(argv[2], "verbose") == 0);
     fnet::frt::StandaloneFRT server;
     FRT_Supervisor & supervisor = server.supervisor();
 
-    FRT_Target     *target = supervisor.GetTarget(_argv[1]);
+    FRT_Target     *target = supervisor.GetTarget(argv[1]);
     FRT_RPCRequest *m_list = nullptr;
     FRT_RPCRequest *info   = nullptr;
 
@@ -92,7 +92,7 @@ RPCInfo::Main()
     info->SetMethodName("frt.rpc.ping");
     target->InvokeSync(info, 5.0);
     if (info->IsError()) {
-        fprintf(stderr, "Error talking to %s\n", _argv[1]);
+        fprintf(stderr, "Error talking to %s\n", argv[1]);
         FreeReqs(m_list, info);
         return 1;
     }
@@ -135,9 +135,8 @@ RPCInfo::Main()
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     RPCInfo myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index 987d987e672..a6177999d70 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -3,13 +3,13 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <vespa/vespalib/locale/c.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("vespa-rpc-invoke");
 
-class RPCClient : public FastOS_Application
+class RPCClient
 {
 private:
     static bool addArg(FRT_RPCRequest *req, const char *param) {
@@ -45,16 +45,16 @@ private:
         }
         return true;
     }
-    int run();
+    int run(int argc, char **argv);
 
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 int
-RPCClient::Main()
+RPCClient::main(int argc, char **argv)
 {
-    if (_argc < 3) {
+    if (argc < 3) {
         fprintf(stderr, "usage: vespa-rpc-invoke [-t timeout] <connectspec> <method> [args]\n");
         fprintf(stderr, "    -t timeout in seconds\n");
         fprintf(stderr, "    Each arg must be on the form <type>:<value>\n");
@@ -62,7 +62,7 @@ RPCClient::Main()
         return 1;
     }
     try {
-        return run();
+        return run(argc, argv);
     } catch (const std::exception & e) {
         fprintf(stderr, "Caught exception : '%s'", e.what());
         return 2;
@@ -70,7 +70,7 @@ RPCClient::Main()
 }
 
 int
-RPCClient::run()
+RPCClient::run(int argc, char **argv)
 {
     int retCode = 0;
     fnet::frt::StandaloneFRT server;
@@ -79,18 +79,18 @@ RPCClient::run()
     int methNameArg = 2;
     int startOfArgs = 3;
     int timeOut = 10;
-    if (strcmp(_argv[1], "-t") == 0) {
-      timeOut = atoi(_argv[2]);
+    if (strcmp(argv[1], "-t") == 0) {
+      timeOut = atoi(argv[2]);
       targetArg = 3;
       methNameArg = 4;
       startOfArgs = 5;
     }
-    FRT_Target *target = supervisor.GetTarget(_argv[targetArg]);
+    FRT_Target *target = supervisor.GetTarget(argv[targetArg]);
     FRT_RPCRequest *req = supervisor.AllocRPCRequest();
-    req->SetMethodName(_argv[methNameArg]);
-    for (int i = startOfArgs; i < _argc; ++i) {
-        if (!addArg(req, _argv[i])) {
-            fprintf(stderr, "could not parse parameter: '%s'\n", _argv[i]);
+    req->SetMethodName(argv[methNameArg]);
+    for (int i = startOfArgs; i < argc; ++i) {
+        if (!addArg(req, argv[i])) {
+            fprintf(stderr, "could not parse parameter: '%s'\n", argv[i]);
             retCode = 2;
             break;
         }
@@ -115,9 +115,8 @@ RPCClient::run()
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     RPCClient myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 83f86ed50bf..8cb3adf5387 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -4,7 +4,7 @@
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/fnet/signalshutdown.h>
 #include <vespa/fnet/transport.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("rpc_server");
@@ -23,7 +23,7 @@ public:
     void RPC_concat(FRT_RPCRequest *req);
     void RPC_addFloat(FRT_RPCRequest *req);
     void RPC_addDouble(FRT_RPCRequest *req);
-    int Main(int argc, char **argv);
+    int main(int argc, char **argv);
 };
 
 void
@@ -86,7 +86,7 @@ RPCServer::RPC_addDouble(FRT_RPCRequest *req)
 }
 
 int
-RPCServer::Main(int argc, char **argv)
+RPCServer::main(int argc, char **argv)
 {
     FNET_SignalShutDown::hookSignals();
     if (argc < 2) {
@@ -104,26 +104,8 @@ RPCServer::Main(int argc, char **argv)
 }
 
 
-class App : public FastOS_Application
-{
-private:
-    RPCServer _server;
-
-public:
-    App() : _server() {}
-    int Main() override;
-};
-
-int
-App::Main()
-{
-    return _server.Main(_argc, _argv);
-}
-
-
-int
-main(int argc, char **argv)
-{
-    App myapp;
-    return myapp.Entry(argc, argv);
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
+    RPCServer server;
+    return server.main(argc, argv);
 }
diff --git a/fnet/src/examples/ping/pingclient.cpp b/fnet/src/examples/ping/pingclient.cpp
index d57a17d2f5d..af3c9f68848 100644
--- a/fnet/src/examples/ping/pingclient.cpp
+++ b/fnet/src/examples/ping/pingclient.cpp
@@ -5,23 +5,23 @@
 #include <vespa/fnet/channel.h>
 #include <vespa/fnet/connection.h>
 #include <examples/ping/packets.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <vespa/fastos/thread.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("pingclient");
 
-class PingClient : public FastOS_Application
+class PingClient
 {
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 
 int
-PingClient::Main()
+PingClient::main(int argc, char **argv)
 {
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : pingclient <connectspec> <timeout>\n");
         printf("example: pingclient 'tcp/localhost:8000'\n");
         return 1;
@@ -32,12 +32,12 @@ PingClient::Main()
     PingPacketFactory          factory;
     FNET_SimplePacketStreamer  streamer(&factory);
     FNET_Transport             transport;
-    FNET_Connection           *conn = transport.Connect(_argv[1], &streamer);
+    FNET_Connection           *conn = transport.Connect(argv[1], &streamer);
     uint32_t                   timeout_ms=5000;
     FNET_Channel              *channels[10];
 
-    if (_argc == 3) {
-        timeout_ms = atof(_argv[2]) * 1000;
+    if (argc == 3) {
+        timeout_ms = atof(argv[2]) * 1000;
     }
     transport.Start(&pool);
 
@@ -45,7 +45,7 @@ PingClient::Main()
     for (uint32_t i = 0; i < 10; i++) {
         channels[i] = (conn == nullptr) ? nullptr : conn->OpenChannel(&queue, FNET_Context(i));
         if (channels[i] == 0) {
-            fprintf(stderr, "Could not make channel[%d] to %s\n", i, _argv[1]);
+            fprintf(stderr, "Could not make channel[%d] to %s\n", i, argv[1]);
             break;
         }
         channelCnt++;
@@ -95,9 +95,8 @@ PingClient::Main()
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     PingClient myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/ping/pingserver.cpp b/fnet/src/examples/ping/pingserver.cpp
index 83d99c9c7e8..fb5b12b66c0 100644
--- a/fnet/src/examples/ping/pingserver.cpp
+++ b/fnet/src/examples/ping/pingserver.cpp
@@ -7,14 +7,13 @@
 #include <vespa/fnet/iserveradapter.h>
 #include <vespa/fnet/connector.h>
 #include <examples/ping/packets.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("pingserver");
 
 class PingServer : public FNET_IServerAdapter,
-                   public FNET_IPacketHandler,
-                   public FastOS_Application
+                   public FNET_IPacketHandler
 {
 public:
     bool InitChannel(FNET_Channel *channel, uint32_t) override {
@@ -31,16 +30,16 @@ public:
         packet->Free();
         return FNET_FREE_CHANNEL;
     }
-    
-    int Main() override;
+
+    int main(int argc, char **argv);
 };
 
 
 int
-PingServer::Main()
+PingServer::main(int argc, char **argv)
 {
     FNET_SignalShutDown::hookSignals();
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : pingserver <listenspec>\n");
         printf("example: pingserver 'tcp/8000'\n");
         return 1;
@@ -50,7 +49,7 @@ PingServer::Main()
     PingPacketFactory          factory;
     FNET_SimplePacketStreamer  streamer(&factory);
     FNET_Connector *listener =
-        transport.Listen(_argv[1], &streamer, this);
+        transport.Listen(argv[1], &streamer, this);
     if (listener != nullptr)
         listener->SubRef();
 
@@ -60,9 +59,8 @@ PingServer::Main()
 }
 
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     PingServer myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }
diff --git a/fnet/src/examples/timeout/timeout.cpp b/fnet/src/examples/timeout/timeout.cpp
index 725ab8ce53d..70e9a1498c7 100644
--- a/fnet/src/examples/timeout/timeout.cpp
+++ b/fnet/src/examples/timeout/timeout.cpp
@@ -4,7 +4,7 @@
 #include <vespa/fnet/signalshutdown.h>
 #include <vespa/fnet/packetqueue.h>
 #include <vespa/fnet/controlpacket.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <vespa/fastos/thread.h>
 #include <vespa/vespalib/util/time.h>
 #include <thread>
@@ -38,15 +38,15 @@ Timeout::PerformTask()
 }
 
 
-class MyApp : public FastOS_Application
+class MyApp
 {
 public:
-  int Main() override;
+  int main(int argc, char **argv);
 };
 
 
 int
-MyApp::Main()
+MyApp::main(int, char **)
 {
   using clock = std::chrono::steady_clock;
   using ms_double = std::chrono::duration<double,std::milli>;
@@ -95,9 +95,8 @@ MyApp::Main()
 }
 
 
-int
-main(int argc, char **argv)
-{
-  MyApp myapp;
-  return myapp.Entry(argc, argv);
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
+    MyApp myapp;
+    return myapp.main(argc, argv);
 }