return ret;
}
-static gpointer __mmcamcorder_launch_glib_murphy_loop(void *user_data)
-{
- LOGI("Run mrp_loop");
- MMCamcorderResourceManager *resource_manager= (MMCamcorderResourceManager *)user_data;
- g_main_loop_run(resource_manager->mrp_loop);
- LOGI("Murphy glib loop exit");
- return NULL;
-}
-
int _mmcamcorder_resource_manager_init(MMCamcorderResourceManager *resource_manager, void *user_data)
{
+ GMainContext *mrp_ctx = NULL;
+ GMainLoop *mrp_loop = NULL;
+
MMCAMCORDER_CHECK_RESOURCE_MANAGER_INSTANCE(resource_manager);
- GMainContext *mrp_ctx = g_main_context_new();
- resource_manager->mrp_loop = g_main_loop_new(mrp_ctx, TRUE);
- resource_manager->mloop = mrp_mainloop_glib_get(resource_manager->mrp_loop);
- resource_manager->starter = g_thread_new(NULL, (GThreadFunc)__mmcamcorder_launch_glib_murphy_loop, resource_manager);
+ mrp_ctx = g_main_context_new();
+ if (!mrp_ctx) {
+ _mmcam_dbg_err("failed to get create glib context for mrp");
+ return MM_ERROR_RESOURCE_INTERNAL;
+ }
+
+ mrp_loop = g_main_loop_new(mrp_ctx, TRUE);
+
g_main_context_unref(mrp_ctx);
+ mrp_ctx = NULL;
+
+ if (!mrp_loop) {
+ _mmcam_dbg_err("failed to get create glib loop for mrp");
+ return MM_ERROR_RESOURCE_INTERNAL;
+ }
+
+ resource_manager->mloop = mrp_mainloop_glib_get(mrp_loop);
+
+ g_main_loop_unref(mrp_loop);
+ mrp_loop = NULL;
+
if (!resource_manager->mloop) {
_mmcam_dbg_err("failed to get mainloop for mrp");
return MM_ERROR_RESOURCE_INTERNAL;
resource_manager->context = mrp_res_create(resource_manager->mloop, __mmcamcorder_resource_state_callback, user_data);
if (!resource_manager->context) {
_mmcam_dbg_err("could not get context for mrp");
+
mrp_mainloop_destroy(resource_manager->mloop);
resource_manager->mloop = NULL;
+
return MM_ERROR_RESOURCE_INTERNAL;
}
mrp_res_delete_resource_set(resource_manager->rset);
resource_manager->rset = NULL;
}
+
if (resource_manager->context) {
_mmcam_dbg_log("destroy resource context");
mrp_res_destroy(resource_manager->context);
resource_manager->context = NULL;
}
- if (resource_manager->mrp_loop) {
- g_main_loop_quit(resource_manager->mrp_loop);
- resource_manager->mrp_loop = NULL;
- }
- g_thread_join(resource_manager->starter);
+
if (resource_manager->mloop) {
_mmcam_dbg_log("destroy resource mainloop");
+ mrp_mainloop_quit(resource_manager->mloop, 0);
mrp_mainloop_destroy(resource_manager->mloop);
resource_manager->mloop = NULL;
}