From 10e66fffb6987990a6379215116d7c31932ae9aa Mon Sep 17 00:00:00 2001 From: xlei1030 Date: Fri, 4 Mar 2022 10:49:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9cppcrash-appspawn-?= =?UTF-8?q?0-20170806005932?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xlei1030 --- src/appspawn_server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 4f99f948..47574211 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -395,6 +395,7 @@ bool AppSpawnServer::ServerMain(char *longProcName, int64_t longProcNameLen) kill(iter->first, SIGKILL); appMap_.erase(iter); } + quick_exit(0); return false; } -- Gitee From 1fe680aeb706a6609932dd7493872c4424d55862 Mon Sep 17 00:00:00 2001 From: xlei1030 Date: Mon, 7 Mar 2022 09:35:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xlei1030 --- src/appspawn_server.cpp | 2 ++ test/BUILD.gn | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 47574211..5a0b3f19 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -395,7 +395,9 @@ bool AppSpawnServer::ServerMain(char *longProcName, int64_t longProcNameLen) kill(iter->first, SIGKILL); appMap_.erase(iter); } +#ifndef TEST_EXIT quick_exit(0); +#endif return false; } diff --git a/test/BUILD.gn b/test/BUILD.gn index 2df1ee15..3e317e94 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -35,7 +35,7 @@ group("moduletest") { config("appspawn_test_config") { configs = [] - defines = [] + defines = ["TEST_EXIT"] include_dirs = [ "${appspawn_path}/test/mock/include", -- Gitee From 7e2b9fded9a9ca8fff0c87e356328e72dbe091f3 Mon Sep 17 00:00:00 2001 From: xlei1030 Date: Mon, 7 Mar 2022 10:39:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xlei1030 --- src/appspawn_server.cpp | 12 +++++++++--- src/include/appspawn_server.h | 2 ++ test/BUILD.gn | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 5a0b3f19..da415ca3 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -344,6 +344,14 @@ int AppSpawnServer::StartApp(char *longProcName, int64_t longProcNameLen, return (buff == ERR_OK) ? 0 : buff; } +void AppSpawnServer::QuickExitMain() +{ +#ifndef TEST_EXIT + quick_exit(0); +#endif + return; +} + bool AppSpawnServer::ServerMain(char *longProcName, int64_t longProcNameLen) { if (socket_->RegisterServerSocket() != 0) { @@ -395,9 +403,7 @@ bool AppSpawnServer::ServerMain(char *longProcName, int64_t longProcNameLen) kill(iter->first, SIGKILL); appMap_.erase(iter); } -#ifndef TEST_EXIT - quick_exit(0); -#endif + QuickExitMain(); return false; } diff --git a/src/include/appspawn_server.h b/src/include/appspawn_server.h index 694b3e43..10f491d1 100644 --- a/src/include/appspawn_server.h +++ b/src/include/appspawn_server.h @@ -193,6 +193,8 @@ private: void WaitRebootEvent(); void HandleSignal(); + + void QuickExitMain(); private: const std::string deviceNull_ = "/dev/null"; std::string socketName_ {}; diff --git a/test/BUILD.gn b/test/BUILD.gn index 3e317e94..8bc4665d 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -35,7 +35,7 @@ group("moduletest") { config("appspawn_test_config") { configs = [] - defines = ["TEST_EXIT"] + defines = [ "TEST_EXIT" ] include_dirs = [ "${appspawn_path}/test/mock/include", -- Gitee