diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 09:33:13 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 09:33:13 +0900 |
commit | 32b7a22dd257ca1dd350601cd7495d3f04b5c91b (patch) | |
tree | d194abf3b96abcf48d7cbc1f31774034d4706113 /task_manager/server | |
parent | 7ba873861b02b878d0dcefa3104981c57e71deac (diff) |
ss-taskmanager branch 0.1sandbox/ToshikazuOhiwa/ss-taskmanager
Diffstat (limited to 'task_manager/server')
32 files changed, 33 insertions, 118 deletions
diff --git a/task_manager/server/Makefile b/task_manager/server/Makefile index a559a643..7e7bfbdc 100644 --- a/task_manager/server/Makefile +++ b/task_manager/server/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/INI_API.h b/task_manager/server/include/system_service/INI_API.h index b089a84b..871be5e3 100644 --- a/task_manager/server/include/system_service/INI_API.h +++ b/task_manager/server/include/system_service/INI_API.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/INI_API.hpp b/task_manager/server/include/system_service/INI_API.hpp index 17df82c4..00fe7339 100644 --- a/task_manager/server/include/system_service/INI_API.hpp +++ b/task_manager/server/include/system_service/INI_API.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/Primary_common.h b/task_manager/server/include/system_service/Primary_common.h index aebb1943..e0624bba 100644 --- a/task_manager/server/include/system_service/Primary_common.h +++ b/task_manager/server/include/system_service/Primary_common.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/sysup.h b/task_manager/server/include/system_service/sysup.h index 517c1d74..ef930a4b 100644 --- a/task_manager/server/include/system_service/sysup.h +++ b/task_manager/server/include/system_service/sysup.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/sysup_from.h b/task_manager/server/include/system_service/sysup_from.h index 04189279..be7e0feb 100644 --- a/task_manager/server/include/system_service/sysup_from.h +++ b/task_manager/server/include/system_service/sysup_from.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/task_manager.h b/task_manager/server/include/system_service/task_manager.h index 74dc7c12..82d23fb7 100644 --- a/task_manager/server/include/system_service/task_manager.h +++ b/task_manager/server/include/system_service/task_manager.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/tskm.h b/task_manager/server/include/system_service/tskm.h index 56fa6ab7..1a2f962d 100644 --- a/task_manager/server/include/system_service/tskm.h +++ b/task_manager/server/include/system_service/tskm.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/tskm_local_type.h b/task_manager/server/include/system_service/tskm_local_type.h index 7359ce18..79831aa1 100644 --- a/task_manager/server/include/system_service/tskm_local_type.h +++ b/task_manager/server/include/system_service/tskm_local_type.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/tskm_svc.h b/task_manager/server/include/system_service/tskm_svc.h index 725386f8..8b255818 100644 --- a/task_manager/server/include/system_service/tskm_svc.h +++ b/task_manager/server/include/system_service/tskm_svc.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/system_service/tskm_type.h b/task_manager/server/include/system_service/tskm_type.h index 665f2a2e..7d1f818e 100644 --- a/task_manager/server/include/system_service/tskm_type.h +++ b/task_manager/server/include/system_service/tskm_type.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_comm.h b/task_manager/server/include/tskm_comm.h index 0ffd3523..c884be96 100644 --- a/task_manager/server/include/tskm_comm.h +++ b/task_manager/server/include/tskm_comm.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_debug.h b/task_manager/server/include/tskm_debug.h index 56ee0c58..ae963a8f 100644 --- a/task_manager/server/include/tskm_debug.h +++ b/task_manager/server/include/tskm_debug.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_main.h b/task_manager/server/include/tskm_main.h index 75256a85..24ba5f1f 100644 --- a/task_manager/server/include/tskm_main.h +++ b/task_manager/server/include/tskm_main.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_port_pf.h b/task_manager/server/include/tskm_port_pf.h index 87e0235c..31da5aba 100644 --- a/task_manager/server/include/tskm_port_pf.h +++ b/task_manager/server/include/tskm_port_pf.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_port_subsys.h b/task_manager/server/include/tskm_port_subsys.h index 4c8b7c1f..3dc3565a 100644 --- a/task_manager/server/include/tskm_port_subsys.h +++ b/task_manager/server/include/tskm_port_subsys.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_shutdown.h b/task_manager/server/include/tskm_shutdown.h index e44c09ee..bb76d3c5 100644 --- a/task_manager/server/include/tskm_shutdown.h +++ b/task_manager/server/include/tskm_shutdown.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_state.h b/task_manager/server/include/tskm_state.h index c0145603..748d25e1 100644 --- a/task_manager/server/include/tskm_state.h +++ b/task_manager/server/include/tskm_state.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_wakeup.h b/task_manager/server/include/tskm_wakeup.h index bb5b3d80..d4a11932 100644 --- a/task_manager/server/include/tskm_wakeup.h +++ b/task_manager/server/include/tskm_wakeup.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/include/tskm_watch.h b/task_manager/server/include/tskm_watch.h index 6685e046..d1aced57 100644 --- a/task_manager/server/include/tskm_watch.h +++ b/task_manager/server/include/tskm_watch.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/pri_main.cpp b/task_manager/server/src/pri_main.cpp index e572e7a4..2c87623b 100644 --- a/task_manager/server/src/pri_main.cpp +++ b/task_manager/server/src/pri_main.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_api.cpp b/task_manager/server/src/tskm_api.cpp index a9943ba1..94c8226e 100644 --- a/task_manager/server/src/tskm_api.cpp +++ b/task_manager/server/src/tskm_api.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_comm.cpp b/task_manager/server/src/tskm_comm.cpp index c110c135..b177b9b8 100644 --- a/task_manager/server/src/tskm_comm.cpp +++ b/task_manager/server/src/tskm_comm.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_debug.cpp b/task_manager/server/src/tskm_debug.cpp index 225c4b5c..5881f9af 100644 --- a/task_manager/server/src/tskm_debug.cpp +++ b/task_manager/server/src/tskm_debug.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,77 +40,6 @@ tskm_convState2Str(TSKM_STATE_t state) { } const char* -tskm_convLocalStep2Str(TSKM_LOCAL_STEP_t localStep) { - switch (localStep) { // LCOV_EXCL_BR_LINE 7:debug code - case TSKM_LSTEP_LAST: - return "LAST"; - case TSKM_LSTEP_SHM: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "SHM"; - case TSKM_LSTEP_BUPCHK: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "BUPCHK"; - case TSKM_LSTEP_ALL: - return "ALL"; - case 0: - return "0"; - case 1: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "1"; - // LCOV_EXCL_STOP - case 2: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "2"; - // LCOV_EXCL_STOP - case 3: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "3"; - // LCOV_EXCL_STOP - case 4: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "4"; - // LCOV_EXCL_STOP - case 5: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "5"; - // LCOV_EXCL_STOP - case 6: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "6"; - // LCOV_EXCL_STOP - case 7: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "7"; - // LCOV_EXCL_STOP - case 8: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "8"; - // LCOV_EXCL_STOP - case 9: - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "9"; - // LCOV_EXCL_STOP - default: - break; - } - // LCOV_EXCL_START 7:debug code - AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert - return "UNKNONW"; - // LCOV_EXCL_STOP -} - -const char* tskm_convEvent2Str(TSKM_EVENT_t event) { switch (event) { // LCOV_EXCL_BR_LINE 7:debug code case TSKM_EV_NOP: diff --git a/task_manager/server/src/tskm_main.cpp b/task_manager/server/src/tskm_main.cpp index 66a0b296..33c10fa7 100644 --- a/task_manager/server/src/tskm_main.cpp +++ b/task_manager/server/src/tskm_main.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_port_pf.cpp b/task_manager/server/src/tskm_port_pf.cpp index 72a52dd2..f4272553 100644 --- a/task_manager/server/src/tskm_port_pf.cpp +++ b/task_manager/server/src/tskm_port_pf.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_port_subsys.cpp b/task_manager/server/src/tskm_port_subsys.cpp index a90fa4bc..cfdec490 100644 --- a/task_manager/server/src/tskm_port_subsys.cpp +++ b/task_manager/server/src/tskm_port_subsys.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -292,12 +292,6 @@ int tskm_sub_resmRcv(TSKM_EVENT_INFO_t* p_ev) { } int tskm_sub_setWakeupOrder(const char* p_order) { - EFrameworkunifiedStatus taskmanagerRet; - std::string order = p_order; - - taskmanagerRet = SetWakeupOrderToSystemManager(order); - if (taskmanagerRet != eFrameworkunifiedStatusOK) { - return -1; - } + // Under consideration return 0; } // LCOV_EXCL_BR_LINE 10: Gcov constraints (last row) diff --git a/task_manager/server/src/tskm_shutdown.cpp b/task_manager/server/src/tskm_shutdown.cpp index abee7297..1699f90f 100644 --- a/task_manager/server/src/tskm_shutdown.cpp +++ b/task_manager/server/src/tskm_shutdown.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_state.cpp b/task_manager/server/src/tskm_state.cpp index 1018eb3c..b7770901 100644 --- a/task_manager/server/src/tskm_state.cpp +++ b/task_manager/server/src/tskm_state.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_svc.cpp b/task_manager/server/src/tskm_svc.cpp index a7dda206..2f9abc1e 100644 --- a/task_manager/server/src/tskm_svc.cpp +++ b/task_manager/server/src/tskm_svc.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -109,10 +109,6 @@ TSKM_STATIC TSKM_ERR_t wakeupRequest(TSKM_SVC_CTX_t* p_svc, int ret; bzero(&ev, sizeof(ev)); - TSKM_PRINTF(TSKM_LOG_SVCSTATE, "WAKEUPREQ %s to %s(%d)", - tskm_convLocalStep2Str(p_req->localStep), p_svc->attr->name, - p_svc->pid); - ev.event = TSKM_EV_PRI_REQ_WAKEUP; ev.errCode = TSKM_E_OK; ev.prm.reqWakeup.svcId = p_svc->attr->svcId; @@ -915,10 +911,6 @@ TSKM_ERR_t tskm_svcDownRequest(TSKM_SVC_CTX_t* p_svc, return TSKM_E_OK; } - TSKM_PRINTF(TSKM_LOG_SVCSTATE, "DOWNREQ %s to %s(%d)", - tskm_convLocalStep2Str(p_req->localStep), p_svc->attr->name, - p_svc->pid); - ev.event = TSKM_EV_PRI_REQ_DOWN; ev.errCode = TSKM_E_OK; ev.prm.reqDown.localStep = p_req->localStep; diff --git a/task_manager/server/src/tskm_wakeup.cpp b/task_manager/server/src/tskm_wakeup.cpp index 5988e228..b5c6e896 100644 --- a/task_manager/server/src/tskm_wakeup.cpp +++ b/task_manager/server/src/tskm_wakeup.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/task_manager/server/src/tskm_watch.cpp b/task_manager/server/src/tskm_watch.cpp index 5ed9313c..455de0b3 100644 --- a/task_manager/server/src/tskm_watch.cpp +++ b/task_manager/server/src/tskm_watch.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |