use vblank instead of the output commit handler in case of tdm_layer_commit

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

diff --git a/src/tdm_thread.c b/src/tdm_thread.c
index 3ae6d0b..4659740 100644 (file)
--- a/src/tdm_thread.c
+++ b/src/tdm_thread.c
@@ -86,16 +86,16 @@ _tdm_thread_main(void *data)
        fds.revents = 0;
 
        while (1) {
-               if (tdm_debug_thread)
+               if (tdm_debug_module & TDM_DEBUG_THREAD)
                        TDM_INFO("server flush");
                tdm_event_loop_flush(private_loop->dpy);
 
-               if (tdm_debug_thread)
+               if (tdm_debug_module & TDM_DEBUG_THREAD)
                        TDM_INFO("fd(%d) polling in", fd);
 
                ret = poll(&fds, 1, -1);
 
-               if (tdm_debug_thread)
+               if (tdm_debug_module & TDM_DEBUG_THREAD)
                        TDM_INFO("fd(%d) polling out", fd);
 
                if (ret < 0) {
@@ -107,7 +107,7 @@ _tdm_thread_main(void *data)
                        }
                }
 
-               if (tdm_debug_thread)
+               if (tdm_debug_module & TDM_DEBUG_THREAD)
                        TDM_INFO("thread got events");
 
                if (tdm_event_loop_dispatch(private_loop->dpy) < 0)
@@ -173,12 +173,21 @@ tdm_thread_init(tdm_private_loop *private_loop)
 INTERN void
 tdm_thread_deinit(tdm_private_loop *private_loop)
 {
+       tdm_private_display *private_display;
+
        TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
 
        if (!private_loop->private_thread)
                return;
 
        pthread_cancel(private_loop->private_thread->event_thread);
+
+       private_display = private_loop->dpy;
+
+       /* before falling into the block of pthread_join, we have to unlock the mutex
+        * for subthread to use the mutex.
+        */
+       _pthread_mutex_unlock(&private_display->lock);
        pthread_join(private_loop->private_thread->event_thread, NULL);
 
        if (private_loop->private_thread->pipe[0] >= 0)
@@ -220,7 +229,7 @@ tdm_thread_send_cb(tdm_private_loop *private_loop, tdm_thread_cb_base *base)
 
        private_thread = private_loop->private_thread;
 
-       if (tdm_debug_thread)
+       if (tdm_debug_module & TDM_DEBUG_THREAD)
                TDM_INFO("fd(%d) type(%d), length(%d)",
                                 private_thread->pipe[1], base->type, base->length);
 
@@ -252,7 +261,7 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
 
        len = read(private_thread->pipe[0], buffer, sizeof buffer);
 
-       if (tdm_debug_thread)
+       if (tdm_debug_module & TDM_DEBUG_THREAD)
                TDM_INFO("fd(%d) read length(%d)", private_thread->pipe[0], len);
 
        if (len == 0)
@@ -268,7 +277,7 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
        i = 0;
        while (i < len) {
                base = (tdm_thread_cb_base*)&buffer[i];
-               if (tdm_debug_thread)
+               if (tdm_debug_module & TDM_DEBUG_THREAD)
                        TDM_INFO("type(%d), length(%d)", base->type, base->length);
                switch (base->type) {
                case TDM_THREAD_CB_OUTPUT_COMMIT: {
@@ -276,7 +285,7 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
                        tdm_output *output_backend =
                                tdm_display_find_output_stamp(private_loop->dpy, output_commit->output_stamp);
                        if (!output_backend) {
-                               TDM_WRN("no output(%ld)", output_commit->output_stamp);
+                               TDM_WRN("no output(%f)", output_commit->output_stamp);
                                break;
                        }
                        tdm_output_cb_commit(output_backend, output_commit->sequence,
@@ -289,7 +298,7 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
                        tdm_output *output_backend =
                                tdm_display_find_output_stamp(private_loop->dpy, output_vblank->output_stamp);
                        if (!output_backend) {
-                               TDM_WRN("no output(%ld)", output_vblank->output_stamp);
+                               TDM_WRN("no output(%f)", output_vblank->output_stamp);
                                break;
                        }
                        tdm_output_cb_vblank(output_backend, output_vblank->sequence,
@@ -302,19 +311,30 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
                        tdm_output *output_backend =
                                tdm_display_find_output_stamp(private_loop->dpy, output_status->output_stamp);
                        if (!output_backend) {
-                               TDM_WRN("no output(%ld)", output_status->output_stamp);
+                               TDM_WRN("no output(%f)", output_status->output_stamp);
                                break;
                        }
                        tdm_output_cb_status(output_backend, output_status->status,
                                                                 output_status->user_data);
                        break;
                }
+               case TDM_THREAD_CB_OUTPUT_DPMS: {
+                       tdm_thread_cb_output_dpms *output_dpms = (tdm_thread_cb_output_dpms*)base;
+                       tdm_output *output_backend =
+                               tdm_display_find_output_stamp(private_loop->dpy, output_dpms->output_stamp);
+                       if (!output_backend) {
+                               TDM_WRN("no output(%f)", output_dpms->output_stamp);
+                               break;
+                       }
+                       tdm_output_cb_dpms(output_backend, output_dpms->dpms, output_dpms->user_data);
+                       break;
+               }
                case TDM_THREAD_CB_PP_DONE: {
                        tdm_thread_cb_pp_done *pp_done = (tdm_thread_cb_pp_done*)base;
                        tdm_pp *pp_backend =
                                tdm_pp_find_stamp(private_loop->dpy, pp_done->pp_stamp);
                        if (!pp_backend) {
-                               TDM_WRN("no pp(%ld)", pp_done->pp_stamp);
+                               TDM_WRN("no pp(%f)", pp_done->pp_stamp);
                                break;
                        }
                        tdm_pp_cb_done(pp_backend, pp_done->src, pp_done->dst, pp_done->user_data);
@@ -325,12 +345,17 @@ tdm_thread_handle_cb(tdm_private_loop *private_loop)
                        tdm_capture *capture_backend =
                                tdm_capture_find_stamp(private_loop->dpy, capture_done->capture_stamp);
                        if (!capture_backend) {
-                               TDM_WRN("no capture(%ld)", capture_done->capture_stamp);
+                               TDM_WRN("no capture(%f)", capture_done->capture_stamp);
                                break;
                        }
                        tdm_capture_cb_done(capture_backend, capture_done->buffer, capture_done->user_data);
                        break;
                }
+               case TDM_THREAD_CB_VBLANK_SW: {
+                       tdm_thread_cb_vblank_sw *vblank_sw = (tdm_thread_cb_vblank_sw*)base;
+                       tdm_vblank_cb_vblank_SW(NULL, vblank_sw->vblank_stamp);
+                       break;
+               }
                default:
                        break;
                }