Enhance debug message

Change-Id: I820810dfc0fb30385a18e5abae80c98e24256d47
Signed-off-by: Injun Yang <injun.yang@samsung.com>

diff --git a/bt-api/bt-adapter-le.c b/bt-api/bt-adapter-le.c
index a7f38eb..8cbb29d 100644 (file)
--- a/bt-api/bt-adapter-le.c
+++ b/bt-api/bt-adapter-le.c
@@ -100,6 +100,7 @@ BT_EXPORT_API int bluetooth_start_le_discovery(void)
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
+       BT_INFO_C("### Start LE scan");
        result = _bt_send_request(BT_BLUEZ_SERVICE, BT_START_LE_DISCOVERY,
                in_param1, in_param2, in_param3, in_param4, &out_param);
 
@@ -120,6 +121,7 @@ BT_EXPORT_API int bluetooth_stop_le_discovery(void)
        BT_INIT_PARAMS();
        BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
+       BT_INFO_C("### Stop LE scan");
        result = _bt_send_request(BT_BLUEZ_SERVICE, BT_STOP_LE_DISCOVERY,
                in_param1, in_param2, in_param3, in_param4, &out_param);
 

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 634d496..7b87a32 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -794,7 +794,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -805,7 +804,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -841,7 +839,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                const char * value = NULL;
                GVariant *char_value_var = NULL;
                bt_gatt_char_value_t char_val = { 0, };
-               BT_DBG("BT_GATT_CHAR_VAL_CHANGED");
 
                g_variant_get(parameters, "(i&s@ay)", &result, &char_handle, &char_value_var);
 
@@ -890,7 +887,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
 
                conn_info.addr_type = addr_type;
                conn_info.disc_reason = 0;
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_CONNECTED,
                                result, &conn_info,
                                event_info->cb, event_info->user_data);
@@ -914,7 +910,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
 
                conn_info.addr_type = addr_type;
                conn_info.disc_reason = result;
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_DISCONNECTED,
                                result, &conn_info,
                                event_info->cb, event_info->user_data);
@@ -2942,7 +2937,7 @@ static void __bt_manager_event_filter(GDBusConnection *connection,
                                        path, secure_address);
                        return;
                } else
-                       BT_INFO("GATT Service [%s] added : %s",
+                       BT_INFO(" ### GATT Service added [%s] [%s]",
                                        path, secure_address);
 
                change.svc_path = g_strdup(path);
@@ -2982,7 +2977,7 @@ static void __bt_manager_event_filter(GDBusConnection *connection,
                                change.svc_path = g_strdup(path);
                                change.change_type = BLUETOOTH_GATT_SERVICE_CHANGE_TYPE_REMOVE;
 
-                               BT_INFO("GATT Service [%s] is removed : %s",
+                               BT_INFO(" ### GATT Service removed [%s] [%s]",
                                                path, secure_address);
 
                                user_info = _bt_get_user_data(BT_COMMON);

diff --git a/bt-api/bt-gatt-client.c b/bt-api/bt-gatt-client.c
index aa0c4c4..108d119 100644 (file)
--- a/bt-api/bt-gatt-client.c
+++ b/bt-api/bt-gatt-client.c
@@ -42,8 +42,6 @@ static GSList *service_monitor_list = NULL;
 
 BT_EXPORT_API int bluetooth_gatt_free_service_property(bt_gatt_service_property_t *svc_pty)
 {
-       BT_DBG("+");
-
        BT_CHECK_PARAMETER(svc_pty, return);
 
        g_free(svc_pty->uuid);
@@ -53,14 +51,11 @@ BT_EXPORT_API int bluetooth_gatt_free_service_property(bt_gatt_service_property_
 
        memset(svc_pty, 0, sizeof(bt_gatt_service_property_t));
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
 BT_EXPORT_API int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *char_pty)
 {
-       BT_DBG("+");
-
        BT_CHECK_PARAMETER(char_pty, return);
 
        g_free(char_pty->uuid);
@@ -72,14 +67,11 @@ BT_EXPORT_API int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *cha
 
        memset(char_pty, 0, sizeof(bt_gatt_char_property_t));
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
 BT_EXPORT_API int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_property_t *desc_pty)
 {
-       BT_DBG("+");
-
        BT_CHECK_PARAMETER(desc_pty, return);
 
        g_free(desc_pty->uuid);
@@ -88,7 +80,6 @@ BT_EXPORT_API int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_prop
 
        memset(desc_pty, 0, sizeof(bt_gatt_char_descriptor_property_t));
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
@@ -110,7 +101,7 @@ static char **__get_string_array_from_gptr_array(GPtrArray *gp)
        for (i = 0; i < gp->len; i++) {
                gp_path = g_ptr_array_index(gp, i);
                path[i] = g_strdup(gp_path);
-               BT_DBG("path[%d] : [%s]", i, path[i]);
+       //      BT_DBG("path[%d] : [%s]", i, path[i]);
        }
 
        return path;
@@ -611,7 +602,6 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
        GVariantIter *char_perm_iter;
        GVariantIter *char_desc_iter;
 
-       BT_DBG("+");
        BT_CHECK_PARAMETER(char_handle, return);
        BT_CHECK_PARAMETER(characteristic, return);
 
@@ -679,9 +669,7 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
                        g_variant_get(value, "as", &char_perm_iter);
                        characteristic->permission = 0x00;
                        while (g_variant_iter_loop(char_perm_iter, "s", &permission)) {
-                               BT_DBG("permission = %s", permission);
                                characteristic->permission |= __get_permission_flag(permission);
-                               BT_DBG("permission check = %d", characteristic->permission);
                        }
                        g_variant_iter_free(char_perm_iter);
                } else if (!g_strcmp0(key, "Descriptors")) {
@@ -704,7 +692,6 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
        g_variant_unref(result);
        g_object_unref(properties_proxy);
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
@@ -824,7 +811,6 @@ BT_EXPORT_API int bluetooth_gatt_get_char_descriptor_property(
        GByteArray *gb_array = NULL;
        GVariantIter *desc_value_iter;
 
-       BT_DBG("+");
        BT_CHECK_PARAMETER(descriptor_handle, return);
        BT_CHECK_PARAMETER(descriptor, return);
 
@@ -895,7 +881,6 @@ BT_EXPORT_API int bluetooth_gatt_get_char_descriptor_property(
        g_variant_unref(result);
        g_object_unref(properties_proxy);
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
@@ -1043,7 +1028,6 @@ static void __bluetooth_internal_write_cb(GObject *source_object,
                        GAsyncResult *res,
                        gpointer user_data)
 {
-       BT_DBG("+");
        GError *error = NULL;
        bt_user_info_t *user_info;
        GDBusConnection *system_gconn = NULL;
@@ -1078,7 +1062,7 @@ static void __bluetooth_internal_write_cb(GObject *source_object,
 
        if (value)
                g_variant_unref(value);
-       BT_DBG("-");
+
        return;
 }
 
@@ -1651,7 +1635,6 @@ BT_EXPORT_API int bluetooth_gatt_unwatch_characteristics(const char *char_handle
        GDBusConnection *conn;
        GError *error = NULL;
        int ret = BLUETOOTH_ERROR_NONE;
-       BT_DBG("+");
        BT_CHECK_PARAMETER(char_handle, return);
 
        BT_CHECK_ENABLED(return);
@@ -1682,6 +1665,5 @@ BT_EXPORT_API int bluetooth_gatt_unwatch_characteristics(const char *char_handle
                ret = __bluetooth_gatt_unwatch_characteristics();
        }
 #endif
-       BT_DBG("-");
        return ret;
 }

diff --git a/bt-api/bt-gatt-service.c b/bt-api/bt-gatt-service.c
index d33e0f3..3a5659c 100644 (file)
--- a/bt-api/bt-gatt-service.c
+++ b/bt-api/bt-gatt-service.c
@@ -2201,7 +2201,7 @@ BT_EXPORT_API int bluetooth_gatt_delete_services(void)
                        if (bluetooth_gatt_unregister_service(info->serv_path)
                                        != BLUETOOTH_ERROR_NONE) {
                                error = BLUETOOTH_ERROR_INTERNAL;
-                               BT_DBG(" Error in removing service %s \n",
+                               BT_ERR("Error in removing service %s \n",
                                                 info->serv_path);
                        }
                }
@@ -2369,7 +2369,7 @@ BT_EXPORT_API int bluetooth_gatt_unregister_service(const char *svc_path)
 
        err = __bt_gatt_unregister_service(svc_path);
        if (err != BLUETOOTH_ERROR_NONE) {
-               BT_DBG("Could not unregister application");
+               BT_ERR("Could not unregister application");
                return err;
        }
 

diff --git a/bt-api/bt-rfcomm-server.c b/bt-api/bt-rfcomm-server.c
index 4b5b837..5053387 100644 (file)
--- a/bt-api/bt-rfcomm-server.c
+++ b/bt-api/bt-rfcomm-server.c
@@ -196,6 +196,7 @@ static void __rfcomm_server_disconnect_conn(rfcomm_conn_t *conn,
 
        event_info = _bt_event_get_cb_data(BT_RFCOMM_SERVER_EVENT);
        if (event_info == NULL) {
+               BT_ERR("event_info is NULL");
                __rfcomm_remove_conn(info, conn->fd);
                return;
        }
@@ -205,7 +206,7 @@ static void __rfcomm_server_disconnect_conn(rfcomm_conn_t *conn,
        g_strlcpy(disconn_info.uuid, info->uuid, BLUETOOTH_UUID_STRING_MAX);
        disconn_info.device_addr = conn->addr;
 
-       BT_DBG("Disconnected FD [%d]", conn->fd);
+       BT_INFO("Disconnected FD [%d]", conn->fd);
        disconn_info.socket_fd = conn->fd;
 
        _bt_common_event_cb(BLUETOOTH_EVENT_RFCOMM_DISCONNECTED,
@@ -325,6 +326,7 @@ static gboolean __data_received_cb(GIOChannel *chan, GIOCondition cond,
 
        event_info = _bt_event_get_cb_data(BT_RFCOMM_SERVER_EVENT);
        if (event_info == NULL) {
+               BT_ERR("event_info is NULL. Unable to invoke the callback");
                g_free(buffer);
                return TRUE;
        }
@@ -349,11 +351,13 @@ int new_server_connection(const char *path, int fd, bluetooth_device_address_t *
        GIOChannel *data_io;
        bt_event_info_t *event_info;
 
-       BT_DBG("%s %d", path, fd);
+       BT_INFO("%s %d", path, fd);
 
        info = __find_rfcomm_info_with_path(path);
-       if (info == NULL)
+       if (info == NULL) {
+               BT_ERR("rfcomm info is NULL");
                return -1;
+       }
 
 #ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_SPP, NULL) == BT_DPM_RESTRICTED) {

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index a93f390..f9a15b6 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -2238,7 +2238,7 @@ int _bt_set_connectable(gboolean is_connectable)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       BT_INFO("### Set connectable [%d]", is_connectable);
+       BT_INFO_C("### Set connectable [%d]", is_connectable);
        g_variant_unref(result);
        return BLUETOOTH_ERROR_NONE;
 }

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index 89a9509..de64d20 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -2816,7 +2816,7 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                }
 
                if (strcasecmp(name, BT_BLUEZ_NAME) == 0) {
-                       BT_DBG("Bluetoothd is terminated");
+                       BT_INFO_C("### Bluetoothd is terminated");
                        if (_bt_adapter_get_status() == BT_ACTIVATED)
                                 _bt_disable_cb();
 

diff --git a/bt-service/bt-service-main.c b/bt-service/bt-service-main.c
index 61d8bc3..8d78eaa 100644 (file)
--- a/bt-service/bt-service-main.c
+++ b/bt-service/bt-service-main.c
@@ -105,7 +105,7 @@ gboolean _bt_reliable_terminate_service(gpointer user_data)
 
        terminated = TRUE;
 
-       BT_INFO_C("Terminating the bt-service daemon");
+       BT_INFO_C("### Terminating the bt-service daemon");
 
        if (main_loop != NULL)
                g_main_loop_quit(main_loop);