summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortakeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>2020-10-22 09:48:34 +0900
committertakeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>2020-10-22 09:48:34 +0900
commite65d8119ffc568bd3ac8dd2572c18841b70126aa (patch)
tree60ef3f0c51b548ad17197a98d56a388860d69dd1
parent2eb42c0a484db599949a4b18eef3c62deb3c42a6 (diff)
ss-resourcemanager branch 0.1sandbox/ToshikazuOhiwa/ss-resourcemanager
-rw-r--r--resource_manager/Makefile.client2
-rw-r--r--resource_manager/Makefile.server2
-rw-r--r--resource_manager/client/Makefile2
-rw-r--r--resource_manager/client/include/resmgr_api_resourcemanagerlog.h2
-rw-r--r--resource_manager/client/libresm.ver2
-rw-r--r--resource_manager/client/src/resmgr_api_lib.c2
-rw-r--r--resource_manager/drop_caches/Makefile2
-rw-r--r--resource_manager/drop_caches/src/drop_caches.cpp2
-rw-r--r--resource_manager/server/Makefile6
-rw-r--r--resource_manager/server/include/proc_watch.h2
-rw-r--r--resource_manager/server/include/resm_cfg.h2
-rw-r--r--resource_manager/server/include/resm_internal.h2
-rw-r--r--resource_manager/server/include/ss_resm_resourcemanagerlog.h2
-rw-r--r--resource_manager/server/include/system_service/resm.h2
-rw-r--r--resource_manager/server/include/system_service/resm_type.h2
-rw-r--r--resource_manager/server/include/system_service/resource_manager.h2
-rw-r--r--resource_manager/server/src/cpuload_custom.cpp2
-rw-r--r--resource_manager/server/src/proc_watch.cpp54
-rw-r--r--resource_manager/server/src/resm.cpp116
-rw-r--r--resource_manager/server/src/resourcemanager_application.cpp2
-rw-r--r--system_service.mk2
21 files changed, 44 insertions, 168 deletions
diff --git a/resource_manager/Makefile.client b/resource_manager/Makefile.client
index b382b3d5..2f9b64bd 100644
--- a/resource_manager/Makefile.client
+++ b/resource_manager/Makefile.client
@@ -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/resource_manager/Makefile.server b/resource_manager/Makefile.server
index c6aed91f..22575078 100644
--- a/resource_manager/Makefile.server
+++ b/resource_manager/Makefile.server
@@ -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/resource_manager/client/Makefile b/resource_manager/client/Makefile
index c2148e09..a2bde46d 100644
--- a/resource_manager/client/Makefile
+++ b/resource_manager/client/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/resource_manager/client/include/resmgr_api_resourcemanagerlog.h b/resource_manager/client/include/resmgr_api_resourcemanagerlog.h
index 8e6efb1f..b9d66fac 100644
--- a/resource_manager/client/include/resmgr_api_resourcemanagerlog.h
+++ b/resource_manager/client/include/resmgr_api_resourcemanagerlog.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/resource_manager/client/libresm.ver b/resource_manager/client/libresm.ver
index dc063f2c..fc566324 100644
--- a/resource_manager/client/libresm.ver
+++ b/resource_manager/client/libresm.ver
@@ -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/resource_manager/client/src/resmgr_api_lib.c b/resource_manager/client/src/resmgr_api_lib.c
index af3a174e..02e84e45 100644
--- a/resource_manager/client/src/resmgr_api_lib.c
+++ b/resource_manager/client/src/resmgr_api_lib.c
@@ -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/resource_manager/drop_caches/Makefile b/resource_manager/drop_caches/Makefile
index e9b4afd6..03b31cf1 100644
--- a/resource_manager/drop_caches/Makefile
+++ b/resource_manager/drop_caches/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/resource_manager/drop_caches/src/drop_caches.cpp b/resource_manager/drop_caches/src/drop_caches.cpp
index db6412a4..d1927052 100644
--- a/resource_manager/drop_caches/src/drop_caches.cpp
+++ b/resource_manager/drop_caches/src/drop_caches.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/resource_manager/server/Makefile b/resource_manager/server/Makefile
index 18b40989..cae9191f 100644
--- a/resource_manager/server/Makefile
+++ b/resource_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.
@@ -46,12 +46,10 @@ LDLIBS += -Wl,--no-as-needed
LDLIBS += -Wl,-Bdynamic -lstdc++
LDLIBS += -Wl,-Bdynamic -lSS_SystemIfUnified
LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
-#LDLIBS += -Wl,-Bdynamic -lsoc_temperature_hal
+LDLIBS += -Wl,-Bdynamic -lsoc_temperature_hal
LDLIBS += -Wl,-Bdynamic -lcommon
-LDLIBS += -Wl,-Bdynamic -lvp
LDLIBS += -Wl,-Bdynamic -lrpc
LDLIBS += -Wl,-Bdynamic -lev
-#LDLIBS += -Wl,-Bdynamic -lDiagCodeAPI
include ../../system_service.mk
diff --git a/resource_manager/server/include/proc_watch.h b/resource_manager/server/include/proc_watch.h
index d7621451..8a98afd0 100644
--- a/resource_manager/server/include/proc_watch.h
+++ b/resource_manager/server/include/proc_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/resource_manager/server/include/resm_cfg.h b/resource_manager/server/include/resm_cfg.h
index df282378..e48cdcee 100644
--- a/resource_manager/server/include/resm_cfg.h
+++ b/resource_manager/server/include/resm_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/resource_manager/server/include/resm_internal.h b/resource_manager/server/include/resm_internal.h
index 2c7e16b2..090814e4 100644
--- a/resource_manager/server/include/resm_internal.h
+++ b/resource_manager/server/include/resm_internal.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/resource_manager/server/include/ss_resm_resourcemanagerlog.h b/resource_manager/server/include/ss_resm_resourcemanagerlog.h
index 20d00d04..94c16b38 100644
--- a/resource_manager/server/include/ss_resm_resourcemanagerlog.h
+++ b/resource_manager/server/include/ss_resm_resourcemanagerlog.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/resource_manager/server/include/system_service/resm.h b/resource_manager/server/include/system_service/resm.h
index 6490b4a6..d3b8850c 100644
--- a/resource_manager/server/include/system_service/resm.h
+++ b/resource_manager/server/include/system_service/resm.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/resource_manager/server/include/system_service/resm_type.h b/resource_manager/server/include/system_service/resm_type.h
index a1d42f90..1adbf37d 100644
--- a/resource_manager/server/include/system_service/resm_type.h
+++ b/resource_manager/server/include/system_service/resm_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/resource_manager/server/include/system_service/resource_manager.h b/resource_manager/server/include/system_service/resource_manager.h
index 437a1cb8..48c7a4cf 100644
--- a/resource_manager/server/include/system_service/resource_manager.h
+++ b/resource_manager/server/include/system_service/resource_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/resource_manager/server/src/cpuload_custom.cpp b/resource_manager/server/src/cpuload_custom.cpp
index c4b1e60c..c6a8e755 100644
--- a/resource_manager/server/src/cpuload_custom.cpp
+++ b/resource_manager/server/src/cpuload_custom.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/resource_manager/server/src/proc_watch.cpp b/resource_manager/server/src/proc_watch.cpp
index fcbec3c9..c432af13 100644
--- a/resource_manager/server/src/proc_watch.cpp
+++ b/resource_manager/server/src/proc_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.
@@ -15,6 +15,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <time.h>
#include <errno.h>
#include <sys/types.h>
@@ -24,11 +25,9 @@
#include <sys/timerfd.h>
#include <sys/vfs.h> /* or <sys/statfs.h> */
#include <dirent.h>
+#include <stdlib.h>
-//#include <soc_temperature_hal.h>
-#include <cstring>
-#include <cstdlib>
-//#include <stub/ss_diag.h>
+#include <soc_temperature_hal.h>
#include "ss_resm_resourcemanagerlog.h"
#include "proc_watch.h"
@@ -48,8 +47,6 @@ extern EFrameworkunifiedStatus resourcemanagerlog_flag_check(UI_8 *mode);
#if defined(_SOC_TEMP_MONITOR_)
-extern void set_diag_ss_resourcemanager_err(uint16_t resourcemanager_code);
-
/*********************************************************************************
* Soc Temperature
register THSSR : T = CTEMP[5-0] x 5 - 65 [Celsius]
@@ -58,62 +55,31 @@ extern void set_diag_ss_resourcemanager_err(uint16_t resourcemanager_code);
// #define SOC_TEMP_WATCH_INTVAL_TIMESEC (1 * 5) // for debug
#define THSSR_TEMP_MASK 0x0000003F
#define TEMP_120 (120)
-#define TEMP_125 (125)
-#define TEMP_130 (130)
static float last_temp;
-static int last_diag;
static void soc_temp_init(void) {
FRAMEWORKUNIFIEDLOG(ZONE_SOC_TEMP, __FUNCTION__, "start");
last_temp = 0.0f;
- last_diag = 0;
}
static void soc_temp(void) {
float temp = 0.0f;
-// EFrameworkunifiedStatus e_status = GetSoCTemperature(&temp);
-// if (eFrameworkunifiedStatusOK != e_status) {
-// FRAMEWORKUNIFIEDLOG(ZONE_SOC_TEMP, __FUNCTION__,
-// "THSSR:GetSoCTemperature e_status(%d)", e_status);
-// return;
-// }
+ EFrameworkunifiedStatus e_status = GetSoCTemperature(&temp);
+ if (eFrameworkunifiedStatusOK != e_status) {
+ FRAMEWORKUNIFIEDLOG(ZONE_SOC_TEMP, __FUNCTION__,
+ "THSSR:GetSoCTemperature e_status(%d)", e_status);
+ return;
+ }
if (TEMP_120 <= temp) {
// FRAMEWORKUNIFIEDLOG
FRAMEWORKUNIFIEDLOG(ZONE_SOC_TEMP, __FUNCTION__, "%f", temp); // LCOV_EXCL_BR_LINE 15: marco defined in "native_service/ns_logger_if.h" // NOLINT[whitespace/line_length]
-
- // DIAGCODE
- if (TEMP_130 <= temp) {
- if (TEMP_130 != last_diag) {
-#if 0 // TODO(Workaround to avoid build errors for customization by suppliers. Planned to fix on MK.)
- set_diag_ss_resourcemanager_err(DIAGCODE_VIDEOINHALEX_OVERTEMP_3); /* SoC Temperature anomaly(130 degree Or more) */
-#endif
- last_diag = TEMP_130;
- }
- } else if (TEMP_125 <= temp) {
- if (TEMP_125 != last_diag) {
-#if 0 // TODO(Workaround to avoid build errors for customization by suppliers. Planned to fix on MK.)
- set_diag_ss_resourcemanager_err(DIAGCODE_VIDEOINHALEX_OVERTEMP_2); /* SoC Temperature anomaly(125 degree Or more) */
-#endif
- last_diag = TEMP_125;
- }
- } else {
- if (TEMP_120 != last_diag) {
-#if 0 // TODO(Workaround to avoid build errors for customization by suppliers. Planned to fix on MK.)
- set_diag_ss_resourcemanager_err(DIAGCODE_VIDEOINHALEX_OVERTEMP_1); /* SoC Temperature anomaly(120 degree Or more) */
-#endif
- last_diag = TEMP_120;
- }
- }
} else {
// FRAMEWORKUNIFIEDLOG
if (TEMP_120 <= last_temp) {
FRAMEWORKUNIFIEDLOG(ZONE_SOC_TEMP, __FUNCTION__, "%f", temp); // LCOV_EXCL_BR_LINE 15: marco defined in "native_service/ns_logger_if.h" // NOLINT[whitespace/line_length]
}
-
- // DIAGCODE
- last_diag = 0;
}
last_temp = temp;
}
diff --git a/resource_manager/server/src/resm.cpp b/resource_manager/server/src/resm.cpp
index 189590b1..41caa19c 100644
--- a/resource_manager/server/src/resm.cpp
+++ b/resource_manager/server/src/resm.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.
@@ -30,7 +30,6 @@
#include <sys/timerfd.h>
#include <sys/wait.h>
#include <sched.h>
-//#include <stub/ss_diag.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <signal.h>
@@ -45,7 +44,6 @@
#include <system_service/ss_version.h>
#include <native_service/cl_process.h>
#include <system_service/ss_system_process.h>
-#include <other_service/VP_GetEnv.h>
#include <other_service/rpc.h>
#include "resmgr_srvr.h"
#include "resm_internal.h"
@@ -419,28 +417,6 @@ EFrameworkunifiedStatus resourcemanagerlog_flag_check(UI_8 *mode) {
return NsLogGetFrameworkunifiedLogFlag(RESOURCEMANAGERLOG_BASEPF_FLAG_ID, mode);
}
-/**********************************************
- * Set DIAGCODE
- **********************************************/
-void set_diag_ss_resourcemanager_err(uint16_t resourcemanager_code) {
-#if 0 // TODO(Workaround to avoid build errors for customization by suppliers. Planned to fix on MK.)
- SVC_COMMON_t* p_ctx = &g_resmgr;
- switch (resourcemanager_code) {
- case DIAGCODE_VIDEOINHALEX_OVERTEMP_3:
- SS_PUTDIAG(p_ctx->hApp, DIAGCODE_VIDEOINHALEX_OVERTEMP_3);
- break;
- case DIAGCODE_VIDEOINHALEX_OVERTEMP_2:
- SS_PUTDIAG(p_ctx->hApp, DIAGCODE_VIDEOINHALEX_OVERTEMP_2);
- break;
- case DIAGCODE_VIDEOINHALEX_OVERTEMP_1:
- SS_PUTDIAG(p_ctx->hApp, DIAGCODE_VIDEOINHALEX_OVERTEMP_1);
- break;
- default:
- break;
- }
-#endif
-}
-
/* drop_caches Start update Task */
static void start_drop_caches(void) {
pid_t pid = fork();
@@ -477,56 +453,6 @@ static void start_drop_caches(void) {
}
}
-static unsigned long tick_msec_get(void) {
- struct timespec tp;
-
- if (clock_gettime(CLOCK_MONOTONIC, &tp) != 0) {
- return 0; /* NG */
- }
- return ((tp.tv_sec * 1000) + (tp.tv_nsec / 1000000));
-}
-
-#define UNITAUTH_MONITOR "/tmp/UNITAUTH_MONITOR"
-#define CHECK_UNITAUTH_MONITOR_TIME (2 * 1000) // 2sec
-
-static void check_unitauth(void) {
- int fd;
- int ret;
- char buf[64];
- pid_t pid_uauth;
- unsigned long ctime_uauth; // NOLINT
- unsigned long ctime; // NOLINT
- ssize_t size;
-
- fd = open(UNITAUTH_MONITOR, O_RDONLY);
- if (fd == -1) {
- return;
- }
-
- pid_uauth = 0;
- ctime_uauth = 0;
- size = read(fd, buf, sizeof(buf));
- close(fd);
- if (size != -1) { // LCOV_EXCL_BR_LINE 5: read's error case
- ret = sscanf(buf, "%u %lu", &pid_uauth, &ctime_uauth);
- if ((ret == 0) || (ret == EOF)) { // LCOV_EXCL_BR_LINE 5: C sscanf error
- // LCOV_EXCL_START 5: C sscanf error
- AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert
- return;
- // LCOV_EXCL_STOP
- }
- }
- if (ctime_uauth) { // 0:ignore
- ctime = tick_msec_get();
- if (ctime > ctime_uauth) {
- if (((ctime - ctime_uauth) > CHECK_UNITAUTH_MONITOR_TIME)
- && (getpid() != pid_uauth)) {
-// print_backtrace_pid (pid_uauth); // backtrace in kernel.log
- }
- }
- }
-}
-
/**********************************************
* Main Function
**********************************************/
@@ -638,23 +564,17 @@ int32_t main(int32_t argc, char* argv[]) {
}
/* Create timer */
- if ((timerFd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) == -1) { // LCOV_EXCL_BR_LINE 5: timerfd_create error case // NOLINT[whitespace/line_length]
- // LCOV_EXCL_START 5: timerfd_create error case
- AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert
+ if ((timerFd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) == -1) {
FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__,
"[RESM_ERR]ResMgr Create timerFd Failed. errno[%d]", errno);
exit(EXIT_FAILURE);
- // LCOV_EXCL_STOP 5: timerfd_create error case
}
// for drop_caches
{
- if ((timerFd2 = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) == -1) { // LCOV_EXCL_BR_LINE 5: timerfd_create error case // NOLINT[whitespace/line_length]
- // LCOV_EXCL_START 5: timerfd_create error case
- AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert
+ if ((timerFd2 = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC)) == -1) {
FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__,
"[RESM_ERR]ResMgr Create timerFd2 Failed. errno[%d]", errno);
exit(EXIT_FAILURE);
- // LCOV_EXCL_STOP 5: timerfd_create error case
}
}
@@ -676,28 +596,22 @@ int32_t main(int32_t argc, char* argv[]) {
tm.it_value.tv_nsec = 0;
tm.it_interval.tv_sec = 1;
tm.it_interval.tv_nsec = 0;
- if (timerfd_settime(timerFd, 0, &tm, NULL) == -1) { // LCOV_EXCL_BR_LINE 5: timerfd_settime error case
- // LCOV_EXCL_START 5: timerfd_settime error case
- AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert
+ if (timerfd_settime(timerFd, 0, &tm, NULL) == -1) {
FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__,
"[RESM_ERR]ResMgr Set timerFd Failed. errno[%d]", errno);
exit(EXIT_FAILURE);
- // LCOV_EXCL_STOP 5: timerfd_settime error case
}
- if (timerFd2 != -1) { // LCOV_EXCL_BR_LINE 200: timerFd2 can't be -1
- tm2.it_value.tv_sec = DROP_CACHES_START_DELAT_TIME;
- tm2.it_value.tv_nsec = 0;
- tm2.it_interval.tv_sec = 0;
- tm2.it_interval.tv_nsec = 0;
- if (timerfd_settime(timerFd2, 0, &tm2, NULL) == -1) { // LCOV_EXCL_BR_LINE 5: timerfd_settime error case
- // LCOV_EXCL_START 5: timerfd_settime error case
- AGL_ASSERT_NOT_TESTED(); // LCOV_EXCL_LINE 200: test assert
- FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__,
- "[RESM_ERR]ResMgr Set timerFd2 Failed. errno[%d]", errno);
- exit(EXIT_FAILURE);
- // LCOV_EXCL_STOP 5: timerfd_settime error case
- }
+ tm2.it_value.tv_sec = DROP_CACHES_START_DELAT_TIME;
+ tm2.it_value.tv_nsec = 0;
+ tm2.it_interval.tv_sec = 0;
+ tm2.it_interval.tv_nsec = 0;
+ if (timerfd_settime(timerFd2, 0, &tm2, NULL) == -1) { // LCOV_EXCL_BR_LINE 11:Gcov constraints (coverage measurement revision by DeathTest)
+ // LCOV_EXCL_START 11:Gcov constraints (coverage measurement revision by DeathTest)
+ FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__,
+ "[RESM_ERR]ResMgr Set timerFd2 Failed. errno[%d]", errno);
+ exit(EXIT_FAILURE);
+ // LCOV_EXCL_END 11:Gcov constraints (coverage measurement revision by DeathTest)
}
/* API to Publish Service Availability Notification. */
@@ -775,8 +689,6 @@ int32_t main(int32_t argc, char* argv[]) {
if ((sec % WTC_CPU_INTERVAL) == 0) {
watchCPUStatus();
}
- /* UNITAUTH monitor */
- check_unitauth();
if (sec >= RESET_SEC) {
sec = 0;
diff --git a/resource_manager/server/src/resourcemanager_application.cpp b/resource_manager/server/src/resourcemanager_application.cpp
index c1583c18..225160b3 100644
--- a/resource_manager/server/src/resourcemanager_application.cpp
+++ b/resource_manager/server/src/resourcemanager_application.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/system_service.mk b/system_service.mk
index a8a06b06..5444eb4c 100644
--- a/system_service.mk
+++ b/system_service.mk
@@ -1,7 +1,7 @@
#############################################################
#
# Common Makefile for system_service
-# Copyright (C) 2017-2019 TOYOTA MOTOR CORPORATION
+# 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.