aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt3
-rw-r--r--test/bench_network.cpp1
-rw-r--r--test/bench_network_tls.cpp165
-rw-r--r--test/test_msgnet.cpp3
-rw-r--r--test/test_msgnet_c.c3
-rw-r--r--test/test_p2p_stress.cpp1
6 files changed, 174 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2a1a8f0..e7c5813 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -41,5 +41,8 @@ target_link_libraries(test_queue salticidae_static pthread)
add_executable(bench_network bench_network.cpp)
target_link_libraries(bench_network salticidae_static pthread)
+add_executable(bench_network_tls bench_network_tls.cpp)
+target_link_libraries(bench_network_tls salticidae_static pthread)
+
add_executable(test_msgnet_c test_msgnet_c.c)
target_link_libraries(test_msgnet_c salticidae_static pthread)
diff --git a/test/bench_network.cpp b/test/bench_network.cpp
index ca22db4..f8d3070 100644
--- a/test/bench_network.cpp
+++ b/test/bench_network.cpp
@@ -120,6 +120,7 @@ struct MyNet: public MsgNetworkByteOp {
/* try to reconnect to the same address */
connect(conn->get_addr(), false);
}
+ return true;
});
}
diff --git a/test/bench_network_tls.cpp b/test/bench_network_tls.cpp
new file mode 100644
index 0000000..bb5d0c1
--- /dev/null
+++ b/test/bench_network_tls.cpp
@@ -0,0 +1,165 @@
+/**
+ * Copyright (c) 2018 Cornell University.
+ *
+ * Author: Ted Yin <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <cstdio>
+#include <string>
+#include <functional>
+#include <thread>
+#include <signal.h>
+
+/* disable SHA256 checksum */
+#define SALTICIDAE_NOCHECKSUM
+
+#include "salticidae/msg.h"
+#include "salticidae/event.h"
+#include "salticidae/network.h"
+#include "salticidae/stream.h"
+
+using salticidae::NetAddr;
+using salticidae::DataStream;
+using salticidae::MsgNetwork;
+using salticidae::htole;
+using salticidae::letoh;
+using salticidae::bytearray_t;
+using salticidae::TimerEvent;
+using salticidae::ThreadCall;
+using std::placeholders::_1;
+using std::placeholders::_2;
+using opcode_t = uint8_t;
+
+struct MsgBytes {
+ static const opcode_t opcode = 0xa;
+ DataStream serialized;
+ bytearray_t bytes;
+ MsgBytes(size_t size) {
+ bytes.resize(size);
+ serialized << htole((uint32_t)size) << bytes;
+ }
+ MsgBytes(DataStream &&s) {
+ uint32_t len;
+ s >> len;
+ len = letoh(len);
+ auto base = s.get_data_inplace(len);
+ bytes = bytearray_t(base, base + len);
+ }
+};
+
+const opcode_t MsgBytes::opcode;
+
+using MsgNetworkByteOp = MsgNetwork<opcode_t>;
+
+struct MyNet: public MsgNetworkByteOp {
+ const std::string name;
+ const NetAddr peer;
+ TimerEvent ev_period_stat;
+ ThreadCall tcall;
+ size_t nrecv;
+ std::function<void(ThreadCall::Handle &)> trigger;
+
+ MyNet(const salticidae::EventContext &ec,
+ const std::string name,
+ const NetAddr &peer,
+ double stat_timeout = -1):
+ MsgNetworkByteOp(ec, MsgNetworkByteOp::Config(
+ ConnPool::Config().queue_capacity(65536).enable_tls(true).tls_cert_file("all.pem").tls_key_file("all.pem")).burst_size(1000)),
+ name(name),
+ peer(peer),
+ ev_period_stat(ec, [this, stat_timeout](TimerEvent &) {
+ SALTICIDAE_LOG_INFO("%.2f mps", nrecv / (double)stat_timeout);
+ fflush(stderr);
+ nrecv = 0;
+ ev_period_stat.add(stat_timeout);
+ }),
+ tcall(ec),
+ nrecv(0) {
+ /* message handler could be a bound method */
+ reg_handler(salticidae::generic_bind(&MyNet::on_receive_bytes, this, _1, _2));
+ if (stat_timeout > 0)
+ ev_period_stat.add(0);
+ reg_conn_handler([this, ec](const ConnPool::conn_t &conn, bool connected) {
+ if (connected)
+ {
+ if (conn->get_mode() == MyNet::Conn::ACTIVE)
+ {
+ printf("[%s] Connected, sending hello.\n", this->name.c_str());
+ /* send the first message through this connection */
+ trigger = [this, conn](ThreadCall::Handle &) {
+ send_msg(MsgBytes(256), salticidae::static_pointer_cast<Conn>(conn));
+ if (conn->get_mode() != MyNet::Conn::DEAD)
+ tcall.async_call(trigger);
+ };
+ tcall.async_call(trigger);
+ }
+ else
+ printf("[%s] Passively connected, waiting for greetings.\n", this->name.c_str());
+ }
+ else
+ {
+ printf("[%s] Disconnected, retrying.\n", this->name.c_str());
+ /* try to reconnect to the same address */
+ connect(conn->get_addr(), false);
+ }
+ return true;
+ });
+ }
+
+ void on_receive_bytes(MsgBytes &&msg, const conn_t &conn) {
+ nrecv++;
+ }
+};
+
+salticidae::EventContext ec;
+NetAddr alice_addr("127.0.0.1:1234");
+NetAddr bob_addr("127.0.0.1:1235");
+
+int main() {
+ salticidae::BoxObj<MyNet> alice = new MyNet(ec, "Alice", bob_addr, 10);
+ alice->start();
+ alice->listen(alice_addr);
+ salticidae::EventContext tec;
+ salticidae::BoxObj<ThreadCall> tcall = new ThreadCall(tec);
+ std::thread bob_thread([&tec]() {
+ MyNet bob(tec, "Bob", alice_addr);
+ bob.start();
+ bob.connect(alice_addr);
+ try {
+ tec.dispatch();
+ } catch (std::exception &) {}
+ SALTICIDAE_LOG_INFO("thread exiting");
+ });
+ auto shutdown = [&](int) {
+ tcall->async_call([&](salticidae::ThreadCall::Handle &) {
+ tec.stop();
+ });
+ alice = nullptr;
+ ec.stop();
+ bob_thread.join();
+ };
+ salticidae::SigEvent ev_sigint(ec, shutdown);
+ salticidae::SigEvent ev_sigterm(ec, shutdown);
+ ev_sigint.add(SIGINT);
+ ev_sigterm.add(SIGTERM);
+ ec.dispatch();
+ return 0;
+}
diff --git a/test/test_msgnet.cpp b/test/test_msgnet.cpp
index 088e0ff..7635af8 100644
--- a/test/test_msgnet.cpp
+++ b/test/test_msgnet.cpp
@@ -108,8 +108,9 @@ struct MyNet: public MsgNetworkByteOp {
{
printf("[%s] Disconnected, retrying.\n", this->name.c_str());
/* try to reconnect to the same address */
- connect(conn->get_addr());
+ connect(conn->get_addr(), false);
}
+ return true;
});
}
diff --git a/test/test_msgnet_c.c b/test/test_msgnet_c.c
index e6ebd14..f99c88b 100644
--- a/test/test_msgnet_c.c
+++ b/test/test_msgnet_c.c
@@ -117,7 +117,7 @@ void on_receive_ack(const msg_t *msg, const msgnetwork_conn_t *conn, void *userd
printf("[%s] the peer knows\n", name);
}
-void conn_handler(const msgnetwork_conn_t *conn, bool connected, void *userdata) {
+bool conn_handler(const msgnetwork_conn_t *conn, bool connected, void *userdata) {
msgnetwork_t *net = msgnetwork_conn_get_net(conn);
MyNet *n = (MyNet *)userdata;
const char *name = n->name;
@@ -142,6 +142,7 @@ void conn_handler(const msgnetwork_conn_t *conn, bool connected, void *userdata)
msgnetwork_connect(net, addr, &err);
check_err(&err);
}
+ return true;
}
void error_handler(const SalticidaeCError *err, bool fatal, void *userdata) {
diff --git a/test/test_p2p_stress.cpp b/test/test_p2p_stress.cpp
index 92e5bb4..1cb2ca3 100644
--- a/test/test_p2p_stress.cpp
+++ b/test/test_p2p_stress.cpp
@@ -113,6 +113,7 @@ void install_proto(AppContext &app, const size_t &seg_buff_size) {
send_rand(tc.state, static_pointer_cast<MyNet::Conn>(conn));
}
}
+ return true;
});
net.reg_error_handler([ec](const std::exception_ptr _err, bool fatal) {
try {
Powered by cgit, Themed by Ted Yin.