eliminate race condition

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

diff --git a/src/tdm_display.c b/src/tdm_display.c
index f7288dc..52ae2e3 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -100,7 +100,7 @@ tdm_display_get_capabilities(tdm_display *dpy, tdm_display_capability *capabilit
 
     pthread_mutex_lock(&private_display->lock);
 
-    *capabilities = private_display->caps_display.capabilities;
+    *capabilities = private_display->capabilities;
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -165,24 +165,6 @@ tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h, int
 }
 
 EXTERN tdm_error
-tdm_display_get_pp_available_properties(tdm_display *dpy, const tdm_prop **props, int *count)
-{
-    DISPLAY_FUNC_ENTRY();
-
-    TDM_RETURN_VAL_IF_FAIL(props != NULL, TDM_ERROR_INVALID_PARAMETER);
-    TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
-
-    pthread_mutex_lock(&private_display->lock);
-
-    *props = (const tdm_prop*)private_display->caps_pp.props;
-    *count = private_display->caps_pp.prop_count;
-
-    pthread_mutex_unlock(&private_display->lock);
-
-    return ret;
-}
-
-EXTERN tdm_error
 tdm_display_get_capture_capabilities(tdm_display *dpy, tdm_capture_capability *capabilities)
 {
     DISPLAY_FUNC_ENTRY();
@@ -581,14 +563,28 @@ static void
 _tdm_output_cb_vblank(tdm_output *output, unsigned int sequence,
                       unsigned int tv_sec, unsigned int tv_usec, void *user_data)
 {
-    tdm_private_output *private_output = output;
+    tdm_private_output *private_output;
+    tdm_private_display *private_display;
+    tdm_private_display *private_display_backend;
     tdm_private_vblank_handler *vblank_handler = user_data;
+    TDM_RETURN_IF_FAIL(vblank_handler);
 
+    private_output = vblank_handler->private_output;
     TDM_RETURN_IF_FAIL(private_output);
-    TDM_RETURN_IF_FAIL(vblank_handler);
+
+    private_display = private_output->private_display;
+    LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
+    {
+        if (private_output->output == output)
+            private_display_backend = private_output->private_display;
+    }
+
+    pthread_mutex_unlock(&private_display_backend->lock);
 
     if (vblank_handler->func)
-        vblank_handler->func(private_output, sequence, tv_sec, tv_usec, vblank_handler->user_data);
+        vblank_handler->func(vblank_handler->private_output, sequence, tv_sec, tv_usec, vblank_handler->user_data);
+
+    pthread_mutex_lock(&private_display_backend->lock);
 
     LIST_DEL(&vblank_handler->link);
     free(vblank_handler);
@@ -598,14 +594,28 @@ static void
 _tdm_output_cb_commit(tdm_output *output, unsigned int sequence,
                       unsigned int tv_sec, unsigned int tv_usec, void *user_data)
 {
-    tdm_private_output *private_output = output;
+    tdm_private_output *private_output;
+    tdm_private_display *private_display;
+    tdm_private_display *private_display_backend;
     tdm_private_commit_handler *commit_handler = user_data;
+    TDM_RETURN_IF_FAIL(commit_handler);
 
+    private_output = commit_handler->private_output;
     TDM_RETURN_IF_FAIL(private_output);
-    TDM_RETURN_IF_FAIL(commit_handler);
+
+    private_display = private_output->private_display;
+    LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
+    {
+        if (private_output->output == output)
+            private_display_backend = private_output->private_display;
+    }
+
+    pthread_mutex_unlock(&private_display_backend->lock);
 
     if (commit_handler->func)
-        commit_handler->func(private_output, sequence, tv_sec, tv_usec, commit_handler->user_data);
+        commit_handler->func(commit_handler->private_output, sequence, tv_sec, tv_usec, commit_handler->user_data);
+
+    pthread_mutex_lock(&private_display_backend->lock);
 
     LIST_DEL(&commit_handler->link);
     free(commit_handler);
@@ -637,6 +647,7 @@ tdm_output_wait_vblank(tdm_output *output, int interval, int sync, tdm_output_vb
     }
 
     LIST_ADD(&vblank_handler->link, &private_output->vblank_handler_list);
+    vblank_handler->private_output = private_output;
     vblank_handler->func = func;
     vblank_handler->user_data = user_data;
 
@@ -684,6 +695,7 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
     }
 
     LIST_ADD(&commit_handler->link, &private_output->commit_handler_list);
+    commit_handler->private_output = private_output;
     commit_handler->func = func;
     commit_handler->user_data = user_data;
 
@@ -866,8 +878,8 @@ tdm_layer_get_available_properties(tdm_layer *layer, const tdm_prop **props, int
 
     pthread_mutex_lock(&private_display->lock);
 
-    *props = (const tdm_prop*)private_output->caps.props;
-    *count = private_output->caps.prop_count;
+    *props = (const tdm_prop*)private_layer->caps.props;
+    *count = private_layer->caps.prop_count;
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -950,6 +962,8 @@ tdm_layer_set_info(tdm_layer *layer, tdm_info_layer *info)
 
     func_display = &private_display->func_display;
 
+    private_layer->usable = 0;
+
     if (!func_display->layer_set_info)
     {
         pthread_mutex_unlock(&private_display->lock);
@@ -1000,17 +1014,26 @@ tdm_layer_set_buffer(tdm_layer *layer, tdm_buffer *buffer)
 
     func_display = &private_display->func_display;
 
+    private_layer->usable = 0;
+
     if (!func_display->layer_set_buffer)
     {
         pthread_mutex_unlock(&private_display->lock);
         return TDM_ERROR_NONE;
     }
 
-    //TODO
+    if (private_layer->current_buffer)
+    {
+        /* TODO: need to unref after next buffer is showing on screen */
+        tdm_buffer_unref_backend(private_layer->current_buffer);
+        tdm_buffer_unref(private_layer->current_buffer);
+    }
+
+    private_layer->current_buffer = tdm_buffer_ref(buffer, NULL);
     tdm_buffer_ref_backend(buffer);
+
     ret = func_display->layer_set_buffer(private_layer->layer,
                                          tdm_buffer_get_surface(buffer));
-    tdm_buffer_unref_backend(buffer);
 
     pthread_mutex_unlock(&private_display->lock);
 
@@ -1027,6 +1050,15 @@ tdm_layer_unset_buffer(tdm_layer *layer)
 
     func_display = &private_display->func_display;
 
+    if (private_layer->current_buffer)
+    {
+        tdm_buffer_unref(private_layer->current_buffer);
+        tdm_buffer_unref_backend(private_layer->current_buffer);
+        private_layer->current_buffer = NULL;
+    }
+
+    private_layer->usable = 1;
+
     if (!func_display->layer_unset_buffer)
     {
         pthread_mutex_unlock(&private_display->lock);
@@ -1040,6 +1072,23 @@ tdm_layer_unset_buffer(tdm_layer *layer)
     return ret;
 }
 
+EXTERN tdm_error
+tdm_layer_is_usable(tdm_layer *layer, unsigned int *usable)
+{
+    LAYER_FUNC_ENTRY();
+
+    TDM_RETURN_VAL_IF_FAIL(usable != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+    pthread_mutex_lock(&private_display->lock);
+
+    *usable = private_layer->usable;
+
+    pthread_mutex_unlock(&private_display->lock);
+
+    return ret;
+}
+
+
 EXTERN tdm_capture*
 tdm_layer_create_capture(tdm_layer *layer, tdm_error *error)
 {