diff options
Diffstat (limited to 'framework_unified/client/NS_FrameworkCore/src')
35 files changed, 65 insertions, 49 deletions
diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp index f9837423..250edce2 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.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. @@ -269,7 +269,7 @@ EFrameworkunifiedStatus FrameworkunifiedCreateDispatcher(PCSTR cAppName, HANDLE ////////////////////////////////////////// EFrameworkunifiedStatus FrameworkunifiedDispatchBlock(HANDLE hApp) { EFrameworkunifiedStatus eStatus = eFrameworkunifiedStatusOK; - FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "+"); +// FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "+"); if (frameworkunifiedCheckValidAppHandle(hApp)) { CFrameworkunifiedFrameworkApp *pApp = static_cast<CFrameworkunifiedFrameworkApp *>(hApp); @@ -281,14 +281,14 @@ EFrameworkunifiedStatus FrameworkunifiedDispatchBlock(HANDLE hApp) { FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __FUNCTION__, "Error :: (%d) Failed on McReceive", eStatus); // LCOV_EXCL_BR_STOP } else { - FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message received on dispatcher:: Source: %s, Cmd: 0x%X, SessionId: %d ", - pApp->cMsgSrcName, pApp->uiProtocolCmd, pApp->uiSessionId); +// FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message received on dispatcher:: Source: %s, Cmd: 0x%X, SessionId: %d ", +// pApp->cMsgSrcName, pApp->uiProtocolCmd, pApp->uiSessionId); } } else { eStatus = eFrameworkunifiedStatusInvldHandle; } - FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "-"); +// FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "-"); return eStatus; } @@ -442,14 +442,18 @@ static void frameworkunifiedPrintRusage(HANDLE hApp, const struct rusage &start, pApp->max_occupy_time = occupy_time; } - FRAMEWORKUNIFIEDLOG(ZONE_NS_DEBUG_DUMP, __FUNCTION__, "cur:%d.%06d avg:%d.%06d max:%d.%06d", - occupy_time / 1000000, occupy_time % 1000000, - average / 1000000, average % 1000000, - pApp->max_occupy_time / 1000000, pApp->max_occupy_time % 1000000); +// FRAMEWORKUNIFIEDLOG(ZONE_NS_DEBUG_DUMP, __FUNCTION__, "cur:%d.%06d avg:%d.%06d max:%d.%06d", +// occupy_time / 1000000, occupy_time % 1000000, +// average / 1000000, average % 1000000, +// pApp->max_occupy_time / 1000000, pApp->max_occupy_time % 1000000); } static inline void frameworkunifiedGetRusage(struct rusage *r) { + if (r == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "r is NULL"); + return; + } memset(r, 0, sizeof(struct rusage)); if (getrusage(RUSAGE_THREAD, r) == -1) { // LCOV_EXCL_BR_START 15:marco defined in "native_service/ns_logger_if.h" @@ -820,10 +824,10 @@ EFrameworkunifiedStatus FrameworkunifiedDispatchProcess(HANDLE hApp) { FrameworkunifiedClearMsgData(hApp); eStatus = eFrameworkunifiedStatusOK; } else { - FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message processed. Status (0x%X) ::" - " Source: %s Command: 0x%x SessionId: %d.", - eStatus, pApp->cMsgSrcName != 0 ? pApp->cMsgSrcName : NULL, - pApp->uiProtocolCmd, pApp->uiSessionId); +// FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message processed. Status (0x%X) ::" +// " Source: %s Command: 0x%x SessionId: %d.", +// eStatus, pApp->cMsgSrcName != 0 ? pApp->cMsgSrcName : NULL, +// pApp->uiProtocolCmd, pApp->uiSessionId); } if (enable_rusage == TRUE) { @@ -1367,6 +1371,10 @@ EFrameworkunifiedStatus FrameworkunifiedDestroyDispatcherWithoutLoop(HANDLE hApp } static EFrameworkunifiedStatus GetDispatcherMqFD(HANDLE hApp, int *fd) { + if (fd == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "fd is NULL"); + return eFrameworkunifiedStatusNullPointer; + } EFrameworkunifiedStatus eStatus = eFrameworkunifiedStatusOK; if (frameworkunifiedCheckValidAppHandle(hApp)) { diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp index c7a8c77c..cb573c97 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp index 34773a27..cf079222 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp index 160003ef..29125271 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp index e9b42429..ea953c98 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp index 5ec8c526..063e3572 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp index 3b6fd912..7c9935be 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp index ea9b8e2e..80eec1fe 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp index 878cae7a..3a2d434a 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp index 76200bbf..468478ca 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp index 8c7a8853..986f3b34 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.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. @@ -153,6 +153,10 @@ EFrameworkunifiedStatus setChildThreadSched(EFrameworkunifiedSchedPolicy policy, /// child_thread_proc //////////////////////////////////////////////////////////////////////////////////////////// void *child_thread_proc(void *args) { + if (args == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "args is NULL"); + return NULL; + } PCData pcdata = *reinterpret_cast< PCData * >(args); // Create a local copy of data try { diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp index 849ee562..dccffa8c 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp index 29919f7f..88b5c501 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.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/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp index 58dfd5f5..0663b858 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.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/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 index 4263bdd7..025ec700 100644 --- a/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 @@ -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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp index 8b76e85f..0cb4d670 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp index 7830361e..d975e930 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp index 026f9583..6f273190 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp index 19f50bac..baac0d46 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp index 9ccbb927..a73408a8 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp index 303720ac..294dcf55 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp index ab825e80..8b361fa4 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp index 7f3df6e3..dfb2d5cd 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp index 84324231..7afabdb6 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp index af2b68f9..96402769 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp index 029df416..f6cdb098 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp index bdd1435a..da060f2a 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.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. @@ -896,7 +896,7 @@ EFrameworkunifiedStatus CFrameworkunifiedHSMParentFramework::CsFrameworkunifiedR try { HANDLE l_pHApp = FrameworkunifiedGetAppHandle(); CHKNULL(l_pHApp); - if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { + if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) // Publish Service available this can also be published from FrameworkunifiedOnStart callback if (eFrameworkunifiedStatusOK != (FrameworkunifiedPublishServiceAvailability(l_pHApp, TRUE))) { FRAMEWORKUNIFIEDLOG(ZONE_NS_WAR, __FUNCTION__, "warning:Failed to Publish service availability notification:0x%x ", @@ -929,7 +929,7 @@ EFrameworkunifiedStatus CFrameworkunifiedHSMParentFramework::CsFrameworkunifiedR HANDLE l_pHApp = FrameworkunifiedGetAppHandle(); CHKNULL(l_pHApp); - if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { + if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) // Publish Service available this can also be published from FrameworkunifiedOnStart callback if (eFrameworkunifiedStatusOK != (FrameworkunifiedPublishServiceAvailability(l_pHApp, FALSE))) { FRAMEWORKUNIFIEDLOG(ZONE_NS_WAR, __FUNCTION__, "Warning:Failed to set service availability notification:0x%x ", l_eStatus); diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp index 4a561bfc..6c44ebbb 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp index 1c285700..b5f9c0ae 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp index 30df607d..33dab562 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.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. @@ -87,6 +87,10 @@ EFrameworkunifiedStatus FrameworkunifiedCreateHSMDispatcherChild(PCSTR childName } void *child_hsm_thread_proc(void *args) { + if (args == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "args is NULL"); + return NULL; + } PCData pcdata = *reinterpret_cast< PCData * >(args); // Create a local copy of data try { diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp index 2c64a1a2..a8289a0a 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp index 1334fc61..97b6e3bb 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp index bf73e663..af90583b 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_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/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp index c37397bc..1162f61b 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.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/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile b/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile index ae3774a9..964a1f50 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/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. |