return result;
}
+BT_EXPORT_API void bluetooth_set_battery_monitor_state(bool state)
+{
+ BT_INFO("Setting vconf key");
+ if (vconf_set_int(VCONFKEY_BATTERY_MONITOR_STATUS, state) != 0)
+ BT_ERR("vconf_set_int failed");
+}
+
+BT_EXPORT_API bool bluetooth_get_battery_monitor_state()
+{
+ int state=0;
+ BT_INFO("Getting vconf key value");
+ if (vconf_get_int(VCONFKEY_BATTERY_MONITOR_STATUS, &state) != 0)
+ BT_ERR("vconf_get_int failed");
+ return state;
+}
+
BT_EXPORT_API int bluetooth_read_battery_data(bt_battery_data *data)
{
int result;
- bt_battery_data *info = NULL;
+ bt_battery_dbus_data_t *info = NULL;
BT_CHECK_PARAMETER(data, return);
retv_if(bluetooth_check_adapter() != BLUETOOTH_ADAPTER_ENABLED,
BLUETOOTH_ADAPTER_DISABLED);
+ retv_if(bluetooth_get_battery_monitor_state() == FALSE,
+ BLUETOOTH_ERROR_NOT_SUPPORT);
+
#ifdef TIZEN_FEATURE_BT_DPM
retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED,
BLUETOOTH_ERROR_PERMISSION_DEINED);
return result;
}
- BT_DBG("Received data from bt-service-adaptation");
- info = &g_array_index(out_param, bt_battery_data, 0);
+ info = &g_array_index(out_param, bt_battery_dbus_data_t, 0);
data->session_start_time = info->session_start_time;
data->session_end_time = info->session_end_time;
data->session_connected_time = info->session_connected_time;
data->atm_list = NULL;
- BT_DBG("Received battery data in bt-api: %ld %ld %d %d.", data->session_start_time, data->session_end_time, data->session_scan_time, data->session_connected_time);
+ BT_DBG("Received battery data in bt-api: %ld %ld %d %d.",
+ data->session_start_time, data->session_end_time,
+ data->session_scan_time, data->session_connected_time);
+
+ /*Copying app wise details*/
+ int n = NUM_APP_MAX < info->num_app ? NUM_APP_MAX : info->num_app; //Maximum NUM_APP_MAX details will be fetched
+
+ for (int i = 0; i < n; i++) {
+ bt_battery_app_data *app_data = NULL;
+ app_data = g_malloc0(sizeof(bt_battery_app_data));
+ memcpy(app_data, &(info->app_data[i]), sizeof(bt_battery_app_data));
+ data->atm_list = g_slist_append(data->atm_list, app_data);
+ }
+
+ if (data->atm_list == NULL) {
+ BT_DBG("No app data transaction in this session");
+ BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+ return result;
+ }
+
+ BT_DBG("App-wise data transaction details:");
+ for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) {
+ bt_battery_app_data *t = (bt_battery_app_data *)(l->data);
+ BT_DBG("%ld %ld %d %d", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes);
+ }
BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
return &user_info[type];
}
+int _bt_common_send_rfcomm_rx_details(bluetooth_rfcomm_received_data_t *data)
+{
+ uid_t uid = getuid();
+ pid_t pid = getpid();
+ int size = data->buffer_size;
+ int ret = BLUETOOTH_ERROR_NONE;
+
+ BT_INFO("+");
+ BT_INIT_PARAMS();
+ BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+ g_array_append_vals(in_param1, &uid, sizeof(uid_t));
+ g_array_append_vals(in_param2, &pid, sizeof(pid_t));
+ g_array_append_vals(in_param3, &size, sizeof(int));
+
+ ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SEND_RX_DETAILS,
+ in_param1, in_param2, in_param3, in_param4, &out_param);
+
+ BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+ BT_DBG("-");
+ return ret;
+}
+
+int _bt_common_send_rfcomm_tx_details(int len)
+{
+ uid_t uid = getuid();
+ pid_t pid = getpid();
+ int size = len;
+ int ret = BLUETOOTH_ERROR_NONE;
+
+ BT_INFO("+");
+ BT_INIT_PARAMS();
+ BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+ g_array_append_vals(in_param1, &uid, sizeof(uid_t));
+ g_array_append_vals(in_param2, &pid, sizeof(pid_t));
+ g_array_append_vals(in_param3, &size, sizeof(int));
+
+ ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SEND_TX_DETAILS,
+ in_param1, in_param2, in_param3, in_param4, &out_param);
+
+ BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+ BT_DBG("-");
+ return ret;
+}
+
void _bt_common_event_cb(int event, int result, void *param,
void *callback, void *user_data)
{
+ BT_DBG("+");
bluetooth_event_param_t bt_event = { 0, };
bt_event.event = event;
bt_event.result = result;
GIOStatus status = G_IO_STATUS_NORMAL;
GError *err = NULL;
int fd;
- BT_DBG("");
+ BT_DBG("+");
retv_if(info == NULL, FALSE);
fd = g_io_channel_unix_get_fd(chan);
result, &data_r,
event_info->cb, event_info->user_data);
+ if (bluetooth_get_battery_monitor_state()) {
+ int ret = _bt_common_send_rfcomm_rx_details(&data_r);
+ if (ret != BLUETOOTH_ERROR_NONE)
+ BT_ERR("RFCOMM received data details not sent to battery monitor frwk");
+ }
+
g_free(buffer);
+ BT_DBG("-");
return TRUE;
}
return BLUETOOTH_ERROR_INTERNAL;
}
+ if (bluetooth_get_battery_monitor_state()) {
+ int ret = _bt_common_send_rfcomm_tx_details(length);
+ if (ret != BLUETOOTH_ERROR_NONE)
+ BT_ERR("RFCOMM tx data could not be sent");
+ }
+
#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
written = write(fd, buf, length);
/*BT_DBG("Length %d, written = %d, balance(%d)",
result, &data_r,
event_info->cb, event_info->user_data);
+ if (bluetooth_get_battery_monitor_state()) {
+ int ret = _bt_common_send_rfcomm_rx_details(&data_r);
+ if (ret != BLUETOOTH_ERROR_NONE)
+ BT_ERR("RFCOMM received data details not sent to battery monitor frwk");
+ }
+
g_free(buffer);
return TRUE;
void _bt_convert_addr_type_to_secure_string(char *address, unsigned char *addr);
+int _bt_common_send_rfcomm_rx_details(bluetooth_rfcomm_received_data_t *data);
+
+int _bt_common_send_rfcomm_tx_details(int len);
+
const char *_bt_convert_error_to_string(int error);
const char *_bt_convert_service_function_to_string(int function);
static int __bt_bm_request_data(_bt_battery_data_t *latest)
{
int ret = _bt_bm_read_data(latest);
- if (ret == BLUETOOTH_ERROR_NONE)
- BT_DBG("Received data from battery monitor plugin: %ld %ld %d %d",
+ if (ret == BLUETOOTH_ERROR_NONE) {
+ BT_DBG("Received data from bluetooth battery monitor: %ld %ld %d %d",
latest->session_start_time, latest->session_end_time,
latest->session_scan_time, latest->session_connected_time);
+
+ if (latest->atm_list == NULL) {
+ BT_DBG("No app data transaction for this session");
+ return ret;
+ }
+
+ for (GSList *l = latest->atm_list; l != NULL; l = g_slist_next(l)) {
+ _bt_battery_app_data_t *t = (_bt_battery_app_data_t *)(l->data);
+ BT_DBG("%ld %ld %d %d", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes);
+ }
+ }
else
BT_ERR("Error encountered");
return ret;
result = _bt_reset_adapter();
break;
case BT_BATTERY_READ_DATA: {
- _bt_battery_data_t data;
- result = __bt_bm_request_data(&data);
- g_array_append_vals(*out_param1, &data, sizeof(_bt_battery_data_t));
+ _bt_battery_data_t *data = NULL;
+ data = g_malloc0(sizeof(_bt_battery_data_t));
+ result = __bt_bm_request_data(data);
+
+ bt_battery_dbus_data_t dbus_data;
+ memset(&dbus_data, 0, sizeof(bt_battery_dbus_data_t));
+ dbus_data.session_start_time = data->session_start_time;
+ dbus_data.session_end_time = data->session_end_time;
+ dbus_data.session_scan_time = data->session_scan_time;
+ dbus_data.session_connected_time = data->session_connected_time;
+
+ /*Populating app data*/
+ int n = 0;
+ for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) {
+ bt_battery_app_data *t = (bt_battery_app_data *)(l->data);
+ memcpy(&dbus_data.app_data[n], t, sizeof(bt_battery_app_data));
+ n++;
+ }
+ dbus_data.num_app = n;
+ g_array_append_vals(*out_param1, &dbus_data, sizeof(bt_battery_dbus_data_t));
+ g_slist_free(data->atm_list);
+ g_free(data);
+ data = NULL;
break;
}
case BT_CHECK_ADAPTER: {
result = BLUETOOTH_ERROR_NONE;
break;
}
+ case BT_RFCOMM_SEND_RX_DETAILS: {
+ uid_t uid;
+ pid_t pid;
+ int size;
+ __bt_service_get_parameters(in_param1, &uid, sizeof(uid_t));
+ __bt_service_get_parameters(in_param2, &pid, sizeof(pid_t));
+ __bt_service_get_parameters(in_param3, &size, sizeof(int));
+ BT_DBG("Sending details to bluetooth battery monitor: %ld, %ld, %d", (long int)uid, (long int)pid, size);
+ _bt_bm_add_transaction_details(uid, pid, size, RX_DATA);
+ break;
+ }
+ case BT_RFCOMM_SEND_TX_DETAILS: {
+ uid_t uid;
+ pid_t pid;
+ int size;
+ __bt_service_get_parameters(in_param1, &uid, sizeof(uid_t));
+ __bt_service_get_parameters(in_param2, &pid, sizeof(pid_t));
+ __bt_service_get_parameters(in_param3, &size, sizeof(int));
+ BT_DBG("Sending details to bluetooth battery monitor: %ld, %ld, %d", (long int)uid, (long int)pid, size);
+ _bt_bm_add_transaction_details(uid, pid, size, TX_DATA);
+ break;
+ }
case BT_AUDIO_SELECT_ROLE: {
bluetooth_audio_role_t role;
}
break;
+ case BT_RFCOMM_SEND_RX_DETAILS:
+ case BT_RFCOMM_SEND_TX_DETAILS:
case BT_ENABLE_ADAPTER:
case BT_DISABLE_ADAPTER:
case BT_RESET_ADAPTER:
*/
#include <glib.h>
+#include <gio/gio.h>
#include <string.h>
#include <dlog.h>
#include <time.h>
+
#include <oal-event.h>
#include "bt-service-battery-monitor.h"
data->session_connected_time = current_session_data->session_connected_time;
if (connect_cnt) {
data->session_connected_time += (uint16_t) (time(NULL) - connect_start);
- connect_start = time(NULL);
- }
+ connect_start = time(NULL);
+ }
+
+ data->atm_list = current_session_data->atm_list;
+ if (data->atm_list == NULL) {
+ BT_DBG("No data transaction in this session");
+ return BLUETOOTH_ERROR_NONE;
+ }
+
+ BT_DBG("App-wise data transaction details");
+ for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) {
+ _bt_battery_app_data_t *t = (_bt_battery_app_data_t *)(l->data);
+ BT_DBG("%ld %ld %d %d", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes);
+ }
+
+ current_session_data->atm_list = NULL;
return BLUETOOTH_ERROR_NONE;
}
+static GSList* is_app_present(GSList *start, uid_t uid, pid_t pid)
+{
+ GSList *l = NULL;
+ _bt_battery_app_data_t *t;
+ BT_INFO("Checking Memory location %p", start);
+ for (l=start; l != NULL; l = g_slist_next(l)) {
+ t = (_bt_battery_app_data_t *)(l->data);
+ if (t->uid == uid && t->pid == pid) {
+ BT_INFO("App details already exist");
+ return l;
+ }
+ }
+ return NULL;
+}
+
+void _bt_bm_add_transaction_details(uid_t uid, pid_t pid, int size, data_transaction_type_e type)
+{
+ if (current_session_data == NULL) {
+ BT_ERR("Session in progress but data structure is not initialized"); //error handling
+ return;
+ }
+ GSList *t = is_app_present(current_session_data->atm_list, uid, pid);
+ _bt_battery_app_data_t *app_data = NULL;
+
+ if (t == NULL) {
+ BT_INFO("Match not found, adding new node...");
+ app_data = g_malloc0(sizeof(_bt_battery_app_data_t));
+ app_data->uid = uid;
+ app_data->pid = pid;
+ if (type == RX_DATA)
+ app_data->rx_bytes = size;
+ else
+ app_data->tx_bytes = size;
+ current_session_data->atm_list = g_slist_append(current_session_data->atm_list, app_data);
+ }
+ else {
+ BT_INFO("Match found, updating existing node...");
+ app_data = (_bt_battery_app_data_t *)(t->data);
+ if (type == RX_DATA)
+ app_data->rx_bytes += size;
+ else
+ app_data->tx_bytes += size;
+ }
+}
+
void _bt_start_session_time()
{
if (is_session_started == FALSE) {
#include <stdint.h>
#include <oal-event.h>
+#include <unistd.h>
+#include <sys/types.h>
typedef struct {
- char* app_name;
+ uid_t uid;
+ pid_t pid;
uint16_t rx_bytes;
uint16_t tx_bytes;
} _bt_battery_app_data_t;
GSList *atm_list;
} _bt_battery_data_t;
+typedef enum {
+ RX_DATA,
+ TX_DATA
+} data_transaction_type_e;
+
void _bt_bm_event_handler(gpointer data);
int _bt_bm_read_data(_bt_battery_data_t *data);
+void _bt_bm_add_transaction_details(uid_t uid, pid_t pid, int size, data_transaction_type_e type);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
GSList *atm_list;
} bt_battery_data;
+typedef struct {
+ uid_t uid;
+ pid_t pid;
+ uint16_t rx_bytes;
+ uint16_t tx_bytes;
+} bt_battery_app_data;
+
/**
* Adapter state
*/
ret = bluetooth_disable_adapter();
@endcode
*/
-int bluetooth_read_battery_data(bt_battery_data *latest);
int bluetooth_disable_adapter(void);
+int bluetooth_read_battery_data(bt_battery_data *latest);
+void bluetooth_set_battery_monitor_state(bool state);
+bool bluetooth_get_battery_monitor_state(void);
int bluetooth_recover_adapter(void);
int bluetooth_check_adapter_le(void);
int bluetooth_enable_adapter_le(void);
#include "bluetooth-api.h"
+#define NUM_APP_MAX 30
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
+typedef struct {
+ time_t session_start_time;
+ time_t session_end_time;
+ uint16_t session_connected_time;
+ uint16_t session_scan_time;
+ int num_app;
+ bt_battery_app_data app_data[NUM_APP_MAX];
+} bt_battery_dbus_data_t;
+
typedef enum {
BT_NO_SERVER,
BT_NATIVE_SERVER,
BT_FTP_SERVER,
} bt_server_type_t;
+bool is_battery_monitor_enabled;
+
typedef enum {
BT_SYNC_REQ,
BT_ASYNC_REQ
BT_RFCOMM_REJECT_CONNECTION,
BT_RFCOMM_CREATE_SOCKET_EX,
BT_RFCOMM_REMOVE_SOCKET_EX,
+ BT_RFCOMM_SEND_RX_DETAILS,
+ BT_RFCOMM_SEND_TX_DETAILS,
BT_PBAP_CONNECT = BT_FUNC_PBAP_BASE,
BT_PBAP_DISCONNECT,
BT_PBAP_GET_PHONEBOOK_SIZE,
projects / platform / core / connectivity / bluetooth-frwk.git / commitdiff