From 15ed354962bcc4e52b398ff8834b8843c3aca8bf Mon Sep 17 00:00:00 2001 From: zhaifenghw Date: Fri, 27 Aug 2021 10:29:48 +0000 Subject: [PATCH] workaround for sigabrt in libuv when starting up Signed-off-by: zhaifenghw --- src/common/session.cpp | 14 +++----------- src/daemon/main.cpp | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/common/session.cpp b/src/common/session.cpp index 724c8fe6..2283fc74 100644 --- a/src/common/session.cpp +++ b/src/common/session.cpp @@ -18,7 +18,9 @@ namespace Hdc { HdcSessionBase::HdcSessionBase(bool serverOrDaemonIn) { - // server/daemon common initialize + // server/daemon common initialization logic + string threadNum = std::to_string(SIZE_THREAD_POOL); + uv_os_setenv("UV_THREADPOOL_SIZE", threadNum.c_str()); uv_loop_init(&loopMain); WRITE_LOG(LOG_DEBUG, "loopMain init"); uv_rwlock_init(&mainAsync); @@ -28,16 +30,6 @@ HdcSessionBase::HdcSessionBase(bool serverOrDaemonIn) ctxUSB = nullptr; wantRestart = false; - // server/daemon common set - string threadNum = std::to_string(SIZE_THREAD_POOL); - uv_os_setenv("UV_THREADPOOL_SIZE", threadNum.c_str()); -#ifndef _WIN32 - // global signal detect - umask(0); - signal(SIGPIPE, SIG_IGN); // SIG_DFL - // prevent zoombie process, let 'init' process do process's clear - signal(SIGCHLD, SIG_IGN); -#endif #ifdef HDC_HOST if (serverOrDaemon) { libusb_init((libusb_context **)&ctxUSB); diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index 542908e9..820c383a 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -36,7 +36,7 @@ bool ForkChildCheck(int argc, const char *argv[]) // hdcd -fork #fork char modeSet[BUF_SIZE_TINY] = ""; Base::GetHdcProperty("persist.hdc.mode", modeSet, BUF_SIZE_TINY); - Base::PrintMessage("Background mode, persist.hdc.mode:[%s]", modeSet); + Base::PrintMessage("Background mode, persist.hdc.mode"); string workMode = modeSet; workMode = Base::Trim(workMode); if (workMode == CMDSTR_TMODE_TCP) { -- Gitee