remove FastOS_Application

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

4 files changed, 33 insertions, 67 deletions

diff --git a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
index b6269253c48..9feedb8d663 100644
--- a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
+++ b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
@@ -3,7 +3,7 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/fnet/transport.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 class Server : public FRT_Invokable
 {
@@ -66,31 +66,15 @@ public:
 };
 
 
-class App : public FastOS_Application
-{
-public:
-    int Main() override;
-};
-
-
-int
-App::Main()
-{
-    if (_argc < 2) {
-        printf("usage: %s <listenspec>\n", _argv[0]);
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
+    if (argc < 2) {
+        printf("usage: %s <listenspec>\n", argv[0]);
         return 1;
     }
     fnet::frt::StandaloneFRT frt;
     Server server(&frt.supervisor());
-    frt.supervisor().Listen(_argv[1]);
+    frt.supervisor().Listen(argv[1]);
     frt.supervisor().GetTransport()->WaitFinished();
     return 0;
 }
-
-
-int
-main(int argc, char **argv)
-{
-    App myapp;
-    return myapp.Entry(argc, argv);
-}
diff --git a/jrt_test/src/tests/echo/echo-client.cpp b/jrt_test/src/tests/echo/echo-client.cpp
index 0661c8cfa2c..a7c8d309114 100644
--- a/jrt_test/src/tests/echo/echo-client.cpp
+++ b/jrt_test/src/tests/echo/echo-client.cpp
@@ -4,21 +4,21 @@
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
-class EchoClient : public FastOS_Application
+class EchoClient
 {
 public:
-  int Main() override
+  int 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("echo");
@@ -85,9 +85,8 @@ public:
   }
 };
 
-int
-main(int argc, char **argv)
-{
-  EchoClient myapp;
-  return myapp.Entry(argc, argv);
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
+    EchoClient myapp;
+    return myapp.main(argc, argv);
 }
diff --git a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
index 96f90c59645..cdcf02da465 100644
--- a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
+++ b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
@@ -1,13 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/vespalib/util/time.h>
 #include <thread>
 
-class RPCInfo : public FastOS_Application
+class RPCInfo
 {
 public:
 
@@ -68,17 +68,17 @@ public:
   }
 
 
-  int Main() override
+  int main(int argc, char **argv)
   {
-    if (_argc < 2) {
+    if (argc < 2) {
       printf("usage : 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;
 
@@ -91,10 +91,10 @@ public:
         }
         std::this_thread::sleep_for(1s);
         target->SubRef();
-        target = supervisor.GetTarget(_argv[1]);
+        target = supervisor.GetTarget(argv[1]);
     }
     if (info->IsError()) {
-        fprintf(stderr, "Error talking to %s\n", _argv[1]);
+        fprintf(stderr, "Error talking to %s\n", argv[1]);
         info->Print();
         FreeReqs(m_list, info);
         return 1;
@@ -139,9 +139,8 @@ public:
 };
 
 
-int
-main(int argc, char **argv)
-{
-  RPCInfo myapp;
-  return myapp.Entry(argc, argv);
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
+    RPCInfo myapp;
+    return myapp.main(argc, argv);
 }
diff --git a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
index cfa40f3352d..a2ee4cb3440 100644
--- a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
+++ b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
@@ -3,7 +3,7 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/fnet/transport.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 class MockupServer : public FRT_Invokable
 {
@@ -37,31 +37,15 @@ public:
 };
 
 
-class App : public FastOS_Application
-{
-public:
-    int Main() override;
-};
-
-
-int
-App::Main()
-{
-    if (_argc < 2) {
-        printf("usage: %s <listenspec>\n", _argv[0]);
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
+    if (argc < 2) {
+        printf("usage: %s <listenspec>\n", argv[0]);
         return 1;
     }
     fnet::frt::StandaloneFRT frt;
     MockupServer server(&frt.supervisor());
-    frt.supervisor().Listen(_argv[1]);
+    frt.supervisor().Listen(argv[1]);
     frt.supervisor().GetTransport()->WaitFinished();
     return 0;
 }
-
-
-int
-main(int argc, char **argv)
-{
-  App myapp;
-  return myapp.Entry(argc, argv);
-}