[Non-ACR] modified listener initialization, refactoring & restructuring

Change-Id: Ia796119ec418851e62030a210e1c485b6a770b72
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

2 files changed, 146 insertions, 195 deletions

diff --git a/src/battery_dump/bm_listeners.c b/src/battery_dump/bm_listeners.c
index 48b929a..6061d41 100644
--- a/src/battery_dump/bm_listeners.c
+++ b/src/battery_dump/bm_listeners.c
@@ -79,47 +79,7 @@ GHashTable *app_list = NULL;
 #define DBUS_DEVICED_SLEEP_MEMBER "sleep"
 #define DBUS_DEVICED_WAKEUP_MEMBER "wakeup"
 
-/*static GDBusConnection *dbus_connection;
-
-static int bm_listener_dbus_init(void)
-{
-	ENTER;
-
-	GDBusConnection *conn;
-	GError *err = NULL;
-
-	if (dbus_connection) {
-		_DBG("dbus connection already initialized");
-		return 0;
-	}
-
-	conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
-	if (!conn || err) {
-		_ERR("failed to get dbus connection:%s", err->message);
-		g_error_free(err);
-		conn = NULL;
-		return -1;
-	}
-
-	dbus_connection = conn;
-
-	EXIT;
-	return 0;
-}
-
-int bm_listener_dbus_deinit()
-{
-	ENTER;
-
-	if (dbus_connection)
-		g_object_unref(dbus_connection);
-	dbus_connection = NULL;
-
-	EXIT;
-	return BATTERY_MONITOR_ERROR_NONE;
-}*/
-
-static int fill_AppId_info(char *app_id)
+static int bd_listener_set_appId_info(char *app_id)
 {
 	ENTER;
 	int ret = 0;
@@ -135,9 +95,10 @@ static int fill_AppId_info(char *app_id)
 	return ret;
 }
 
-static int fill_battery_info()
+static int bd_listener_set_battery_info()
 {
 	ENTER;
+
 	struct device_battery_info info;
 	int ret = device_battery_get_info(&info);
 	if (ret == DEVICE_ERROR_NONE) {
@@ -198,7 +159,7 @@ static int fill_battery_info()
 	return ret;
 }
 
-static void fill_bt_adapter_state_changed_data(int adapter_state)
+static void bd_listener_set_bt_adapter_state_change_data(int adapter_state)
 {
 	ENTER;
 
@@ -249,7 +210,7 @@ static void fill_bt_adapter_state_changed_data(int adapter_state)
 	return;
 }
 
-static void fill_bt_device_discovery_state_changed_data(int discovery_state)
+static void bd_listener_set_bt_device_discovery_state_change_data(int discovery_state)
 {
 	ENTER;
 
@@ -302,7 +263,7 @@ static void fill_bt_device_discovery_state_changed_data(int discovery_state)
 	return;
 }
 
-static void fill_bt_device_connection_state_changed_data(int connected)
+static void bd_listener_set_bt_device_connection_state_change_data(int connected)
 {
 	ENTER;
 
@@ -346,7 +307,7 @@ static void fill_bt_device_connection_state_changed_data(int connected)
 	return;
 }
 
-static void fill_wifi_device_state_data(int state)
+static void bd_listener_set_wifi_device_state_data(int state)
 {
 	ENTER;
 
@@ -395,7 +356,7 @@ static void fill_wifi_device_state_data(int state)
 	return;
 }
 
-static void fill_wifi_scan_changed_data(int state)
+static void bd_listener_set_wifi_scan_change_data(int state)
 {
 	ENTER;
 
@@ -442,7 +403,7 @@ static void fill_wifi_scan_changed_data(int state)
 	return;
 }
 
-static void fill_wifi_connection_state_changed_data(int state)
+static void bd_listener_set_wifi_connection_state_change_data(int state)
 {
 	ENTER;
 
@@ -489,7 +450,7 @@ static void fill_wifi_connection_state_changed_data(int state)
 	return;
 }
 
-static void fill_device_display_change(int value)
+static void bd_listener_set_device_display_change_data(int value)
 {
 	ENTER;
 	_WARN("device state changed succeeded\n");
@@ -545,7 +506,7 @@ static void fill_device_display_change(int value)
 	return;
 }
 
-static void fill_display_brightness_change(int brightness_level)
+static void bd_listener_set_display_brightness_change_data(int brightness_level)
 {
 	ENTER;
 
@@ -562,7 +523,7 @@ static void fill_display_brightness_change(int brightness_level)
 	return;
 }
 
-static void fill_battery_capacity_change(int charging_level)
+static void bd_listener_set_battery_capacity_change_data(int charging_level)
 {
 	ENTER;
 
@@ -576,7 +537,7 @@ static void fill_battery_capacity_change(int charging_level)
 	return;
 }
 
-static void fill_charging_status_change(int charging)
+static void bd_listener_set_charging_status_change_data(int charging)
 {
 	ENTER;
 
@@ -597,7 +558,7 @@ static void fill_charging_status_change(int charging)
 	return;
 }
 
-static void fill_signal_strength_change(int ss)
+static void bd_listener_set_signal_strength_change_data(int ss)
 {
 	ENTER;
 
@@ -614,7 +575,7 @@ static void fill_signal_strength_change(int ss)
 	return;
 }
 
-static void fill_sleep_wakeup_change(int val)
+static void bd_listener_set_sleep_wakeup_change_data(int val)
 {
 	ENTER;
 
@@ -669,7 +630,7 @@ static void fill_sleep_wakeup_change(int val)
 	return;
 }
 
-static void fill_location_change(int gps)
+static void bd_listener_set_location_change_data(int gps)
 {
 	ENTER;
 
@@ -712,7 +673,7 @@ static void fill_location_change(int gps)
 	return;
 }
 
-static int fill_power_lock_unlock_change(int lock)
+static int bd_listener_set_power_lock_unlock_change_data(int lock)
 {
 	ENTER;
 
@@ -756,7 +717,7 @@ static int fill_power_lock_unlock_change(int lock)
 	return 0;
 }
 
-static int fill_app_status_change(int val, char *app_id)
+static int bd_listener_set_app_status_change_data(int val, char *app_id)
 {
 	ENTER;
 
@@ -784,7 +745,7 @@ static int fill_app_status_change(int val, char *app_id)
 					int *temp = (int *)prv_data;
 					*temp = app_hsp;
 					_INFO(" sp index for this app id is = %d and apphsp= %d", *temp, app_hsp);
-					if (fill_AppId_info(app_id)) {
+					if (bd_listener_set_appId_info(app_id)) {
 						error_code = 1;
 						goto out;
 					}
@@ -801,7 +762,7 @@ static int fill_app_status_change(int val, char *app_id)
 					*temp = app_hsp;
 					_INFO("This App is not present in the list, inserting it");
 					g_hash_table_insert(app_list, app_id, temp);
-					if (fill_AppId_info(app_id)) {
+					if (bd_listener_set_appId_info(app_id)) {
 						error_code = 1;
 						goto out;
 					}
@@ -826,7 +787,7 @@ static int fill_app_status_change(int val, char *app_id)
 					app_hsp = *tmp;
 					error_code = 0;
 					data_obj->event_tag->sp_idx = app_hsp;
-					if (fill_AppId_info(app_id))
+					if (bd_listener_set_appId_info(app_id))
 						error_code = 1;
 					goto out;
 				} else {
@@ -851,7 +812,7 @@ out:
 	return error_code;
 }
 
-static void fill_modem_power_state_change(int state)
+static void bd_listener_set_modem_power_state_change_data(int state)
 {
 	ENTER;
 
@@ -901,7 +862,7 @@ static void fill_modem_power_state_change(int state)
 	return;
 }
 
-static void bm_create_event_data(int type, int val, char *app)
+static void bd_listener_create_event_data(int type, int val, char *app)
 {
 	ENTER;
 	if (!data_obj)
@@ -909,56 +870,56 @@ static void bm_create_event_data(int type, int val, char *app)
 
 	switch (type) {
 	case LISTEN_BT_STATE:
-		fill_bt_adapter_state_changed_data(val);
+		bd_listener_set_bt_adapter_state_change_data(val);
 		break;
 	case LISTEN_BT_CONNECTION_STATE:
-		fill_bt_device_connection_state_changed_data(val);
+		bd_listener_set_bt_device_connection_state_change_data(val);
 		break;
 	case LISTEN_BT_SCAN_STATE:
-		fill_bt_device_discovery_state_changed_data(val);
+		bd_listener_set_bt_device_discovery_state_change_data(val);
 		break;
 	case LISTEN_WIFI_STATE:
-		fill_wifi_device_state_data(val);
+		bd_listener_set_wifi_device_state_data(val);
 		break;
 	case LISTEN_WIFI_CONNECTION_STATE:
-		fill_wifi_connection_state_changed_data(val);
+		bd_listener_set_wifi_connection_state_change_data(val);
 		break;
 	case LISTEN_WIFI_SCAN_STATE:
-		fill_wifi_scan_changed_data(val);
+		bd_listener_set_wifi_scan_change_data(val);
 		break;
 	case LISTEN_DEVICE_DISPLAY_STATE:
-		fill_device_display_change(val);
+		bd_listener_set_device_display_change_data(val);
 		break;
 	case LISTEN_BRIGHTNESS_CHANGE:
-		fill_display_brightness_change(val);
+		bd_listener_set_display_brightness_change_data(val);
 		break;
 	case LISTEN_BATTERY_CAPACITY_CHANGE:
-		fill_battery_capacity_change(val);
+		bd_listener_set_battery_capacity_change_data(val);
 		break;
 	case LISTEN_LOCATION_CHANGE:
-		fill_location_change(val);
+		bd_listener_set_location_change_data(val);
 		break;
 	case LISTEN_CHARGING_STATUS_CHANGE:
-		fill_charging_status_change(val);
+		bd_listener_set_charging_status_change_data(val);
 		break;
 	case LISTEN_SIGNAL_STRENGTH_CHANGE:
-		fill_signal_strength_change(val);
+		bd_listener_set_signal_strength_change_data(val);
 		break;
 	case LISTEN_POWERLOCKUNLOCK_STATE:
-		if (fill_power_lock_unlock_change(val) == BATTERY_MONITOR_ERROR_NONE)
+		if (bd_listener_set_power_lock_unlock_change_data(val) == BATTERY_MONITOR_ERROR_NONE)
 			break;
 		else
 			return;
 	case LISTEN_SLEEP_WAKEUP_STATE:
-		fill_sleep_wakeup_change(val);
+		bd_listener_set_sleep_wakeup_change_data(val);
 		break;
 	case LISTEN_APP_STATUS:
-		if (fill_app_status_change(val, app) == BATTERY_MONITOR_ERROR_NONE)
+		if (bd_listener_set_app_status_change_data(val, app) == BATTERY_MONITOR_ERROR_NONE)
 			break;
 		else
 			return;
 	case LISTEN_MODEM_POWER_STATE:
-		fill_modem_power_state_change(val);
+		bd_listener_set_modem_power_state_change_data(val);
 		break;
 	default:
 		return;
@@ -978,7 +939,7 @@ static void bm_create_event_data(int type, int val, char *app)
 	_DBG("time_taken = %lf ", time_taken);
 
 	if (time_taken >= BATTERY_INFO_DELAY) {
-		if (fill_battery_info() != DEVICE_ERROR_NONE)
+		if (bd_listener_set_battery_info() != DEVICE_ERROR_NONE)
 			_ERR("Fill Battery information failed ");
 
 		prev_event_time = tv;
@@ -1024,16 +985,35 @@ static void bm_create_event_data(int type, int val, char *app)
 	return;
 }
 
-void* event_producer(void *data)
+void* bd_listener_event_consumer()
 {
 	ENTER;
 
-	if (data == NULL) {
-		_WARN("invalid data param");
-		return NULL;
+	while (1) {
+		pthread_mutex_lock(&battery_lister_mutex);
+		while (buff_count == 0)
+			pthread_cond_wait(&fill, &battery_lister_mutex);
+
+		bd_listener_create_event_data(events_buf[use_ptr].type, events_buf[use_ptr].val, events_buf[use_ptr].app);
+
+		_INFO("type: %d and val = %d", events_buf[use_ptr].type, events_buf[use_ptr].val);
+		_INFO("buff_count: %d and fill_ptr = %d , use_ptr = %d", buff_count, fill_ptr, use_ptr);
+
+		use_ptr = (use_ptr + 1) % MAX_BUFF;
+		buff_count--;
+
+		pthread_cond_signal(&empty);
+		pthread_mutex_unlock(&battery_lister_mutex);
 	}
+	EXIT;
+}
 
+void* bd_listener_event_producer(void *data)
+{
+	ENTER;
 	event_pool *event = (event_pool*) data;
+	if (event == NULL)
+		return NULL;
 
 	pthread_mutex_lock(&battery_lister_mutex);
 
@@ -1081,7 +1061,7 @@ void bd_create_producer_thread(event_pool *obj, const char* event_name)
 	int ret_val;
 	pthread_t producer_id;
 
-	ret_val = pthread_create(&producer_id, &attr, event_producer, obj);
+	ret_val = pthread_create(&producer_id, &attr, bd_listener_event_producer, obj);
 
 	if (ret_val != 0) {
 		_ERR("Failed to create produce thread");
@@ -1096,7 +1076,7 @@ void bd_create_producer_thread(event_pool *obj, const char* event_name)
 	return;
 }
 
-void __bm_bt_adapter_state_changed_cb(int result, bt_adapter_state_e adapter_state, void *user_data)
+void _bd_listener_bt_adapter_state_change_cb(int result, bt_adapter_state_e adapter_state, void *user_data)
 {
 	ENTER;
 
@@ -1131,7 +1111,7 @@ void __bm_bt_adapter_state_changed_cb(int result, bt_adapter_state_e adapter_sta
 	return;
 }
 
-void __bm_bt_device_connection_state_changed_cb(bool connected, bt_device_connection_info_s *conn_info, void *user_data)
+void _bd_listener_bt_device_connection_state_change_cb(bool connected, bt_device_connection_info_s *conn_info, void *user_data)
 {
 	ENTER;
 
@@ -1156,9 +1136,10 @@ void __bm_bt_device_connection_state_changed_cb(bool connected, bt_device_connec
 	return;
 }
 
-static void __bm_bt_device_discovery_state_changed_cb(int result,
-		bt_adapter_device_discovery_state_e discovery_state,
-		bt_adapter_device_discovery_info_s *discovery_info, void *user_data)
+static void _bd_listener_bt_device_discovery_state_change_cb(int result,
+						bt_adapter_device_discovery_state_e discovery_state,
+						bt_adapter_device_discovery_info_s *discovery_info,
+						void *user_data)
 {
 	ENTER;
 
@@ -1191,7 +1172,7 @@ static void __bm_bt_device_discovery_state_changed_cb(int result,
 	return;
 }
 
-static void __bm_wifi_device_state_callback(wifi_manager_device_state_e state, void* user_data)
+static void _bd_listener_wifi_device_state_callback(wifi_manager_device_state_e state, void* user_data)
 {
 	ENTER;
 
@@ -1216,7 +1197,7 @@ static void __bm_wifi_device_state_callback(wifi_manager_device_state_e state, v
 	return;
 }
 
-static void __bm_wifi_scan_changed_callback(wifi_manager_scan_state_e state, void* user_data)
+static void _bd_listener_wifi_scan_change_callback(wifi_manager_scan_state_e state, void* user_data)
 {
 	ENTER;
 
@@ -1236,7 +1217,8 @@ static void __bm_wifi_scan_changed_callback(wifi_manager_scan_state_e state, voi
 	return;
 }
 
-static void __bm_wifi_connection_state_changed_callback(wifi_manager_connection_state_e state, wifi_manager_ap_h ap, void *user_data)
+static void _bd_listener_wifi_connection_state_change_callback(wifi_manager_connection_state_e state,
+								wifi_manager_ap_h ap, void *user_data)
 {
 	ENTER;
 
@@ -1261,10 +1243,9 @@ static void __bm_wifi_connection_state_changed_callback(wifi_manager_connection_
 	return;
 }
 
-static void __bm_device_display_change(device_callback_e type, void *value, void *user_data)
+static void _bd_listener_device_display_change(device_callback_e type, void *value, void *user_data)
 {
 	ENTER;
-
 	_INFO("device state changed succeeded\n");
 
 	if (type != DEVICE_CALLBACK_DISPLAY_STATE)
@@ -1291,7 +1272,7 @@ static void __bm_device_display_change(device_callback_e type, void *value, void
 	return;
 }
 
-static void __bm_display_brightness_change(keynode_t *key, void* data)
+static void _bd_listener_display_brightness_change(keynode_t *key, void* data)
 {
 	ENTER;
 	_INFO("device brightness changed succeeded");
@@ -1348,7 +1329,7 @@ static void __bm_display_brightness_change(keynode_t *key, void* data)
 	return;
 }
 
-static void __bm_battery_capacity_change(keynode_t *key, void* data)
+static void _bd_listener_battery_capacity_change(keynode_t *key, void* data)
 {
 	ENTER;
 
@@ -1374,7 +1355,7 @@ static void __bm_battery_capacity_change(keynode_t *key, void* data)
 	return;
 }
 
-static void __bm_charging_status_change(keynode_t *key, void* data)
+static void _bd_listener_charging_status_change(keynode_t *key, void* data)
 {
 	ENTER;
 
@@ -1400,7 +1381,7 @@ static void __bm_charging_status_change(keynode_t *key, void* data)
 	return;
 }
 
-static void __bm_location_change(keynode_t *key, void* data)
+static void _bd_listener_location_change(keynode_t *key, void* data)
 {
 	ENTER;
 	_INFO("device location changed succeeded\n");
@@ -1428,7 +1409,8 @@ static void __bm_location_change(keynode_t *key, void* data)
 	return;
 }
 
-static void _bm_notify_signal_strength(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void _bd_listener_notify_signal_strength(TapiHandle *handle, const char *noti_id,
+								void *data, void *user_data)
 {
 	ENTER;
 
@@ -1460,7 +1442,8 @@ static void _bm_notify_signal_strength(TapiHandle *handle, const char *noti_id,
 	return;
 }
 
-static void _bm_notify_modem_power(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void _bd_listener_notify_modem_power(TapiHandle *handle, const char *noti_id,
+								void *data, void *user_data)
 {
 	ENTER;
 
@@ -1511,7 +1494,7 @@ static void _bm_notify_modem_power(TapiHandle *handle, const char *noti_id, void
 	return;
 }
 
-static void create_lock_event(char *lock_type)
+static void _bd_listener_create_lock_event(char *lock_type)
 {
 	int val;
 
@@ -1543,7 +1526,7 @@ static void create_lock_event(char *lock_type)
 	return;
 }
 
-static void __powerlock_signal_callback(GDBusConnection *conn,
+static void _bd_listener_powerlock_signal_cb(GDBusConnection *conn,
 		const gchar *sender,
 		const gchar *path,
 		const gchar *iface,
@@ -1559,13 +1542,13 @@ static void __powerlock_signal_callback(GDBusConnection *conn,
 
 	_INFO(" powerlock value changed =%s Pid=%d, timeout=%d", lock_type, pid, timeout);
 
-	create_lock_event(lock_type);
+	_bd_listener_create_lock_event(lock_type);
 
 	EXIT;
 	return;
 }
 
-static void __powerunlock_signal_callback(GDBusConnection *conn,
+static void _bd_listener_powerunlock_signal_cb(GDBusConnection *conn,
 		const gchar *sender,
 		const gchar *path,
 		const gchar *iface,
@@ -1582,13 +1565,13 @@ static void __powerunlock_signal_callback(GDBusConnection *conn,
 
 	_INFO(" powerUnlock value changed =%s Pid=%d, timeout=%d", lock_type, pid, timeout);
 
-	create_lock_event(lock_type);
+	_bd_listener_create_lock_event(lock_type);
 
 	EXIT;
 	return;
 }
 
-static void __sleep_signal_callback(GDBusConnection *conn,
+static void _bd_listener_sleep_signal_cb(GDBusConnection *conn,
 		const gchar *sender,
 		const gchar *path,
 		const gchar *iface,
@@ -1612,7 +1595,7 @@ static void __sleep_signal_callback(GDBusConnection *conn,
 	return;
 }
 
-static void __wakeup_signal_callback(GDBusConnection *conn,
+static void _bd_listener_wakeup_signal_cb(GDBusConnection *conn,
 		const gchar *sender,
 		const gchar *path,
 		const gchar *iface,
@@ -1636,7 +1619,7 @@ static void __wakeup_signal_callback(GDBusConnection *conn,
 	return;
 }
 
-static void __app_status_signal_callback(GDBusConnection *conn,
+static void _bd_listener_app_status_signal_cb(GDBusConnection *conn,
 		const gchar *sender,
 		const gchar *path,
 		const gchar *iface,
@@ -1683,13 +1666,12 @@ static void __app_status_signal_callback(GDBusConnection *conn,
 	return;
 }
 
-static int  bm_charging_status_listeners()
+static int  bd_subscribe_charging_status_listeners()
 {
 	ENTER;
 
 	/* Charging callbacks */
-	int ret = 0;
-	ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, __bm_charging_status_change, NULL);
+	int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, _bd_listener_charging_status_change, NULL);
 	if (ret != 0) {
 		_ERR("failed to register a cb key:%s err:%d", "VCONFKEY_SYSMAN_CHARGER_STATUS", ret);
 		return 1;
@@ -1699,13 +1681,12 @@ static int  bm_charging_status_listeners()
 	return 0;
 }
 
-static int  bm_battery_capacity_listeners()
+static int  bd_subscribe_battery_capacity_listeners()
 {
 	ENTER;
 
 	/* Charging callbacks */
-	int ret = 0;
-	ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, __bm_battery_capacity_change, NULL);
+	int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, _bd_listener_battery_capacity_change, NULL);
 	if (ret != 0) {
 		_ERR("failed to register a cb key:%s err:%d", "VCONFKEY_SYSMAN_BATTERY_CAPACITY", ret);
 		return 1;
@@ -1715,13 +1696,13 @@ static int  bm_battery_capacity_listeners()
 	return 0;
 }
 
-static int  bm_location_listeners()
+static int  bd_subscribe_location_listeners()
 {
 	ENTER;
 
 	/* Charging callbacks */
 	int ret = 0;
-	ret = vconf_notify_key_changed(VCONFKEY_LOCATION_ENABLED, __bm_location_change, NULL);
+	ret = vconf_notify_key_changed(VCONFKEY_LOCATION_ENABLED, _bd_listener_location_change, NULL);
 	if (ret != 0) {
 		_ERR("failed to register a cb key:%s err:%d", "VCONFKEY_LOCATION_ENABLED", ret);
 		return 1;
@@ -1731,12 +1712,12 @@ static int  bm_location_listeners()
 	return 0;
 }
 
-static int  bm_screen_subscribe_listeners()
+static int  bd_subscribe_screen_listeners()
 {
 	ENTER;
 
 	/* Screen callbacks */
-	int ret = device_add_callback(DEVICE_CALLBACK_DISPLAY_STATE, __bm_device_display_change, NULL);
+	int ret = device_add_callback(DEVICE_CALLBACK_DISPLAY_STATE, _bd_listener_device_display_change, NULL);
 	if (ret != BATTERY_MONITOR_ERROR_NONE) {
 		_ERR("device_add_callback failed: %s", get_error_message(ret));
 		return 1;
@@ -1746,7 +1727,7 @@ static int  bm_screen_subscribe_listeners()
 	return 0;
 }
 
-static int bm_telephony_listeners()
+static int bd_subscribe_telephony_listeners()
 {
 	ENTER;
 
@@ -1760,14 +1741,14 @@ static int bm_telephony_listeners()
 	int ret = BATTERY_MONITOR_ERROR_NONE;
 
 	/* register signal strength notification */
-	ret = tel_register_noti_event(handle, TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, _bm_notify_signal_strength, NULL);
+	ret = tel_register_noti_event(handle, TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, _bd_listener_notify_signal_strength, NULL);
 	if (ret != BATTERY_MONITOR_ERROR_NONE) {
 		_ERR("register for signal-strength failed");
 		return 1;
 	}
 
 	/* register modem power notification */
-	ret = tel_register_noti_event(handle, TAPI_PROP_MODEM_POWER, _bm_notify_modem_power, NULL);
+	ret = tel_register_noti_event(handle, TAPI_PROP_MODEM_POWER, _bd_listener_notify_modem_power, NULL);
 	if (ret != BATTERY_MONITOR_ERROR_NONE) {
 		_ERR("register for modem-power failed");
 		return 1;
@@ -1777,13 +1758,12 @@ static int bm_telephony_listeners()
 	return 0;
 }
 
-static int  bm_display_brightness_listeners()
+static int  bd_subscribe_display_brightness_listeners()
 {
 	ENTER;
 
 	/* Screen callbacks */
-	int ret = 0;
-	ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS,	__bm_display_brightness_change, NULL);
+	int ret =  vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, _bd_listener_display_brightness_change, NULL);
 	if (ret != 0) {
 		_ERR("failed to register a cb key:%s err:%d", "VCONFKEY_SETAPPL_LCD_BRIGHTNESS", ret);
 		return 1;
@@ -1793,26 +1773,26 @@ static int  bm_display_brightness_listeners()
 	return 0;
 }
 
-static int  bm_wifi_subscribe_listeners()
+static int  bd_subscribe_wifi_listeners()
 {
 	ENTER;
 
 	/* Wifi callbacks */
 	int rv = wifi_manager_initialize(&wifi);
 	if (rv == WIFI_MANAGER_ERROR_NONE) {
-		int ret = wifi_manager_set_device_state_changed_cb(wifi, __bm_wifi_device_state_callback, NULL);
+		int ret = wifi_manager_set_device_state_changed_cb(wifi, _bd_listener_wifi_device_state_callback, NULL);
 		if (ret == WIFI_MANAGER_ERROR_NONE)
-			_INFO("wifi_manager_set_device_state_changed_cb  success  : [%p]\n", __bm_wifi_device_state_callback);
+			_INFO("wifi_manager_set_device_state_changed_cb  success  : [%p]\n", _bd_listener_wifi_device_state_callback);
 		else
 			_ERR("wifi_manager_set_device_state_changed_cb failed");
 
-		ret = wifi_manager_set_scan_state_changed_cb(wifi, __bm_wifi_scan_changed_callback, NULL);
+		ret = wifi_manager_set_scan_state_changed_cb(wifi, _bd_listener_wifi_scan_change_callback, NULL);
 		if (ret == WIFI_MANAGER_ERROR_NONE)
 			_INFO("wifi_manager_set_scan_state_changed_cb  success\n");
 		else
 			_ERR("wifi_manager_set_scan_state_changed_cb failed");
 
-		ret = wifi_manager_set_connection_state_changed_cb(wifi, __bm_wifi_connection_state_changed_callback, NULL);
+		ret = wifi_manager_set_connection_state_changed_cb(wifi, _bd_listener_wifi_connection_state_change_callback, NULL);
 		if (ret == WIFI_MANAGER_ERROR_NONE)
 			_INFO("wifi_manager_set_connection_state_changed_cb  success\n");
 		else
@@ -1828,7 +1808,7 @@ static int  bm_wifi_subscribe_listeners()
 	return 0;
 }
 
-static int  bm_bluetooth_subscribe_listeners()
+static int  bd_subscribe_bluetooth_listeners()
 {
 	ENTER;
 
@@ -1836,13 +1816,13 @@ static int  bm_bluetooth_subscribe_listeners()
 	int rv = bt_initialize();
 
 	if (rv == BT_ERROR_NONE) {
-		int ret = bt_device_set_connection_state_changed_cb(__bm_bt_device_connection_state_changed_cb, NULL);
+		int ret = bt_device_set_connection_state_changed_cb(_bd_listener_bt_device_connection_state_change_cb, NULL);
 		_INFO("bt_device_set_connection_state_changed_cb  ret =%d \n", ret);
 
-		ret = bt_adapter_set_state_changed_cb(__bm_bt_adapter_state_changed_cb, NULL);
+		ret = bt_adapter_set_state_changed_cb(_bd_listener_bt_adapter_state_change_cb, NULL);
 		_INFO("bt_adapter_set_state_changed_cb ret =%d \n", ret);
 
-		ret = bt_adapter_set_device_discovery_state_changed_cb(__bm_bt_device_discovery_state_changed_cb, NULL);
+		ret = bt_adapter_set_device_discovery_state_changed_cb(_bd_listener_bt_device_discovery_state_change_cb, NULL);
 		_INFO("bt_adapter_set_device_discovery_state_changed_cb ret =%d \n", ret);
 
 	} else {
@@ -1855,7 +1835,7 @@ static int  bm_bluetooth_subscribe_listeners()
 	return 0;
 }
 
-static int bm_powerlock_unlock_subscribe_listener(void)
+static int bd_subscribe_powerlock_unlock_listener(void)
 {
 	ENTER;
 	guint ret = 0;
@@ -1869,7 +1849,7 @@ static int bm_powerlock_unlock_subscribe_listener(void)
 
 	ret = g_dbus_connection_signal_subscribe(dbus_connection, NULL, DBUS_DEVICED_IFACE,
 				DBUS_DEVICED_PL_MEMBER, DBUS_DEVICED_PATH, NULL,
-				G_DBUS_SIGNAL_FLAGS_NONE, __powerlock_signal_callback,
+				G_DBUS_SIGNAL_FLAGS_NONE, _bd_listener_powerlock_signal_cb,
 				NULL, NULL);
 
 	if (ret == 0) {
@@ -1879,7 +1859,7 @@ static int bm_powerlock_unlock_subscribe_listener(void)
 
 	ret = g_dbus_connection_signal_subscribe(dbus_connection, NULL, DBUS_DEVICED_IFACE,
 					DBUS_DEVICED_PU_MEMBER, DBUS_DEVICED_PATH,
-					NULL, G_DBUS_SIGNAL_FLAGS_NONE, __powerunlock_signal_callback,
+					NULL, G_DBUS_SIGNAL_FLAGS_NONE, _bd_listener_powerunlock_signal_cb,
 					NULL, NULL);
 
 	if (ret == 0) {
@@ -1891,7 +1871,7 @@ static int bm_powerlock_unlock_subscribe_listener(void)
 	return BATTERY_MONITOR_ERROR_NONE;
 }
 
-static int bm_sleep_wakeup_subscribe_listener(void)
+static int bd_subscribe_sleep_wakeup_listener(void)
 {
 	ENTER;
 	guint ret = 0;
@@ -1905,7 +1885,7 @@ static int bm_sleep_wakeup_subscribe_listener(void)
 
 	ret = g_dbus_connection_signal_subscribe(dbus_connection, NULL, DBUS_DEVICED_IFACE,
 				DBUS_DEVICED_SLEEP_MEMBER, DBUS_DEVICED_PATH, NULL,
-				G_DBUS_SIGNAL_FLAGS_NONE, __sleep_signal_callback, NULL, NULL);
+				G_DBUS_SIGNAL_FLAGS_NONE, _bd_listener_sleep_signal_cb, NULL, NULL);
 
 	if (ret == 0) {
 		_ERR("Failed to subscrive bus signal"); //LCOV_EXCL_LINE System Error
@@ -1914,7 +1894,7 @@ static int bm_sleep_wakeup_subscribe_listener(void)
 
 	ret = g_dbus_connection_signal_subscribe(dbus_connection, NULL, DBUS_DEVICED_IFACE,
 				DBUS_DEVICED_WAKEUP_MEMBER, DBUS_DEVICED_PATH, NULL,
-				G_DBUS_SIGNAL_FLAGS_NONE, __wakeup_signal_callback, NULL, NULL);
+				G_DBUS_SIGNAL_FLAGS_NONE, _bd_listener_wakeup_signal_cb, NULL, NULL);
 
 	if (ret == 0) {
 		_ERR("Failed to subscrive bus signal"); //LCOV_EXCL_LINE System Error
@@ -1925,7 +1905,7 @@ static int bm_sleep_wakeup_subscribe_listener(void)
 	return BATTERY_MONITOR_ERROR_NONE;
 }
 
-static int bm_app_status_listener(void)
+static int bd_subscribe_app_status_listener(void)
 {
 	ENTER;
 	guint ret = 0;
@@ -1939,7 +1919,7 @@ static int bm_app_status_listener(void)
 
 	ret = g_dbus_connection_signal_subscribe(dbus_connection, NULL, "org.tizen.aul.AppStatus",
 				"AppStatusChange", "/Org/Tizen/Aul/AppStatus", NULL,
-				G_DBUS_SIGNAL_FLAGS_NONE, __app_status_signal_callback, NULL, NULL);
+				G_DBUS_SIGNAL_FLAGS_NONE, _bd_listener_app_status_signal_cb, NULL, NULL);
 
 	if (ret == 0) {
 		_ERR("Failed to subscrive bus signal"); //LCOV_EXCL_LINE System Error
@@ -1950,35 +1930,12 @@ static int bm_app_status_listener(void)
 	return BATTERY_MONITOR_ERROR_NONE;
 }
 
-void* event_consumer()
-{
-	ENTER;
-
-	while (1) {
-		pthread_mutex_lock(&battery_lister_mutex);
-		while (buff_count == 0)
-			pthread_cond_wait(&fill, &battery_lister_mutex);
-
-		bm_create_event_data(events_buf[use_ptr].type, events_buf[use_ptr].val, events_buf[use_ptr].app);
-
-		_INFO("type: %d and val = %d", events_buf[use_ptr].type, events_buf[use_ptr].val);
-		_INFO("buff_count: %d and fill_ptr = %d , use_ptr = %d", buff_count, fill_ptr, use_ptr);
-
-		use_ptr = (use_ptr + 1) % MAX_BUFF;
-		buff_count--;
-
-		pthread_cond_signal(&empty);
-		pthread_mutex_unlock(&battery_lister_mutex);
-	}
-	EXIT;
-}
-
-static int bm_initialize_history_data_obj()
+static int bd_initialize_data_items()
 {
 	ENTER;
 
 	pthread_t consumer;
-	if (pthread_create(&consumer, &attr, event_consumer, NULL)) {
+	if (pthread_create(&consumer, &attr, bd_listener_event_consumer, NULL)) {
 		_ERR("Failed to pthread_create.");
 		return BATTERY_MONITOR_ERROR_NOT_SUPPORTED;
 	}
@@ -2001,7 +1958,7 @@ static int bm_initialize_history_data_obj()
 		return BATTERY_MONITOR_ERROR_OUT_OF_MEMORY;
 	}
 
-	if (fill_battery_info() != DEVICE_ERROR_NONE) {
+	if (bd_listener_set_battery_info() != DEVICE_ERROR_NONE) {
 		_ERR("Battery information failed ");
 		data_obj->battery_level = 0;
 		data_obj->battery_temperature = 0;
@@ -2024,10 +1981,10 @@ int bd_initialize_listeners(void)
 	listener_hsp = -1;
 
 	/* Initialize Hash Table */
-	if (!bm_initialize_history_data_obj())
-		_INFO("bm_initialize_history_data_obj succeeded \n");
+	if (!bd_initialize_data_items())
+		_INFO("bd_initialize_data_items() success");
 	else {
-		_ERR("bm_initialize_history_data_obj failed \n");
+		_ERR("bd_initialize_data_items() failed");
 		return BATTERY_MONITOR_ERROR_OUT_OF_MEMORY;
 	}
 
@@ -2040,72 +1997,68 @@ int bd_initialize_listeners(void)
 	if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0)
 		_ERR("pthread_attr_setdetachstate failed");
 
-	/*Initialize DBus*
-	if (bm_listener_dbus_init())
-		_ERR("bm_listener_dbus_init failed \n"); */
-
 	/*  Wifi callbacks */
-	if (!bm_wifi_subscribe_listeners())
+	if (!bd_subscribe_wifi_listeners())
 		_INFO("Wifi listeners succeeded to subscribed\n");
 	else
 		_ERR("Wifi listeners failed to subscribed\n");
 
 	/*  BlueTooth callbacks */
-	if (!bm_bluetooth_subscribe_listeners())
+	if (!bd_subscribe_bluetooth_listeners())
 		_INFO("bluetooth listeners succeeded to subscribed\n");
 	else
 		_ERR("bluetooth listeners failed to subscribed\n");
 
 	/*  Screen wakeup callbacks */
-	if (!bm_screen_subscribe_listeners())
+	if (!bd_subscribe_screen_listeners())
 		_INFO("Display listeners succeeded to subscribed\n");
 	else
 		_ERR("Display listeners failed to subscribed\n");
 
 	/* Brightness change callbacks */
-	if (!bm_display_brightness_listeners())
+	if (!bd_subscribe_display_brightness_listeners())
 		_INFO("Brightness listeners succeeded to subscribed\n");
 	else
 		_ERR("Brightness listeners failed to subscribed\n");
 
 	/* battery_capacity change callbacks */
-	if (!bm_battery_capacity_listeners())
+	if (!bd_subscribe_battery_capacity_listeners())
 		_INFO("battery_capacity listeners succeeded to subscribed\n");
 	else
 		_ERR("battery_capacity listeners failed to subscribed\n");
 
 	/* battery charging change callbacks */
-	if (!bm_charging_status_listeners())
+	if (!bd_subscribe_charging_status_listeners())
 		_INFO("battery charging listeners succeeded to subscribed\n");
 	else
 		_ERR("battery charging listeners failed to subscribed\n");
 
 	/* GPS change callbacks */
-	if (!bm_location_listeners())
+	if (!bd_subscribe_location_listeners())
 		_INFO("location listeners succeeded to subscribed\n");
 	else
 		_ERR("location listeners failed to subscribed\n");
 
 	/* telephony listeners */
-	if (!bm_telephony_listeners())
+	if (!bd_subscribe_telephony_listeners())
 		_INFO("telephony listeners succeeded to subscribed\n");
 	else
 		_ERR("telephony  listeners failed to subscribed\n");
 
 	/* Powerlock callbacks */
-	if (!bm_powerlock_unlock_subscribe_listener())
+	if (!bd_subscribe_powerlock_unlock_listener())
 		_INFO("Pwoerlock listeners succeeded to subscribed\n");
 	else
 		_ERR("Powerlock listeners failed to subscribed\n");
 
 	/* Device Sleep callbacks */
-	if (!bm_sleep_wakeup_subscribe_listener())
+	if (!bd_subscribe_sleep_wakeup_listener())
 		_INFO("Sleep Wakeup listeners succeeded to subscribed\n");
 	else
 		_ERR("Sleep Wakeup listeners failed to subscribed\n");
 
 	/* App Status callbacks */
-	if (!bm_app_status_listener())
+	if (!bd_subscribe_app_status_listener())
 		_INFO("FG listeners succeeded to subscribed\n");
 	else
 		_ERR("FG Wakeup listeners failed to subscribed\n");
@@ -2152,15 +2105,15 @@ int bd_deinitialize_listeners()
 		_INFO("bt_deinitialize() success.\n");
 
 	//Brightness
-	if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, __bm_display_brightness_change) < 0)
+	if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, _bd_listener_display_brightness_change) < 0)
 		_ERR("failed to de-register vconf callback");
 
 	//Battery capacity
-	if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, __bm_battery_capacity_change) < 0)
+	if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, _bd_listener_battery_capacity_change) < 0)
 		_ERR("failed to de-register vconf callback");
 
 	//Battery charging
-	if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, __bm_charging_status_change) < 0)
+	if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, _bd_listener_charging_status_change) < 0)
 		_ERR("failed to de-register vconf callback");
 
 	/* de-register telephony callbacks */
diff --git a/src/bm_server.c b/src/bm_server.c
index 3142f2f..f147427 100644
--- a/src/bm_server.c
+++ b/src/bm_server.c
@@ -317,6 +317,11 @@ static void on_bus_acquired(GDBusConnection *connection, const gchar *name, gpoi
 
 	_INFO("on_bus_acquired end [%s]", name);
 
+	/* History-Listener initialization after acquiring dbus */
+	if (BATTERY_MONITOR_ERROR_NONE !=  bd_initialize_listeners()) {
+		_ERR("dump-listeners initialization failed");
+	}
+
 	EXIT;
 	return;
 }
@@ -411,13 +416,6 @@ static void bm_server_initialize()
 		goto END;
 	}
 
-	/* History-Listener initialization */
-	return_code = bd_initialize_listeners();
-	if (return_code != BATTERY_MONITOR_ERROR_NONE) {
-		_ERR("Listener initialization failed");
-		goto END;
-	}
-
 	_INFO("SUCCESS");
 
 	EXIT;