From 9857fda9fa7aa48642d9086a05469342cd0a3fcf Mon Sep 17 00:00:00 2001 From: Deokhyun Kim Date: Wed, 27 May 2020 19:14:05 +0900 Subject: [PATCH] Remove bt-core dbus retry count, and change timeout from 2S to 10S Change-Id: Id99aa3904a6a26d5acd88b8e021070cc9128e169 Signed-off-by: Deokhyun Kim Signed-off-by: Wootak Jung --- bt-core/bt-core-dbus-handler.c | 62 ++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/bt-core/bt-core-dbus-handler.c b/bt-core/bt-core-dbus-handler.c index 6884dd1..ba7fd2b 100644 --- a/bt-core/bt-core-dbus-handler.c +++ b/bt-core/bt-core-dbus-handler.c @@ -238,49 +238,35 @@ int _bt_core_service_request(int service_type, int service_function, GError *error = NULL; GArray *in_param5 = NULL; - int retry = 5; - proxy = _bt_core_gdbus_get_service_proxy(); if (!proxy) return BLUETOOTH_ERROR_INTERNAL; in_param5 = g_array_new(TRUE, TRUE, sizeof(gchar)); - while (--retry >= 0) { - param1 = g_variant_new_from_data((const GVariantType *)"ay", - in_param1->data, in_param1->len, - TRUE, NULL, NULL); - param2 = g_variant_new_from_data((const GVariantType *)"ay", - in_param2->data, in_param2->len, - TRUE, NULL, NULL); - param3 = g_variant_new_from_data((const GVariantType *)"ay", - in_param3->data, in_param3->len, - TRUE, NULL, NULL); - param4 = g_variant_new_from_data((const GVariantType *)"ay", - in_param4->data, in_param4->len, - TRUE, NULL, NULL); - param5 = g_variant_new_from_data((const GVariantType *)"ay", - in_param5->data, in_param5->len, - TRUE, NULL, NULL); - - ret = g_dbus_proxy_call_sync(proxy, "service_request", - g_variant_new("(iii@ay@ay@ay@ay@ay)", - service_type, service_function, - BT_SYNC_REQ, param1, - param2, param3, - param4, param5), - G_DBUS_CALL_FLAGS_NONE, 2000, - NULL, &error); - if (ret == NULL && error != NULL) { - if (error->code == G_IO_ERROR_TIMED_OUT) { - BT_ERR("D-Bus Timed out."); - g_clear_error(&error); - continue; - } - } - - break; - } - + param1 = g_variant_new_from_data((const GVariantType *)"ay", + in_param1->data, in_param1->len, + TRUE, NULL, NULL); + param2 = g_variant_new_from_data((const GVariantType *)"ay", + in_param2->data, in_param2->len, + TRUE, NULL, NULL); + param3 = g_variant_new_from_data((const GVariantType *)"ay", + in_param3->data, in_param3->len, + TRUE, NULL, NULL); + param4 = g_variant_new_from_data((const GVariantType *)"ay", + in_param4->data, in_param4->len, + TRUE, NULL, NULL); + param5 = g_variant_new_from_data((const GVariantType *)"ay", + in_param5->data, in_param5->len, + TRUE, NULL, NULL); + + ret = g_dbus_proxy_call_sync(proxy, "service_request", + g_variant_new("(iii@ay@ay@ay@ay@ay)", + service_type, service_function, + BT_SYNC_REQ, param1, + param2, param3, + param4, param5), + G_DBUS_CALL_FLAGS_NONE, 10000, + NULL, &error); g_array_free(in_param5, TRUE); if (ret == NULL) { -- 2.7.4