Add the Rx / Tx time in Wi-Fi power model

Change-Id: I5f220b1bb1e575df06891c1cd19c87679777f2bd
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/plugin/common/include/bm_plugin_interface.h b/plugin/common/include/bm_plugin_interface.h
index c2350a38487a5fcf900158aaabb179abd9313ba8..6a0aa21ad121dde98d35a916035f7ebc1ab11c17 100644 (file)
--- a/plugin/common/include/bm_plugin_interface.h
+++ b/plugin/common/include/bm_plugin_interface.h
@@ -140,6 +140,8 @@ typedef struct {
        uint time_level_2;              /**< Total time in milliseconds during which rssi was on level 2 */
        uint time_level_3;              /**< Total time in milliseconds during which rssi was on level 3 */
        uint time_level_4;              /**< Total time in milliseconds during which rssi was on level 4 */
+       uint rxTime;                    /**< Total time in milliseconds (RX) mode */
+       uint txTime;                    /**< Total time in milliseconds (TX) mode */
        time_t startTime;               /**< start time of feature data collection session */
        time_t endTime;                 /**< end time of feature data collection session */
        uint scanTime;                  /**< Total time spent by the resource in (scan) mode during the session */

diff --git a/plugin/wifi/src/bm_wifi_plugin.c b/plugin/wifi/src/bm_wifi_plugin.c
index 5c35fa02eec8701a40027bcec0b4f869141829fb..0edb4b08b5c8e63c3334314d2995387177c07caf 100755 (executable)
--- a/plugin/wifi/src/bm_wifi_plugin.c
+++ b/plugin/wifi/src/bm_wifi_plugin.c
@@ -41,6 +41,8 @@
 #define BATTERY_WIFI_TIME_LEVEL_2   "time_level_2"
 #define BATTERY_WIFI_TIME_LEVEL_3   "time_level_3"
 #define BATTERY_WIFI_TIME_LEVEL_4   "time_level_4"
+#define BATTERY_WIFI_RX_TIME        "rx_time"
+#define BATTERY_WIFI_TX_TIME        "tx_time"
 #define BATTERY_WIFI_START_TIME     "start_time"
 #define BATTERY_WIFI_END_TIME       "end_time"
 #define BATTERY_WIFI_SCAN_TIME      "scan_time"
@@ -141,6 +143,10 @@ static void __bm_extract_wifi(const char *key, GVariant *value, void *user_data)
                wifi_data->time_level_3 = g_variant_get_uint32(value);
        } else if (!g_strcmp0(key, BATTERY_WIFI_TIME_LEVEL_4)) {
                wifi_data->time_level_4 = g_variant_get_uint32(value);
+       } else if (!g_strcmp0(key, BATTERY_WIFI_RX_TIME)) {
+               wifi_data->rxTime = g_variant_get_uint32(value);
+       } else if (!g_strcmp0(key, BATTERY_WIFI_TX_TIME)) {
+               wifi_data->txTime = g_variant_get_uint32(value);
        } else if (!g_strcmp0(key, BATTERY_WIFI_START_TIME)) {
                wifi_data->startTime = g_variant_get_uint32(value);
        } else if (!g_strcmp0(key, BATTERY_WIFI_END_TIME)) {
@@ -240,10 +246,10 @@ static void __bm_wifi_print_list(bm_data_h handle)
                GSList *atm_list = NULL;
                GSList *data_list = NULL;
 
-               _D("wifi start[%ld] end[%ld] scan[%d] rssi[%d/%d/%d/%d/%d]",
+               _D("wifi start[%ld] end[%ld] scan[%d] rssi[%d/%d/%d/%d/%d] rx[%d] tx[%d]",
                        wifi_data->startTime, wifi_data->endTime, wifi_data->scanTime,
                        wifi_data->time_level_0, wifi_data->time_level_1, wifi_data->time_level_2,
-                       wifi_data->time_level_3, wifi_data->time_level_4);
+                       wifi_data->time_level_3, wifi_data->time_level_4, wifi_data->rxTime, wifi_data->txTime);
 
                for (atm_list = wifi_data->atm_list; atm_list != NULL; atm_list = atm_list->next) {
                        app_time_map_st2 *app_data = (app_time_map_st2 *)atm_list->data;