From: Seonah Moon Date: Thu, 20 Sep 2018 06:40:18 +0000 (+0900) Subject: [UTC][url-download][Non-ACR][Quit mainloop when timeout is reached] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=096c5b8331a2cc736995ed8a95379af0ebfef6d7;p=test%2Ftct%2Fnative%2Fapi.git [UTC][url-download][Non-ACR][Quit mainloop when timeout is reached] Change-Id: Id89999a6fb821c09af8cf4cad0f662aafcd71dc4 --- diff --git a/src/utc/url-download/utc-download-cancel.c b/src/utc/url-download/utc-download-cancel.c index 24e4e2842..70aeff252 100755 --- a/src/utc/url-download/utc-download-cancel.c +++ b/src/utc/url-download/utc-download-cancel.c @@ -62,7 +62,6 @@ static void state_cb(int download_id, download_state_e state, void *user_data) */ void utc_download_cancel_startup(void) { - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-common.h b/src/utc/url-download/utc-download-common.h index e9a9629c6..1fcf1cd49 100755 --- a/src/utc/url-download/utc-download-common.h +++ b/src/utc/url-download/utc-download-common.h @@ -17,6 +17,7 @@ //#ifndef _UTC_DOWNLOAD_COMMON_H_ //#define _UTC_DONWLOAD_COMMON_H_ +#include #include #define API_NAMESPACE "URL_DOWNLOAD_UTC" diff --git a/src/utc/url-download/utc-download-get-content-name.c b/src/utc/url-download/utc-download-get-content-name.c index d61ff9b38..2eacc9b80 100755 --- a/src/utc/url-download/utc-download-get-content-name.c +++ b/src/utc/url-download/utc-download-get-content-name.c @@ -31,7 +31,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -60,7 +62,6 @@ void utc_download_get_content_name_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-get-content-size.c b/src/utc/url-download/utc-download-get-content-size.c index 58b3cbdb1..e45129de8 100755 --- a/src/utc/url-download/utc-download-get-content-size.c +++ b/src/utc/url-download/utc-download-get-content-size.c @@ -31,7 +31,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -60,7 +62,6 @@ void utc_download_get_content_size_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); @@ -152,7 +153,6 @@ int utc_download_get_content_size_n1(void) int utc_download_get_content_size_n2(void) { int retcode = 0; - unsigned long long output = 0; retcode = download_get_content_size(id, NULL); if (!g_bIsDownloadFeatureSupported) diff --git a/src/utc/url-download/utc-download-get-downloaded-file-path.c b/src/utc/url-download/utc-download-get-downloaded-file-path.c index ffe4ae879..c942b998e 100755 --- a/src/utc/url-download/utc-download-get-downloaded-file-path.c +++ b/src/utc/url-download/utc-download-get-downloaded-file-path.c @@ -60,7 +60,6 @@ void utc_download_get_downloaded_file_path_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-get-etag.c b/src/utc/url-download/utc-download-get-etag.c index d21d6afdf..073843b9a 100755 --- a/src/utc/url-download/utc-download-get-etag.c +++ b/src/utc/url-download/utc-download-get-etag.c @@ -31,7 +31,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -60,7 +62,6 @@ void utc_download_get_etag_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-get-http-status.c b/src/utc/url-download/utc-download-get-http-status.c index 02cd84ccf..789ba12a6 100755 --- a/src/utc/url-download/utc-download-get-http-status.c +++ b/src/utc/url-download/utc-download-get-http-status.c @@ -30,7 +30,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -51,7 +53,6 @@ static void state_cb(int download_id, download_state_e state, void *user_data) void utc_download_get_http_status_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-get-mime-type.c b/src/utc/url-download/utc-download-get-mime-type.c index 53fe5fbf6..23036a580 100755 --- a/src/utc/url-download/utc-download-get-mime-type.c +++ b/src/utc/url-download/utc-download-get-mime-type.c @@ -31,7 +31,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -58,7 +60,6 @@ static void state_cb(int download_id, download_state_e state, void *user_data) */ void utc_download_get_mime_type_startup(void) { - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-get-temp-path.c b/src/utc/url-download/utc-download-get-temp-path.c index baabc193c..08ccd9abc 100755 --- a/src/utc/url-download/utc-download-get-temp-path.c +++ b/src/utc/url-download/utc-download-get-temp-path.c @@ -31,7 +31,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -60,7 +62,6 @@ void utc_download_get_temp_path_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-pause.c b/src/utc/url-download/utc-download-pause.c index 3898691a5..b4cf801f9 100755 --- a/src/utc/url-download/utc-download-pause.c +++ b/src/utc/url-download/utc-download-pause.c @@ -35,7 +35,9 @@ static bool is_changed = false; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -65,7 +67,6 @@ static void state_cb(int download_id, download_state_e state, void *user_data) */ void utc_download_pause_startup(void) { - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-set-temp-file-path.c b/src/utc/url-download/utc-download-set-temp-file-path.c index 71d392dbc..c4a5a1414 100755 --- a/src/utc/url-download/utc-download-set-temp-file-path.c +++ b/src/utc/url-download/utc-download-set-temp-file-path.c @@ -37,7 +37,9 @@ static int id = -1; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -65,7 +67,6 @@ static void state_cb(int download_id, download_state_e state, void *user_data) void utc_download_set_temp_path_startup(void) { int retcode = 0; - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); diff --git a/src/utc/url-download/utc-download-start.c b/src/utc/url-download/utc-download-start.c index 410469cf6..0bb0d7349 100755 --- a/src/utc/url-download/utc-download-start.c +++ b/src/utc/url-download/utc-download-start.c @@ -33,7 +33,9 @@ static bool is_error = false; static gboolean download_timeout_callback(gpointer data) { + dlog_print(DLOG_ERROR, "NativeTCT", "Timeout has been reached. [%d] will be canceled.", id); download_cancel(id); + g_main_loop_quit(gloop); return false; } @@ -87,7 +89,6 @@ static void state_p_cb (int download_id, download_state_e state, void *user_data */ void utc_download_start_startup(void) { - g_type_init(); gloop = g_main_loop_new(NULL, 0); gTimeoutId = g_timeout_add(DOWNLOAD_TIMEOUT, download_timeout_callback, gloop); is_download_success = true;