hwc: redesign the hwc

[platform/core/uifw/libtdm.git] / src / tdm_thread.c

diff --git a/src/tdm_thread.c b/src/tdm_thread.c
index 4f4626f..997d772 100644 (file)
--- a/src/tdm_thread.c
+++ b/src/tdm_thread.c
@@ -9,7 +9,7 @@
  *          Taeheon Kim <th908.kim@samsung.com>,
  *          YoungJun Cho <yj44.cho@samsung.com>,
  *          SooChan Lim <sc1.lim@samsung.com>,
- *          Boram Park <sc1.lim@samsung.com>
+ *          Boram Park <boram1288.park@samsung.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -46,6 +46,8 @@ struct _tdm_private_thread {
 
        pthread_cond_t event_cond;
        pthread_t event_thread;
+       unsigned int event_thread_exit;
+       unsigned int event_thread_joined;
 
        pid_t display_tid;
        pid_t thread_tid;
@@ -152,6 +154,9 @@ _tdm_thread_main(void *data)
                        TDM_INFO("server flush");
                tdm_event_loop_flush(private_loop->dpy);
 
+               if (private_thread->event_thread_exit)
+                       break;
+
                if (tdm_debug_module & TDM_DEBUG_EVENT)
                        TDM_INFO("fd(%d) polling in", fd);
 
@@ -181,6 +186,22 @@ exit_thread:
        pthread_exit(NULL);
 }
 
+static tdm_error
+_tdm_thread_exit(tdm_private_loop *private_loop)
+{
+       tdm_thread_cb_base cb_base;
+       tdm_error ret;
+
+       memset(&cb_base, 0, sizeof cb_base);
+       cb_base.type = TDM_THREAD_CB_EXIT;
+       cb_base.length = sizeof cb_base;
+
+       ret = tdm_thread_send_cb(private_loop, &cb_base);
+       TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
+
+       return ret;
+}
+
 /* NOTE: tdm thread doesn't care about multi-thread. */
 INTERN tdm_error
 tdm_thread_init(tdm_private_loop *private_loop)
@@ -269,20 +290,16 @@ tdm_thread_deinit(tdm_private_loop *private_loop)
 {
        tdm_private_display *private_display;
        tdm_private_thread_cb *cb = NULL, *hh = NULL;
-       int i;
+       tdm_error ret;
 
        TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
 
-       for (i = 0; i < TDM_THREAD_CB_MAX; i++)
-               find_funcs[i] = NULL;
-
        if (!private_loop->private_thread)
                return;
 
-       if (private_loop->private_thread->sub_event_source)
-               tdm_event_loop_source_remove(private_loop->private_thread->sub_event_source);
-
-       pthread_cancel(private_loop->private_thread->event_thread);
+       ret = _tdm_thread_exit(private_loop);
+       if (ret != TDM_ERROR_NONE)
+               pthread_cancel(private_loop->private_thread->event_thread);
 
        private_display = private_loop->dpy;
 
@@ -291,10 +308,15 @@ tdm_thread_deinit(tdm_private_loop *private_loop)
         */
        _pthread_mutex_unlock(&private_display->lock);
        pthread_join(private_loop->private_thread->event_thread, NULL);
+       private_loop->private_thread->event_thread_joined = 1;
+       TDM_INFO("Joined a TDM event thread");
 
        pthread_mutex_unlock(&cb_list_lock);
        tdm_log_reset();
 
+       if (private_loop->private_thread->sub_event_source)
+               tdm_event_loop_source_remove(private_loop->private_thread->sub_event_source);
+
        LIST_FOR_EACH_ENTRY_SAFE(cb, hh, &cb_list[0], link) {
                _tdm_thread_free_cb(cb);
        }
@@ -437,11 +459,14 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
                case TDM_THREAD_CB_CAPTURE_DONE:
                case TDM_THREAD_CB_VBLANK_SW:
                case TDM_THREAD_CB_VBLANK_CREATE:
-               case TDM_THREAD_CB_NEED_VALIDATE:
+               case TDM_THREAD_CB_HWC_COMMIT:
                        /* this event comes from other thread. so we don't need to propagate this to other thread */
                        ret = tdm_thread_cb_call(NULL, base, 0);
                        TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
                        break;
+               case TDM_THREAD_CB_EXIT:
+                       private_thread->event_thread_exit = 1;
+                       break;
                default:
                        break;
                }
@@ -467,7 +492,7 @@ tdm_thread_is_running(void)
 {
        /* DON'T check TDM_MUTEX_IS_LOCKED here */
 
-       return (keep_private_thread) ? 1 : 0;
+       return (keep_private_thread && !keep_private_thread->event_thread_joined) ? 1 : 0;
 }
 
 static void
@@ -615,16 +640,18 @@ tdm_thread_cb_call(void *object, tdm_thread_cb_base *cb_base, unsigned int propa
 
        assert(find_funcs[cb_base->type] != NULL);
 
+       if (keep_private_thread && keep_private_thread->thread_tid != caller_tid) {
+               /* A sync-type event from display-thread to tdm-thread can't be handled.
+                * If sync-type events happen in both threads at the same time,
+                * it would make a deadlock issue.
+                */
+               assert(cb_base->sync != 1);
+       }
+
        if (tdm_debug_module & TDM_DEBUG_THREAD)
                TDM_INFO("'%s' thread_cb (sync:%d, propagation:%d) ------",
                                 tdm_cb_type_str(cb_base->type), cb_base->sync, propagation);
 
-       /* handling only output-status as sync. below logic can't handle two sync-type events */
-       if (cb_base->type == TDM_THREAD_CB_OUTPUT_STATUS)
-               assert(cb_base->sync == 1);
-       else
-               assert(cb_base->sync == 0);
-
        if (!object) {
                object = find_funcs[cb_base->type](private_display, cb_base->object_stamp);
                if (!object) {