remove connection-based session handling

also remove method mismatch hook

3 files changed, 0 insertions, 172 deletions

diff --git a/fnet/src/tests/examples/examples_test.cpp b/fnet/src/tests/examples/examples_test.cpp
index 74271a7ef5c..dc7b051bd80 100644
--- a/fnet/src/tests/examples/examples_test.cpp
+++ b/fnet/src/tests/examples/examples_test.cpp
@@ -87,10 +87,6 @@ TEST("usage") {
         ChildProcess proc("exec ../../examples/frt/rpc/fnet_rpc_callback_client_app");
         EXPECT_FALSE(runProc(proc, done));
     }
-    {
-        ChildProcess proc("exec ../../examples/frt/rpc/vespa-rpc-proxy");
-        EXPECT_FALSE(runProc(proc, done));
-    }
 }
 
 TEST("timeout") {
@@ -220,23 +216,4 @@ TEST_MT_F("rpc callback client server", 2, std::atomic<bool>()) {
     }
 }
 
-TEST_MT_F("rpc callback client server with proxy", 3, std::atomic<bool>()) {
-    if (thread_id == 0) {
-        ChildProcess proc(vespalib::make_string("exec ../../examples/frt/rpc/fnet_rpc_callback_server_app tcp/%d",
-                                             PORT0).c_str());
-        TEST_BARRIER();
-        EXPECT_TRUE(runProc(proc, f1));
-    } else if (thread_id == 1) {
-        ChildProcess proc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-proxy tcp/%d tcp/localhost:%d",
-                                             PORT1, PORT0).c_str());
-        TEST_BARRIER();
-        EXPECT_TRUE(runProc(proc, f1));
-    } else {
-        TEST_BARRIER();
-        EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/fnet_rpc_callback_client_app tcp/localhost:%d",
-                                                  PORT1).c_str()));
-        f1 = true;
-    }
-}
-
 TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); }
diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt
index f0155da4b49..64a1d150fce 100644
--- a/fnet/src/tests/frt/rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/rpc/CMakeLists.txt
@@ -17,17 +17,6 @@ vespa_add_executable(fnet_detach_return_invoke_test_app TEST
     fnet
 )
 vespa_add_test(NAME fnet_detach_return_invoke_test_app COMMAND fnet_detach_return_invoke_test_app)
-vespa_add_executable(fnet_session_test_app TEST
-    SOURCES
-    session.cpp
-    DEPENDS
-    fnet
-)
-vespa_add_test(NAME fnet_session_test_app COMMAND fnet_session_test_app)
-vespa_add_test(NAME fnet_session_test_app_xor COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=xor")
-vespa_add_test(NAME fnet_session_test_app_tls COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls")
-vespa_add_test(NAME fnet_session_test_app_tls_maybe_yes COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls_maybe_yes")
-vespa_add_test(NAME fnet_session_test_app_tls_maybe_no COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls_maybe_no")
 vespa_add_executable(fnet_sharedblob_test_app TEST
     SOURCES
     sharedblob.cpp
diff --git a/fnet/src/tests/frt/rpc/session.cpp b/fnet/src/tests/frt/rpc/session.cpp
deleted file mode 100644
index f05cf9dfafc..00000000000
--- a/fnet/src/tests/frt/rpc/session.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/fnet/frt/supervisor.h>
-#include <vespa/fnet/frt/target.h>
-#include <vespa/fnet/frt/rpcrequest.h>
-#include <mutex>
-
-//-------------------------------------------------------------
-
-#include "my_crypto_engine.hpp"
-vespalib::CryptoEngine::SP crypto;
-
-//-------------------------------------------------------------
-
-class Session
-{
-private:
-  static std::mutex _lock;
-  static int        _cnt;
-  int               _val;
-
-public:
-  Session() : _val(0)
-  {
-      std::lock_guard<std::mutex> guard(_lock);
-      ++_cnt;
-  }
-
-  ~Session()
-  {
-      std::lock_guard<std::mutex> guard(_lock);
-      --_cnt;
-  }
-
-  void SetValue(int val) { _val = val; }
-  int GetValue() const { return _val; }
-  static int GetCnt() { return _cnt; }
-};
-
-std::mutex Session::_lock;
-int Session::_cnt(0);
-
-
-struct RPC : public FRT_Invokable
-{
-  bool bogusFini;
-
-  RPC() : bogusFini(false) {}
-
-  void InitSession(FRT_RPCRequest *req)
-  {
-    Session *session = new Session();
-    req->GetConnection()->SetContext(FNET_Context((void *) session));
-  }
-
-  void FiniSession(FRT_RPCRequest *req)
-  {
-    Session *session =
-      (Session *)req->GetConnection()->GetContext()._value.VOIDP;
-    bogusFini |= (session == nullptr);
-    delete session;
-  }
-
-  void GetValue(FRT_RPCRequest *req)
-  {
-    Session *session =
-      (Session *)req->GetConnection()->GetContext()._value.VOIDP;
-    req->GetReturn()->AddInt32(session->GetValue());
-  }
-
-  void SetValue(FRT_RPCRequest *req)
-  {
-    Session *session =
-      (Session *)req->GetConnection()->GetContext()._value.VOIDP;
-    session->SetValue(req->GetParams()->GetValue(0)._intval32);
-  }
-
-  void Init(FRT_Supervisor *s)
-  {
-    FRT_ReflectionBuilder rb(s);
-    rb.DefineMethod("getValue", "", "i",
-                    FRT_METHOD(RPC::GetValue), this);
-    rb.DefineMethod("setValue", "i", "",
-                    FRT_METHOD(RPC::SetValue), this);
-    s->SetSessionInitHook(FRT_METHOD(RPC::InitSession), this);
-    s->SetSessionFiniHook(FRT_METHOD(RPC::FiniSession), this);
-  }
-};
-
-void testSession(RPC & rpc) {
-    fnet::frt::StandaloneFRT frt(crypto);
-    FRT_Supervisor & orb = frt.supervisor();
-    char spec[64];
-    rpc.Init(&orb);
-    ASSERT_TRUE(orb.Listen("tcp/0"));
-    sprintf(spec, "tcp/localhost:%d", orb.GetListenPort());
-
-    FRT_Target     *target = orb.GetTarget(spec);
-    FRT_RPCRequest *req    = orb.AllocRPCRequest();
-
-    req->SetMethodName("getValue");
-    target->InvokeSync(req, 5.0);
-    ASSERT_TRUE(!req->IsError() &&
-                 strcmp(req->GetReturnSpec(), "i") == 0 &&
-                 req->GetReturn()->GetValue(0)._intval32 == 0);
-
-    req = orb.AllocRPCRequest(req);
-    req->SetMethodName("setValue");
-    req->GetParams()->AddInt32(42);
-    target->InvokeSync(req, 5.0);
-    ASSERT_TRUE(!req->IsError() &&
-                 strcmp(req->GetReturnSpec(), "") == 0);
-
-    req = orb.AllocRPCRequest(req);
-    req->SetMethodName("getValue");
-    target->InvokeSync(req, 5.0);
-    ASSERT_TRUE(!req->IsError() &&
-                 strcmp(req->GetReturnSpec(), "i") == 0 &&
-                 req->GetReturn()->GetValue(0)._intval32 == 42);
-
-    EXPECT_TRUE(Session::GetCnt() == 1);
-
-    req->SubRef();
-    target->SubRef();
-}
-TEST("session") {
-    RPC rpc;
-    testSession(rpc);
-    EXPECT_TRUE(Session::GetCnt() == 0);
-    EXPECT_TRUE(!rpc.bogusFini);
-};
-
-TEST_MAIN() {
-    crypto = my_crypto_engine();
-    TEST_RUN_ALL();
-    crypto.reset();
-}