Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove nanomsg transport

Browse Source
This commit is contained in:
Alexey Rybalchenko
2020-05-08 08:19:02 +02:00
parent 8cfc04721e
commit a15d59c725
46 changed files with 36 additions and 2009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/CMakeLists.txt
View File

@@ -32,10 +32,6 @@ add_testhelper(runTestDevice
LINKS FairMQ
)
if(BUILD_NANOMSG_TRANSPORT)
list(APPEND definitions BUILD_NANOMSG_TRANSPORT)
endif()
if(BUILD_OFI_TRANSPORT)
LIST(APPEND definitions BUILD_OFI_TRANSPORT)
endif()

14
test/message/_message.cxx
View File

@@ -87,13 +87,6 @@ TEST(Resize, shmem)
RunPushPullWithMsgResize("shmem", "ipc://test_message_resize");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(Resize, nanomsg)
{
RunPushPullWithMsgResize("nanomsg", "ipc://test_message_resize");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(Rebuild, zeromq)
{
RunMsgRebuild("zeromq");
@@ -104,11 +97,4 @@ TEST(Rebuild, shmem)
RunMsgRebuild("shmem");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(Rebuild, nanomsg)
{
RunMsgRebuild("nanomsg");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace

14
test/poller/_poller.cxx
View File

@@ -55,13 +55,6 @@ TEST(Subchannel, zeromq)
EXPECT_EXIT(RunPoller("zeromq", 0), ::testing::ExitedWithCode(0), "POLL test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(Subchannel, nanomsg)
{
EXPECT_EXIT(RunPoller("nanomsg", 0), ::testing::ExitedWithCode(0), "POLL test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(Subchannel, shmem)
{
EXPECT_EXIT(RunPoller("shmem", 0), ::testing::ExitedWithCode(0), "POLL test successfull");
@@ -72,13 +65,6 @@ TEST(Channel, zeromq)
EXPECT_EXIT(RunPoller("zeromq", 1), ::testing::ExitedWithCode(0), "POLL test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(Channel, nanomsg)
{
EXPECT_EXIT(RunPoller("nanomsg", 1), ::testing::ExitedWithCode(0), "POLL test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(Channel, shmem)
{
EXPECT_EXIT(RunPoller("shmem", 1), ::testing::ExitedWithCode(0), "POLL test successfull");

7
test/protocols/_pair.cxx
View File

@@ -56,13 +56,6 @@ TEST(Pair, SingleMsg_MP_tcp_shmem)
EXPECT_EXIT(RunPair("shmem"), ::testing::ExitedWithCode(0), "PAIR test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(Pair, SingleMsg_MP_tcp_nanomsg)
{
EXPECT_EXIT(RunPair("nanomsg"), ::testing::ExitedWithCode(0), "PAIR test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
#ifdef BUILD_OFI_TRANSPORT
TEST(Pair, SingleMsg_MP_tcp_ofi)
{

7
test/protocols/_pub_sub.cxx
View File

@@ -60,11 +60,4 @@ TEST(PubSub, zeromq)
EXPECT_EXIT(RunPubSub("zeromq"), ::testing::ExitedWithCode(0), "PUB-SUB test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(PubSub, nanomsg)
{
EXPECT_EXIT(RunPubSub("nanomsg"), ::testing::ExitedWithCode(0), "PUB-SUB test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace

7
test/protocols/_push_pull.cxx
View File

@@ -56,11 +56,4 @@ TEST(PushPull, SingleMsg_MP_tcp_shmem)
EXPECT_EXIT(RunPushPull("shmem"), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(PushPull, SingleMsg_MP_tcp_nanomsg)
{
EXPECT_EXIT(RunPushPull("nanomsg"), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace

28
test/protocols/_push_pull_multipart.cxx
View File

@@ -158,13 +158,6 @@ TEST(PushPull, Multipart_ST_inproc_shmem)
RunSingleThreadedMultipart("shmem", "inproc://test1", "inproc://test2");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(PushPull, Multipart_ST_inproc_nanomsg)
{
RunSingleThreadedMultipart("nanomsg", "inproc://test1", "inproc://test2");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(PushPull, Multipart_ST_ipc_zeromq)
{
RunSingleThreadedMultipart("zeromq", "ipc://test_Multipart_ST_ipc_zeromq_1", "ipc://test_Multipart_ST_ipc_zeromq_2");
@@ -175,13 +168,6 @@ TEST(PushPull, Multipart_ST_ipc_shmen)
RunSingleThreadedMultipart("shmem", "ipc://test_Multipart_ST_ipc_shmen_1", "ipc://test_Multipart_ST_ipc_shmen_2");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(PushPull, Multipart_ST_ipc_nanomsg)
{
RunSingleThreadedMultipart("nanomsg", "ipc://test_Multipart_ST_ipc_nanomsg_1", "ipc://test_Multipart_ST_ipc_nanomsg_2");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(PushPull, Multipart_MT_inproc_zeromq)
{
RunMultiThreadedMultipart("zeromq", "inproc://test_1");
@@ -192,13 +178,6 @@ TEST(PushPull, Multipart_MT_inproc_shmem)
RunMultiThreadedMultipart("shmem", "inproc://test_1");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(PushPull, Multipart_MT_inproc_nanomsg)
{
RunMultiThreadedMultipart("nanomsg", "inproc://test_1");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(PushPull, Multipart_MT_ipc_zeromq)
{
RunMultiThreadedMultipart("zeromq", "ipc://test_Multipart_MT_ipc_zeromq_1");
@@ -209,11 +188,4 @@ TEST(PushPull, Multipart_MT_ipc_shmem)
RunMultiThreadedMultipart("shmem", "ipc://test_Multipart_MT_ipc_shmem_1");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(PushPull, Multipart_MT_ipc_nanomsg)
{
RunMultiThreadedMultipart("nanomsg", "ipc://test_Multipart_MT_ipc_nanomsg_1");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace

7
test/protocols/_req_rep.cxx
View File

@@ -65,11 +65,4 @@ TEST(ReqRep, shmem)
EXPECT_EXIT(RunReqRep("shmem"), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(ReqRep, nanomsg)
{
EXPECT_EXIT(RunReqRep("nanomsg"), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace

217
test/protocols/config.json.in
View File

@@ -27,32 +27,6 @@
}
]
},
{
"id": "pairleft_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5757",
"method": "bind",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pair"
}
]
},
{
"id": "pairright_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5757",
"method": "connect",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pair"
}
]
},
{
"id": "pairleft_shmem",
"channels": [
@@ -131,32 +105,6 @@
}
]
},
{
"id": "push_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5757",
"method": "bind",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "push"
}
]
},
{
"id": "pull_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5757",
"method": "connect",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pull"
}
]
},
{
"id": "push_shmem",
"channels": [
@@ -204,27 +152,6 @@
}
]
},
{
"id": "pub_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5756",
"method": "bind",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pub"
},
{
"address": "tcp://127.0.0.1:5755",
"method": "bind",
"name": "control",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pull"
}
]
},
{
"id": "sub_1zeromq",
"channels": [
@@ -267,48 +194,6 @@
}
]
},
{
"id": "sub_1nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5756",
"method": "connect",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "sub"
},
{
"address": "tcp://127.0.0.1:5755",
"method": "connect",
"name": "control",
"rateLogging": 0,
"transport": "nanomsg",
"type": "push"
}
]
},
{
"id": "sub_2nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5756",
"method": "connect",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "sub"
},
{
"address": "tcp://127.0.0.1:5755",
"method": "connect",
"name": "control",
"rateLogging": 0,
"transport": "nanomsg",
"type": "push"
}
]
},
{
"id": "req_1zeromq",
"channels": [
@@ -322,19 +207,6 @@
}
]
},
{
"id": "req_1nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5758",
"method": "connect",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "req"
}
]
},
{
"id": "req_2zeromq",
"channels": [
@@ -348,19 +220,6 @@
}
]
},
{
"id": "req_2nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5758",
"method": "connect",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "req"
}
]
},
{
"id": "req_1shmem",
"channels": [
@@ -400,19 +259,6 @@
}
]
},
{
"id": "rep_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5758",
"method": "bind",
"name": "data",
"rateLogging": 0,
"transport": "nanomsg",
"type": "rep"
}
]
},
{
"id": "rep_shmem",
"channels": [
@@ -468,27 +314,6 @@
}
]
},
{
"id": "transfer_timeout_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:5759",
"method": "bind",
"name": "data-in",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pull"
},
{
"address": "tcp://127.0.0.1:5560",
"method": "bind",
"name": "data-out",
"rateLogging": 0,
"transport": "nanomsg",
"type": "push"
}
]
},
{
"id": "pollout_zeromq",
"channels": [
@@ -531,48 +356,6 @@
}
]
},
{
"id": "pollout_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:6002",
"method": "bind",
"name": "data1",
"rateLogging": 0,
"transport": "nanomsg",
"type": "push"
},
{
"address": "tcp://127.0.0.1:6003",
"method": "bind",
"name": "data2",
"rateLogging": 0,
"transport": "nanomsg",
"type": "push"
}
]
},
{
"id": "pollin_nanomsg",
"channels": [
{
"address": "tcp://127.0.0.1:6002",
"method": "connect",
"name": "data1",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pull"
},
{
"address": "tcp://127.0.0.1:6003",
"method": "connect",
"name": "data2",
"rateLogging": 0,
"transport": "nanomsg",
"type": "pull"
}
]
},
{
"id": "pollout_shmem",
"channels": [

25
test/transport/_options.cxx
View File

@@ -32,11 +32,7 @@ void CheckOldOptionInterface(FairMQChannel& channel, const string& option, const
value = 0;
size_t valueSize = sizeof(value);
channel.GetSocket().GetOption(option, &value, &valueSize);
if (transport == "nanomsg" && (option == "snd-hwm" || option == "rcv-hwm")) {
ASSERT_EQ(value, -1);
} else {
ASSERT_EQ(value, 500);
}
ASSERT_EQ(value, 500);
}
void RunOptionsTest(const string& transport)
@@ -58,18 +54,10 @@ void RunOptionsTest(const string& transport)
ASSERT_EQ(channel.GetSocket().GetLinger(), 300);
channel.GetSocket().SetSndBufSize(500);
if (transport == "nanomsg") { // nanomsg doesn't use this option and the getter always returns -1
ASSERT_EQ(channel.GetSocket().GetSndBufSize(), -1);
} else {
ASSERT_EQ(channel.GetSocket().GetSndBufSize(), 500);
}
ASSERT_EQ(channel.GetSocket().GetSndBufSize(), 500);
channel.GetSocket().SetRcvBufSize(500);
if (transport == "nanomsg") { // nanomsg doesn't use this option and the getter always returns -1
ASSERT_EQ(channel.GetSocket().GetRcvBufSize(), -1);
} else {
ASSERT_EQ(channel.GetSocket().GetRcvBufSize(), 500);
}
ASSERT_EQ(channel.GetSocket().GetRcvBufSize(), 500);
channel.GetSocket().SetSndKernelSize(8000);
ASSERT_EQ(channel.GetSocket().GetSndKernelSize(), 8000);
@@ -88,11 +76,4 @@ TEST(Options, shmem)
RunOptionsTest("shmem");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(Options, nanomsg)
{
RunOptionsTest("nanomsg");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace

7
test/transport/_transfer_timeout.cxx
View File

@@ -41,11 +41,4 @@ TEST(TransferTimeout, shmem)
EXPECT_EXIT(RunTransferTimeout("shmem"), ::testing::ExitedWithCode(0), "Transfer timeout test successfull");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(TransferTimeout, nanomsg)
{
EXPECT_EXIT(RunTransferTimeout("nanomsg"), ::testing::ExitedWithCode(0), "Transfer timeout test successfull");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace