From da356bfadb084424a0d201a38adc608e8125c568 Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Mon, 18 Nov 2019 15:55:41 +0900 Subject: [PATCH] Modified to get current time to match stc Change-Id: I43e3ba0161854dfb881ffbb587dc8f20d891fd45 Signed-off-by: hyunuk.tak --- plugin/battery/battery.c | 42 +++++++--------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/plugin/battery/battery.c b/plugin/battery/battery.c index 95ad4c5..016c948 100755 --- a/plugin/battery/battery.c +++ b/plugin/battery/battery.c @@ -239,15 +239,11 @@ static void __battery_get_wifi_list(void *data, battery_wifi_data_s *wifi_data) void battery_update_dn_rssi(int rssi) { - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_dn_data == NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - DBG("[Battery DN] rssi(%ld) [%d]", curr_time, rssi); if (g_dn_rssi_data.time != 0) { @@ -296,15 +292,11 @@ void battery_update_dn_rssi(int rssi) void battery_start_dn_data(void) { battery_dn_data_s *dn_data = NULL; - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_dn_data != NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - __battery_print_dn_list(); dn_data = (battery_dn_data_s *)g_try_malloc0(sizeof(battery_dn_data_s)); @@ -325,15 +317,11 @@ void battery_start_dn_data(void) void battery_end_dn_data(int mode, stc_get_stats_cb get_stats_cb) { - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_dn_data == NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - battery_update_dn_rssi(-1); if (mode == BATTERY_MODE_END) { @@ -352,15 +340,11 @@ void battery_end_dn_data(int mode, stc_get_stats_cb get_stats_cb) void battery_update_wifi_scan(int state) { - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_wifi_data == NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - switch (state) { case 0: /* scan done */ DBG("[Battery Wi-Fi] scan(%ld) [done]", curr_time); @@ -382,15 +366,11 @@ void battery_update_wifi_scan(int state) void battery_update_wifi_rssi(int rssi) { - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_wifi_data == NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - DBG("[Battery Wi-Fi] rssi(%ld) [%d]", curr_time, rssi); if (g_wifi_rssi_data.time != 0) { @@ -431,15 +411,11 @@ void battery_update_wifi_rssi(int rssi) void battery_start_wifi_data(void) { battery_wifi_data_s *wifi_data = NULL; - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_wifi_data != NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - __battery_print_wifi_list(); wifi_data = (battery_wifi_data_s *)g_try_malloc0(sizeof(battery_wifi_data_s)); @@ -460,15 +436,11 @@ void battery_start_wifi_data(void) void battery_end_wifi_data(int mode, stc_get_stats_cb get_stats_cb) { - struct timespec curr_timespec; - time_t curr_time; + time_t curr_time = time(NULL); if (g_wifi_data == NULL) return; - clock_gettime(CLOCK_MONOTONIC, &curr_timespec); - curr_time = curr_timespec.tv_sec; - battery_update_wifi_rssi(-1); if (mode == BATTERY_MODE_END) { -- 2.34.1