From: sung.goo.kim Date: Thu, 19 Nov 2015 06:27:22 +0000 (+0900) Subject: Remove default g_mainloop creation code on tizen X-Git-Tag: accepted/tizen/mobile/20151207.123441~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b5e7007b4ce8360a0fe3f1ca2a306aeea82ca71;p=platform%2Fupstream%2Fiotivity.git Remove default g_mainloop creation code on tizen Change-Id: I4b874bf062c657a79cad4fe81f8e653370e3588f --- diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c index dd3e11d..0c2bb6a 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c @@ -35,7 +35,6 @@ #include "caqueueingthread.h" #include "caremotehandler.h" -static GMainLoop *g_mainloop = NULL; static ca_thread_pool_t g_threadPoolHandle = NULL; /** @@ -50,13 +49,6 @@ static CAEDRNetworkStatusCallback g_edrNetworkChangeCallback = NULL; */ static void CAEDRAdapterStateChangeCallback(int result, bt_adapter_state_e adapterState, void *userData); - -void *GMainLoopThread (void *param) -{ - g_main_loop_run(g_mainloop); - return NULL; -} - CAResult_t CAEDRInitializeNetworkMonitor(const ca_thread_pool_t threadPool) { OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN"); @@ -81,19 +73,6 @@ CAResult_t CAEDRStartNetworkMonitor() { OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "IN"); - g_mainloop = g_main_loop_new(NULL, 0); - if(!g_mainloop) - { - OIC_LOG(ERROR, EDR_ADAPTER_TAG, "g_main_loop_new failed\n"); - return CA_STATUS_FAILED; - } - - if (CA_STATUS_OK != ca_thread_pool_add_task(g_threadPoolHandle, GMainLoopThread, (void *) NULL)) - { - OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to create thread!"); - return CA_STATUS_FAILED; - } - // Initialize Bluetooth service int err = bt_initialize(); if (BT_ERROR_NONE != err) @@ -124,11 +103,6 @@ CAResult_t CAEDRStopNetworkMonitor() OIC_LOG(ERROR, EDR_ADAPTER_TAG, "bt_adapter_set_state_changed_cb failed"); return CA_STATUS_FAILED; } - - if (g_mainloop) - { - g_main_loop_quit(g_mainloop); - } OIC_LOG(DEBUG, EDR_ADAPTER_TAG, "OUT"); return CA_STATUS_OK; }