[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 24e4e28427a6a025e2272d838475b164e89a0d9e..70aeff252068ffd12bc5210215e19cdc1ddacc86 100755 (executable)
--- 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 e9a9629c6ac331277dacc0880a84264f625d894a..1fcf1cd4939a11128a23fc64d4fdb6e09f353509 100755 (executable)
--- 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 <dlog.h>
 #include <system_info.h>
 
 #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 d61ff9b3832cd4d937e6b7fa2738473bf33aaad9..2eacc9b80de057e39eb8a758108e95b2f99426f3 100755 (executable)
--- 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 58b3cbdb1f43d46cd82ee56f22e66c1d8a0cf713..e45129de817e639f6fc7794c7a5222df841b6b74 100755 (executable)
--- 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 ffe4ae879a8d44dd755072c46d9b58570ecf8f29..c942b998ee7c8058627a72f5f3794ea8a6874688 100755 (executable)
--- 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 d21d6afdfe85af0719113f574c81e6b4484998d6..073843b9aebcf83788162d9ea9050dbc6191cc12 100755 (executable)
--- 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 02cd84ccf6f5b8c3b30e9ef7827cd001eda2c554..789ba12a646c5c2ac7f202d12445892f8c2f3598 100755 (executable)
--- 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 53fe5fbf622fe0e06eb2554f1fbe86219593dd2b..23036a580649ecea0c98dec5f747fecde312f4ea 100755 (executable)
--- 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 baabc193ca6f2c28b6281de56c049691a131a39c..08ccd9abc9eb46fb1e7194ad5bb812880c83e240 100755 (executable)
--- 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 3898691a501e8d3663b3d98b4f1e3d1fe86da75b..b4cf801f9780e8fb3b843cf88e8277599db7760f 100755 (executable)
--- 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 71d392dbc516ca7befeb109ef8a77da6fc32fb96..c4a5a14145e7111ffa0e9f908e3f2c3e6c69895f 100755 (executable)
--- 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 410469cf632a3e073e9cf13833299693bcbb7d41..0bb0d7349462057750dbc3f4d96e5adf05b3d229 100755 (executable)
--- 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;