diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..3f36b4e256ebd1f263105fd89e1096a406a226a8 --- /dev/null +++ b/README.md @@ -0,0 +1,37 @@ +# Startup + +- [Introduction](#section11660541593) +- [Directory Structure](#section161941989596) +- [Repositories Involved](#section1371113476307) + +## Introduction + +Appspawn is responsible for creating application process and setting process information function. + +## Directory Structure + +``` +base/startup/appspawn_standard +├── include # include directory +├── parameter # system parameters +├── src # source code +│ └── socket # encapsulation of socket basic library +└── test # test code +``` + +## Repositories Involved + +Startup subsystem + +hmf/startup/syspara\_lite + +**hmf/startup/appspawn_standard** + +hmf/startup/appspawn\_lite + +hmf/startup/bootstrap\_lite + +hmf/startup/startup + +hmf/startup/systemrestore + diff --git a/include/appspawn_server.h b/include/appspawn_server.h index f914d45ed41888fc78f6eb42a3498bbaf5acf8bf..fab78ad623c4065830b80191b4b14d20d5cfe341 100644 --- a/include/appspawn_server.h +++ b/include/appspawn_server.h @@ -25,7 +25,6 @@ namespace OHOS { namespace AppSpawn { - class AppSpawnServer { public: /** @@ -140,7 +139,6 @@ private: std::function errHandlerHook_ = nullptr; bool isRunning_{}; }; - } // namespace AppSpawn } // namespace OHOS diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 8dd64868a4f897f8bdd70a0dc1a981553fbe902d..834ebc4302c1dc8ab0c0a85a2b90e8e17a31c541 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -32,7 +32,6 @@ namespace OHOS { namespace AppSpawn { - namespace { constexpr int32_t ERR_PIPE_FAIL = -100; constexpr int32_t MAX_LEN_SHORT_NAME = 16; @@ -51,7 +50,7 @@ static constexpr HiLogLabel LABEL = {LOG_CORE, 0, "AppSpawnServer"}; extern "C" { #endif -static void SignalHandler(int) /* signal_number */ +static void SignalHandler([[maybe_unused]] int sig) { pid_t pid; int status; diff --git a/src/socket/appspawn_socket.cpp b/src/socket/appspawn_socket.cpp index 2e11106fd3acf8884f20f6817133f7dd16d24d89..1eb2362b413d74d9ba8b958f6640268758f1cf23 100755 --- a/src/socket/appspawn_socket.cpp +++ b/src/socket/appspawn_socket.cpp @@ -130,7 +130,7 @@ int AppSpawnSocket::WriteSocketMessage(int socketFd, const void *buf, int len) ssize_t written = 0; ssize_t remain = static_cast(len); const uint8_t *offset = reinterpret_cast(buf); - for (ssize_t wLen; remain > 0; offset += wLen, remain -= wLen, written += wLen) { + for (ssize_t wLen = 0; remain > 0; offset += wLen, remain -= wLen, written += wLen) { wLen = write(socketFd, offset, remain); HiLog::Debug(LABEL, "socket fd %d, wLen %zd", socketFd, wLen); if ((wLen <= 0) && (errno != EINTR)) { diff --git a/test/mock/include/main_thread.h b/test/mock/include/main_thread.h index 6c503be051555fb68cfc33349391d76bb8f3bd92..1ebc490e244433613ec2c2b1493e48290163ab8c 100644 --- a/test/mock/include/main_thread.h +++ b/test/mock/include/main_thread.h @@ -18,9 +18,7 @@ namespace OHOS { namespace AppExecFwk { - -class MainThread { - +class MainThread { public: MainThread() = default; virtual ~MainThread() = default; diff --git a/test/mock/include/mock_client_socket.h b/test/mock/include/mock_client_socket.h index 659087568c1a5da8ac023ff08845d69782157dbc..0a9bb3a183248f723e7605cae6e3103905fb7111 100644 --- a/test/mock/include/mock_client_socket.h +++ b/test/mock/include/mock_client_socket.h @@ -18,7 +18,6 @@ namespace OHOS { namespace AppSpawn { - class MockClientSocket : public ClientSocket { public: virtual ~MockClientSocket() = default; @@ -31,6 +30,5 @@ public: MOCK_METHOD2(WriteSocketMessage, int32_t(const void *buf, int32_t len)); MOCK_METHOD2(ReadSocketMessage, int32_t(void *buf, int32_t len)); }; - } // namespace AppSpawn } // namespace OHOS diff --git a/test/mock/include/mock_server_socket.h b/test/mock/include/mock_server_socket.h index 5e16784157c8e6ec129114bdd3d445e41e8fee1c..3cdbf36fac9cf36db77dbe32f3d5aa5707100842 100644 --- a/test/mock/include/mock_server_socket.h +++ b/test/mock/include/mock_server_socket.h @@ -164,6 +164,5 @@ public: private: std::mutex mutex_; }; - } // namespace AppSpawn } // namespace OHOS diff --git a/test/mock/src/main_thread.cpp b/test/mock/src/main_thread.cpp index 8ca7af851cdc87b2f3a3ebd473818b80e8297065..da611e2f8efff728ba4cdbc43f3b2b410e05213a 100644 --- a/test/mock/src/main_thread.cpp +++ b/test/mock/src/main_thread.cpp @@ -25,6 +25,5 @@ void MainThread::Start() { HiLog::Info(LABEL, "Start"); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/test/mock/src/server_socket.cpp b/test/mock/src/server_socket.cpp index 4f443907abffda8d7da987656a4784838cfc7524..2ffd30e4ff84d19c976eaf1e685a0bfb15dc7b12 100644 --- a/test/mock/src/server_socket.cpp +++ b/test/mock/src/server_socket.cpp @@ -89,6 +89,5 @@ int ServerSocket::WaitForConnection() HiLog::Info(LABEL, "WaitForConnection"); return 0; } - } // namespace AppSpawn } // namespace OHOS diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index f23568715f0ec133b510da0989cf73765f2a4e58..6a8bd078ca4114f0cfed122b530d4d49de3e75ee 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -17,7 +17,7 @@ import("//build/test.gni") ohos_moduletest("AppSpawnModuleTest") { module_out_path = "${module_output_path}" - sources = [ "${appspawn_path}/test/moduletest/appspawn_mst_test.cpp" ] + sources = [ "${appspawn_path}/test/moduletest/appspawn_module_test.cpp" ] include_dirs = [ "//utils/native/base/include", diff --git a/test/moduletest/appspawn_mst_test.cpp b/test/moduletest/appspawn_module_test.cpp similarity index 95% rename from test/moduletest/appspawn_mst_test.cpp rename to test/moduletest/appspawn_module_test.cpp index 78a665e777b2cd57da1f6b4c528633db5f40d502..826318745409ae29e0e97b70c1fb2ee55e7d6044 100644 --- a/test/moduletest/appspawn_mst_test.cpp +++ b/test/moduletest/appspawn_module_test.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" #include "hilog/log.h" #include -#include +#include "cstdio" #include #include "securec.h" @@ -49,7 +49,6 @@ const char *DELIMITER_NEWLINE = "\n"; char buffer[BUFFER_SIZE]; int32_t newPid = 0; int32_t retryCount = 0; - } // namespace bool checkFileIsExists(const char *filepath) @@ -152,7 +151,7 @@ std::size_t getGids(const int32_t &pid, std::vector &gids) groupsPtr = groupsPtr + GROUPS_POSITION_MOVE; } // Get the row content of Groups - char *saveptr = NULL; + char *saveptr = nullptr; char *line = strtok_r(groupsPtr, DELIMITER_NEWLINE, &saveptr); if (line == nullptr || strlen(line) > BUFFER_SIZE) { HiLog::Error(LABEL, "get Groups line info failed."); @@ -171,7 +170,6 @@ std::size_t getGids(const int32_t &pid, std::vector &gids) bool checkGids(const int32_t &pid, const AppSpawnStartMsg ¶ms) { - // Get Gids std::vector gids; std::size_t gCount = getGids(pid, gids); @@ -184,7 +182,6 @@ bool checkGids(const int32_t &pid, const AppSpawnStartMsg ¶ms) bool checkGidsCount(const int32_t &pid, const AppSpawnStartMsg ¶ms) { - // Get GidsCount std::vector gids; std::size_t gCount = getGids(pid, gids); @@ -228,7 +225,6 @@ bool checkProcName(const int32_t &pid, const AppSpawnStartMsg ¶ms) } else { HiLog::Error(LABEL, "Getting procName failed."); } - pclose(fp); return CHECK_ERROR; @@ -359,7 +355,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_listen_001, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_listen_002, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_listen_002 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); @@ -384,7 +380,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_listen_002, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_001, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_fork_001 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -414,7 +410,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_001, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_002, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_fork_002 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -444,7 +440,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_002, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_001, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_001 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -476,7 +472,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_001, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_002, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_002 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -508,7 +504,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_002, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_003, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_003 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -540,7 +536,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_003, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_004, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_004 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -572,7 +568,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_004, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_005, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_005 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -604,7 +600,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_005, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_006, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_006 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -636,7 +632,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_006, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_007, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_007 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -668,7 +664,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_007, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_008, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setUid_008 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -700,7 +696,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_008, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_001, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setProcName_001 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -733,7 +729,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_001, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_002, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_setProcName_002 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -764,7 +760,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_002, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_001, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_recycleProc_001 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); @@ -798,7 +794,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_001, TestSize.Level0) HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_002, TestSize.Level0) { HiLog::Info(LABEL, "AppSpawn_HF_recycleProc_002 start"); - std::shared_ptr appSpawnClient = std::make_shared(); + std::unique_ptr appSpawnClient = std::make_unique(); std::shared_ptr appSpawnSocket = std::make_shared(); appSpawnClient->SetSocket(appSpawnSocket); EXPECT_EQ(ERR_OK, appSpawnClient->OpenConnection()); diff --git a/test/unittest/app_spawn_server_test/app_spawn_server_mock_test.cpp b/test/unittest/app_spawn_server_test/app_spawn_server_mock_test.cpp index 2827cfffedef7af72f78aece3a52b176ef41bf45..ebe9962049719481ac1279aae9d49a2351c81206 100644 --- a/test/unittest/app_spawn_server_test/app_spawn_server_mock_test.cpp +++ b/test/unittest/app_spawn_server_test/app_spawn_server_mock_test.cpp @@ -40,17 +40,15 @@ public: public: static constexpr int TEST_WAIT_TIME = 50 * 1000; // 50 ms protected: - std::unique_ptr appSpawnServer_; - std::shared_ptr mockServerSocket_; + std::unique_ptr appSpawnServer_ = nullptr; + std::shared_ptr mockServerSocket_ = nullptr; }; void AppSpawnServerMockTest::SetUpTestCase() -{ -} +{} void AppSpawnServerMockTest::TearDownTestCase() -{ -} +{} void AppSpawnServerMockTest::SetUp() { diff --git a/test/unittest/app_spawn_server_test/app_spawn_server_override_test.cpp b/test/unittest/app_spawn_server_test/app_spawn_server_override_test.cpp index f0f4ffc3ff15c8622e4b9b5c93f7f0747e03202d..7deb9969d1615c4c6a92a010642c2345522acf23 100644 --- a/test/unittest/app_spawn_server_test/app_spawn_server_override_test.cpp +++ b/test/unittest/app_spawn_server_test/app_spawn_server_override_test.cpp @@ -38,16 +38,14 @@ public: public: static constexpr int TEST_WAIT_TIME = 50 * 1000; // 50 ms protected: - std::unique_ptr appSpawnServer_; + std::unique_ptr appSpawnServer_ = nullptr; }; void AppSpawnServerOverrideTest::SetUpTestCase() -{ -} +{} void AppSpawnServerOverrideTest::TearDownTestCase() -{ -} +{} void AppSpawnServerOverrideTest::SetUp() { @@ -98,11 +96,11 @@ HWTEST_F(AppSpawnServerOverrideTest, App_Spawn_Server_Override_002, TestSize.Lev { GTEST_LOG_(INFO) << "App_Spawn_Server_Override_002 start"; - char* longProcName = nullptr; + char *longProcName = nullptr; int64_t longProcNameLen = sizeof(longProcName); char processName[16] = "LongNameTest"; int32_t len = sizeof(processName); - + EXPECT_EQ(-EINVAL, appSpawnServer_->SetProcessName(longProcName, longProcNameLen, processName, len)); GTEST_LOG_(INFO) << "App_Spawn_Server_Override_002 end"; @@ -122,7 +120,7 @@ HWTEST_F(AppSpawnServerOverrideTest, App_Spawn_Server_Override_003, TestSize.Lev char longProcName[20] = "longProcName"; int64_t longProcNameLen = sizeof(longProcName); - char* processName = nullptr; + char *processName = nullptr; int32_t len = sizeof(processName); EXPECT_EQ(-EINVAL, appSpawnServer_->SetProcessName(longProcName, longProcNameLen, processName, len));