diff options
Diffstat (limited to 'logger_service/server/include')
28 files changed, 59 insertions, 43 deletions
diff --git a/logger_service/server/include/loggerservicedebug_loggerservicelog.h b/logger_service/server/include/loggerservicedebug_loggerservicelog.h index 1564fb5d..5a2f56e8 100644 --- a/logger_service/server/include/loggerservicedebug_loggerservicelog.h +++ b/logger_service/server/include/loggerservicedebug_loggerservicelog.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/logger_service/server/include/loggerservicedebug_thread_if.h b/logger_service/server/include/loggerservicedebug_thread_if.h index 8203a68f..8a435114 100644 --- a/logger_service/server/include/loggerservicedebug_thread_if.h +++ b/logger_service/server/include/loggerservicedebug_thread_if.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/logger_service/server/include/loggerservicedebug_writer_Evntworker.h b/logger_service/server/include/loggerservicedebug_writer_Evntworker.h index 70dc1bea..cef5c183 100644 --- a/logger_service/server/include/loggerservicedebug_writer_Evntworker.h +++ b/logger_service/server/include/loggerservicedebug_writer_Evntworker.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/logger_service/server/include/readerWriter/reader/mem_reader.h b/logger_service/server/include/readerWriter/reader/mem_reader.h index 4d37242d..a5c65ec0 100644 --- a/logger_service/server/include/readerWriter/reader/mem_reader.h +++ b/logger_service/server/include/readerWriter/reader/mem_reader.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/logger_service/server/include/readerWriter/reader/queue_reader.h b/logger_service/server/include/readerWriter/reader/queue_reader.h index 3706d642..139796a7 100644 --- a/logger_service/server/include/readerWriter/reader/queue_reader.h +++ b/logger_service/server/include/readerWriter/reader/queue_reader.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/logger_service/server/include/readerWriter/reader/reader.h b/logger_service/server/include/readerWriter/reader/reader.h index 269cd8aa..7b0141de 100644 --- a/logger_service/server/include/readerWriter/reader/reader.h +++ b/logger_service/server/include/readerWriter/reader/reader.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/logger_service/server/include/readerWriter/reader_writer.h b/logger_service/server/include/readerWriter/reader_writer.h index 44c37bd4..b0754725 100644 --- a/logger_service/server/include/readerWriter/reader_writer.h +++ b/logger_service/server/include/readerWriter/reader_writer.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/logger_service/server/include/readerWriter/reader_writer_cfg.h b/logger_service/server/include/readerWriter/reader_writer_cfg.h index bc6602b5..b39353bc 100644 --- a/logger_service/server/include/readerWriter/reader_writer_cfg.h +++ b/logger_service/server/include/readerWriter/reader_writer_cfg.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/logger_service/server/include/readerWriter/writer/cached_file_writer.h b/logger_service/server/include/readerWriter/writer/cached_file_writer.h index 06d7bbce..ad286589 100644 --- a/logger_service/server/include/readerWriter/writer/cached_file_writer.h +++ b/logger_service/server/include/readerWriter/writer/cached_file_writer.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/logger_service/server/include/readerWriter/writer/file_writer.h b/logger_service/server/include/readerWriter/writer/file_writer.h index 190232b5..caf81c9b 100644 --- a/logger_service/server/include/readerWriter/writer/file_writer.h +++ b/logger_service/server/include/readerWriter/writer/file_writer.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/logger_service/server/include/readerWriter/writer/udp_file_writer.h b/logger_service/server/include/readerWriter/writer/udp_file_writer.h index 095ca352..65e58e0e 100644 --- a/logger_service/server/include/readerWriter/writer/udp_file_writer.h +++ b/logger_service/server/include/readerWriter/writer/udp_file_writer.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/logger_service/server/include/readerWriter/writer/udp_writer.h b/logger_service/server/include/readerWriter/writer/udp_writer.h index 34923e82..cf0944ad 100644 --- a/logger_service/server/include/readerWriter/writer/udp_writer.h +++ b/logger_service/server/include/readerWriter/writer/udp_writer.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/logger_service/server/include/readerWriter/writer/writer.h b/logger_service/server/include/readerWriter/writer/writer.h index d5a397f2..15d93aa6 100644 --- a/logger_service/server/include/readerWriter/writer/writer.h +++ b/logger_service/server/include/readerWriter/writer/writer.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/logger_service/server/include/ss_logger_cfg.h b/logger_service/server/include/ss_logger_cfg.h index 3e8da800..93aaef95 100644 --- a/logger_service/server/include/ss_logger_cfg.h +++ b/logger_service/server/include/ss_logger_cfg.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. @@ -73,9 +73,21 @@ enum EInsertEventType { eInsertEventInvalid }; +struct ExternalLogInfo { + std::string dirname; + std::string path; + BOOL remove; +}; + +struct ExternalLogList { + SI_32 num; + SI_32 max; + ExternalLogInfo* p_info; +}; + class CLoggerCfg { public: - CLoggerCfg(void) noexcept; + CLoggerCfg(void); ~CLoggerCfg(void); EFrameworkunifiedStatus Initialize(HANDLE f_hApp); @@ -85,10 +97,9 @@ class CLoggerCfg { void Print(void); EFrameworkunifiedStatus SetLoggingParams(HANDLE f_hApp, - STLoggerSetParams f_stLoggerSetParams) noexcept; + STLoggerSetParams f_stLoggerSetParams); - EFrameworkunifiedStatus SetUDPLogging(HANDLE f_hApp, ELOGGER_STAT f_eUDPLoggingStatus) - noexcept; + EFrameworkunifiedStatus SetUDPLogging(HANDLE f_hApp, const ELOGGER_STAT f_eUDPLoggingStatus); EFrameworkunifiedStatus PersistLoggingParam(HANDLE f_hApp); std::string getEmmcOutputPath(void); @@ -107,8 +118,8 @@ class CLoggerCfg { EFrameworkunifiedStatus GetIncrementAndPersistUserInvokedCounter(HANDLE f_hApp, UI_32 &f_counter); // NOLINT (runtime/references) - EFrameworkunifiedStatus GetAndIncrementEmmcCounter(UI_32 &f_counter) noexcept; // NOLINT (runtime/references) - EFrameworkunifiedStatus RefreshEmmcCounter(UI_32 &f_counter) noexcept; // NOLINT (runtime/references) + EFrameworkunifiedStatus GetAndIncrementEmmcCounter(UI_32 &f_counter); // NOLINT (runtime/references) + EFrameworkunifiedStatus RefreshEmmcCounter(UI_32 &f_counter) const; // NOLINT (runtime/references) void ResetEmmcCounter(void); @@ -121,6 +132,7 @@ class CLoggerCfg { SI_32 m_emmcOutputNaviLogMax; SI_32 m_emmcOutputNaviLogNmlMax; SI_32 m_emmcOutputNaviLogErrMax; + ExternalLogList m_ExternalLogList; std::string m_emmcOutputPath; std::string m_emmcOutputNaviLogPath; @@ -141,9 +153,10 @@ class CLoggerCfg { EFrameworkunifiedStatus GetLoggerStorageInfo(SLoggerStorageInfo &f_info); // NOLINT (runtime/references) BOOL IsLoggingEnabled(void); EFrameworkunifiedStatus EelActivateLogging(HANDLE f_hApp); + ExternalLogList GetExternalLogList(void); private: - void UpdateLoggingStatus(void) noexcept; + void UpdateLoggingStatus(void); std::vector<CbFuncPtr> m_LoggingCallBack; void GetHighestEmmcCounterValue(UI_32 &f_counter); // NOLINT (runtime/references) diff --git a/logger_service/server/include/ss_logger_common.h b/logger_service/server/include/ss_logger_common.h index 2cf5958e..80a56af7 100644 --- a/logger_service/server/include/ss_logger_common.h +++ b/logger_service/server/include/ss_logger_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. @@ -45,11 +45,11 @@ const CHAR PERFORMANCE_LOG_PATH_FN[] = "/tmp/frameworkunified_performance.log"; const CHAR DRINITIAL_LOG_PATH_FN[] = "/tmp/loggerservice_drinitial.log"; const CHAR DRLOCATION_LOG_PATH_FN[] = "/tmp/loggerservice_drlocation.log"; const CHAR KERNEL_LOG_PATH_FN[] = "/tmp/kernel.log"; -const CHAR KERNEL_BOOT_LOG_PATH_FN[] = "/ramd/log/frameworkunifiedlog/kernelboot.log"; +const CHAR KERNEL_BOOT_LOG_PATH_FN[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log"; const UI_32 PERFORMANCELOG_FILE_SZ = 256 * 1024; -#define CLEAR_LOG_PATH_FN "/nv/log/frameworkunifiedlog/" +#define CLEAR_LOG_PATH_FN "/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog/" #define NULLCHAR '\0' #define DEBUG_USB_PATH "/mnt/sda1" diff --git a/logger_service/server/include/ss_logger_device_detection.h b/logger_service/server/include/ss_logger_device_detection.h index 0522c9ea..5ee67c0e 100644 --- a/logger_service/server/include/ss_logger_device_detection.h +++ b/logger_service/server/include/ss_logger_device_detection.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/logger_service/server/include/ss_logger_error_event.h b/logger_service/server/include/ss_logger_error_event.h index 80b6bd8a..177c0745 100644 --- a/logger_service/server/include/ss_logger_error_event.h +++ b/logger_service/server/include/ss_logger_error_event.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/logger_service/server/include/ss_logger_error_event_archive.h b/logger_service/server/include/ss_logger_error_event_archive.h index feaba965..2b5212dc 100644 --- a/logger_service/server/include/ss_logger_error_event_archive.h +++ b/logger_service/server/include/ss_logger_error_event_archive.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/logger_service/server/include/ss_logger_error_event_can_evt_reply.h b/logger_service/server/include/ss_logger_error_event_can_evt_reply.h index 7ebb6ec4..b976cdbb 100644 --- a/logger_service/server/include/ss_logger_error_event_can_evt_reply.h +++ b/logger_service/server/include/ss_logger_error_event_can_evt_reply.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/logger_service/server/include/ss_logger_error_event_cfg.h b/logger_service/server/include/ss_logger_error_event_cfg.h index b9b13094..1a0e39ef 100644 --- a/logger_service/server/include/ss_logger_error_event_cfg.h +++ b/logger_service/server/include/ss_logger_error_event_cfg.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. @@ -26,6 +26,8 @@ #include <map> #include <string> +#include "ss_logger_cfg.h" + typedef UI_32 ARTIFACT_BIT_MASK; typedef UI_32 EVENT_BIT_MASK; @@ -114,16 +116,17 @@ class CErrorEventCfg { ~CErrorEventCfg(void); - EFrameworkunifiedStatus Initialize(void); + EFrameworkunifiedStatus Initialize(CLoggerCfg* p_logger_cfg); void GetArtifactRequestVec( EErrorEventType f_eventType, std::vector<TLoggingArtifact> &f_refArtifactRequestVec); // NOLINT (runtime/references) EVENT_BIT_MASK GetEventsForErrorEvent(EErrorEventType f_eventType); private: - UI_32 ValidateConfiguration(void); + UI_32 ValidateConfiguration(); TArtifactBitMaskMap m_errorEventTypeToArtifactBitMaskMap; TArtifactMap m_errorArtifactMap; + UI_32 m_ext_log_num; static TLoggingArtifactCfg m_loggerErrorEventCfgTbl[eErrorEventTypeMaxValue]; static TLoggingArtifact m_loggerErrorArtifactCfgTbl[eArtifactIdMaxValue]; diff --git a/logger_service/server/include/ss_logger_error_event_storage.h b/logger_service/server/include/ss_logger_error_event_storage.h index e5620e81..8a2cbd46 100644 --- a/logger_service/server/include/ss_logger_error_event_storage.h +++ b/logger_service/server/include/ss_logger_error_event_storage.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. @@ -28,7 +28,7 @@ #include <time.h> #include <native_service/frameworkunified_types.h> #include <ss_logger_error_event_cfg.h> -//#include <vehicle_service/Clock_API.h> +#include <stub/Clock_API.h> #include <string> #include "ss_logger_cfg.h" diff --git a/logger_service/server/include/ss_logger_fs_directory.h b/logger_service/server/include/ss_logger_fs_directory.h index 9006f5fa..7e8da15c 100644 --- a/logger_service/server/include/ss_logger_fs_directory.h +++ b/logger_service/server/include/ss_logger_fs_directory.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/logger_service/server/include/ss_logger_popups.h b/logger_service/server/include/ss_logger_popups.h index d45459df..b5b50e89 100644 --- a/logger_service/server/include/ss_logger_popups.h +++ b/logger_service/server/include/ss_logger_popups.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/logger_service/server/include/ss_logger_reader_writer_control.h b/logger_service/server/include/ss_logger_reader_writer_control.h index 4587ac7b..04d19374 100644 --- a/logger_service/server/include/ss_logger_reader_writer_control.h +++ b/logger_service/server/include/ss_logger_reader_writer_control.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/logger_service/server/include/ss_logger_scrshot.h b/logger_service/server/include/ss_logger_scrshot.h index a9e1b311..5cc9dd9b 100644 --- a/logger_service/server/include/ss_logger_scrshot.h +++ b/logger_service/server/include/ss_logger_scrshot.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. @@ -22,9 +22,9 @@ #ifndef LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ #define LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ -#define JPEG_PATH_CH0 "/nv/log/work/screenShot/screen_shot_Ch0.jpeg" -#define JPEG_PATH_CH1 "/nv/log/work/screenShot/screen_shot_Ch1.jpeg" +#define JPEG_PATH_CH0 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg" +#define JPEG_PATH_CH1 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg" #define SCRSHOT_EXE_PATH "/usr/agl/bin/SS_ScrShot" -#define SCREEN_SHOT_PATH "/nv/log/work/screenShot" +#define SCREEN_SHOT_PATH "/nv/BS/ss/logger_service/rwdata/screenShot" #endif // LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ diff --git a/logger_service/server/include/ss_logger_service_callbacks.h b/logger_service/server/include/ss_logger_service_callbacks.h index c466ee11..786054c3 100644 --- a/logger_service/server/include/ss_logger_service_callbacks.h +++ b/logger_service/server/include/ss_logger_service_callbacks.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/logger_service/server/include/ss_logger_types.h b/logger_service/server/include/ss_logger_types.h index dba34e99..11542a58 100644 --- a/logger_service/server/include/ss_logger_types.h +++ b/logger_service/server/include/ss_logger_types.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/logger_service/server/include/ss_logger_util.h b/logger_service/server/include/ss_logger_util.h index a5d83c53..a49e0229 100644 --- a/logger_service/server/include/ss_logger_util.h +++ b/logger_service/server/include/ss_logger_util.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. |