From 73ae5e5d5aaa63763b28f34b080b7e206d77cf21 Mon Sep 17 00:00:00 2001 From: fengzero Date: Mon, 15 May 2023 02:44:52 +0000 Subject: [PATCH] manager nng: set sendtimeout --- .github/workflows/check.yml | 1 + src/adapter/adapter.c | 4 ++-- src/core/manager.c | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d5c79afe..b05c524c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -57,6 +57,7 @@ jobs: - name: unit test run: | cd build + sudo apt-get update sudo apt install -y lcov ctest --output-on-failure -O tests/reports/ut.log --output-junit tests/reports/output.xml lcov --capture --directory . --output-file testneuron.info --test-name testneuron diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index b19879d9..ae4d9466 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -124,8 +124,8 @@ neu_adapter_t *neu_adapter_create(neu_adapter_info_t *info) rv = nng_pair1_open(&adapter->sock); assert(rv == 0); - nng_socket_set_int(adapter->sock, NNG_OPT_RECVBUF, 2048); - nng_socket_set_int(adapter->sock, NNG_OPT_SENDBUF, 2048); + nng_socket_set_int(adapter->sock, NNG_OPT_RECVBUF, 8192); + nng_socket_set_int(adapter->sock, NNG_OPT_SENDBUF, 8192); nng_socket_set_ms(adapter->sock, NNG_OPT_SENDTIMEO, 1000); nng_socket_get_int(adapter->sock, NNG_OPT_RECVFD, &adapter->recv_fd); diff --git a/src/core/manager.c b/src/core/manager.c index 903a253b..d4463e63 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -99,6 +99,7 @@ neu_manager_t *neu_manager_create() nng_socket_set_int(manager->socket, NNG_OPT_RECVBUF, 8192); nng_socket_set_int(manager->socket, NNG_OPT_SENDBUF, 8292); + nng_socket_set_ms(manager->socket, NNG_OPT_SENDTIMEO, 1000); nng_socket_get_int(manager->socket, NNG_OPT_RECVFD, ¶m.fd); manager->loop = neu_event_add_io(manager->events, param); @@ -899,6 +900,7 @@ inline static void forward_msg_dup(neu_manager_t *manager, nng_msg *msg, if (nng_sendmsg(manager->socket, out_msg, 0) == 0) { nlog_debug("forward msg to pipe %d", pipe.id); } else { + nlog_warn("forward msg to pipe %d fail", pipe.id); nng_msg_free(out_msg); } } @@ -914,6 +916,7 @@ inline static void forward_msg(neu_manager_t *manager, nng_msg *msg, if (nng_sendmsg(manager->socket, out_msg, 0) == 0) { nlog_debug("forward msg to %s", node); } else { + nlog_warn("forward msg to pipe (%s)%d fail", node, pipe.id); nng_msg_free(out_msg); } }