virtual (client): Add APIs and implementation for related commit.

tdm_client_voutput_add_commit_handler()
tdm_client_voutput_remove_commit_handler()
tdm_client_voutput_commit_done()

Change-Id: I895ae3e3478a140086801ab8599233b4d7faabde

diff --git a/client/tdm_client.c b/client/tdm_client.c
index 65c37da..9aac858 100644 (file)
--- a/client/tdm_client.c
+++ b/client/tdm_client.c
@@ -92,6 +92,7 @@ typedef struct _tdm_private_client_output {
 typedef struct _tdm_private_client_voutput {
     tdm_private_client_output base;
        struct wl_tdm_voutput *wl_voutput;
+       struct list_head commit_handler_list;
 
        struct
        {
@@ -157,6 +158,17 @@ typedef struct _tdm_client_wait_info {
        struct list_head call_link;
 } tdm_client_wait_info;
 
+typedef struct _tdm_client_voutput_commit_handler_info
+{
+       tdm_private_client_voutput *private_voutput;
+
+       tdm_client_voutput_commit_handler func;
+       void *user_data;
+
+       struct list_head link;
+       struct list_head call_link;
+} tdm_client_voutput_commit_handler_info;
+
 static unsigned int
 _tdm_client_check_wl_error(tdm_private_client *private_client, const char *func, int line)
 {
@@ -1615,6 +1627,33 @@ tdm_client_vblank_is_waiting(tdm_client_vblank *vblank)
 }
 
 void
+tdm_client_voutput_cb_commit(void *data, struct wl_tdm_voutput *wl_voutput)
+{
+       tdm_private_client_voutput *private_voutput;
+       tdm_private_client *private_client;
+       tdm_client_voutput_commit_handler_info *h = NULL, *hh = NULL;
+       struct list_head call_list;
+
+       private_voutput = (tdm_private_client_voutput *)data;
+       TDM_RETURN_IF_FAIL(private_voutput != NULL);
+
+       private_client = private_voutput->base.private_client;
+
+       LIST_INITHEAD(&call_list);
+
+       LIST_FOR_EACH_ENTRY(h, &private_voutput->commit_handler_list, link) {
+               LIST_ADDTAIL(&h->call_link, &call_list);
+       }
+
+       pthread_mutex_unlock(&private_client->lock);
+       LIST_FOR_EACH_ENTRY_SAFE(h, hh, &call_list, call_link) {
+               if (h->func)
+                       h->func(private_voutput, h->user_data);
+       }
+       pthread_mutex_lock(&private_client->lock);
+}
+
+void
 tdm_client_voutput_cb_ack_message(void *data, struct wl_tdm_voutput *wl_voutput, uint32_t msg)
 {
        tdm_private_client_voutput *private_voutput = data;
@@ -1623,6 +1662,7 @@ tdm_client_voutput_cb_ack_message(void *data, struct wl_tdm_voutput *wl_voutput,
 }
 
 static const struct wl_tdm_voutput_listener tdm_client_voutput_lisntener = {
+       tdm_client_voutput_cb_commit,
        tdm_client_voutput_cb_ack_message
 };
 
@@ -1693,6 +1733,8 @@ tdm_client_create_voutput(tdm_client *client, const char *name, tdm_error *error
                /* LOCV_EXCL_STOP */
        }
 
+       LIST_INITHEAD(&private_voutput->commit_handler_list);
+
        private_voutput->base.private_client = private_client;
 
        private_voutput->wl_voutput = wl_tdm_create_voutput((struct wl_tdm *)wrapper, private_voutput->base.name);
@@ -1742,6 +1784,7 @@ void
 tdm_client_voutput_destroy(tdm_client_voutput *voutput)
 {
        tdm_private_client_voutput *private_voutput = (tdm_private_client_voutput *)voutput;
+       tdm_client_voutput_commit_handler_info *h = NULL, *hh = NULL;
 
        if (!private_voutput)
                return;
@@ -1752,6 +1795,11 @@ tdm_client_voutput_destroy(tdm_client_voutput *voutput)
        if (private_voutput->available_formats.formats)
                free(private_voutput->available_formats.formats);
 
+       LIST_FOR_EACH_ENTRY_SAFE(h, hh, &private_voutput->commit_handler_list, link) {
+               LIST_DEL(&h->link);
+               free(h);
+       }
+
        wl_tdm_voutput_destroy(private_voutput->wl_voutput);
 
        free(private_voutput);
@@ -1835,6 +1883,93 @@ tdm_client_voutput_set_physical_size(tdm_client_voutput *voutput, unsigned int m
        return TDM_ERROR_NONE;
 }
 
+tdm_error
+tdm_client_voutput_add_commit_handler(tdm_client_voutput *voutput,
+                                                                         tdm_client_voutput_commit_handler func,
+                                                                         void *user_data)
+{
+       tdm_private_client_voutput *private_voutput;
+       tdm_private_client *private_client;
+       tdm_client_voutput_commit_handler_info *h = NULL;
+
+       TDM_RETURN_VAL_IF_FAIL(voutput != NULL, TDM_ERROR_INVALID_PARAMETER);
+       TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+       private_voutput = (tdm_private_client_voutput *)voutput;
+       private_client = private_voutput->base.private_client;
+
+       LIST_FOR_EACH_ENTRY(h, &private_voutput->commit_handler_list, link) {
+               if (h->func == func && h->user_data == user_data) {
+                       TDM_ERR("can't add twice");
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       h = calloc(1, sizeof *h);
+       TDM_RETURN_VAL_IF_FAIL(h != NULL, TDM_ERROR_OUT_OF_MEMORY);
+
+       pthread_mutex_lock(&private_client->lock);
+
+       if (CHECK_WL_PROTOCOL_ERROR(private_client)) {
+               free(h);
+               pthread_mutex_unlock(&private_client->lock);
+               return TDM_ERROR_PROTOCOL_ERROR;
+       }
+
+       h->private_voutput = private_voutput;
+       h->func = func;
+       h->user_data = user_data;
+       LIST_ADDTAIL(&h->link, &private_voutput->commit_handler_list);
+       LIST_INITHEAD(&h->call_link);
+
+       pthread_mutex_unlock(&private_client->lock);
+
+       return TDM_ERROR_NONE;
+}
+
+void
+tdm_client_voutput_remove_commit_handler(tdm_client_voutput *voutput,
+                                                                                tdm_client_voutput_commit_handler func,
+                                                                                void *user_data)
+{
+       tdm_private_client_voutput *private_voutput;
+       tdm_private_client *private_client;
+       tdm_client_voutput_commit_handler_info *h = NULL;
+
+       TDM_RETURN_IF_FAIL(voutput != NULL);
+       TDM_RETURN_IF_FAIL(func != NULL);
+
+       private_voutput = (tdm_private_client_voutput *)voutput;
+       private_client = private_voutput->base.private_client;
+
+       pthread_mutex_lock(&private_client->lock);
+
+       LIST_FOR_EACH_ENTRY(h, &private_voutput->commit_handler_list, link) {
+               if (h->func != func || h->user_data != user_data)
+                       continue;
+
+               LIST_DEL(&h->link);
+               free(h);
+
+               pthread_mutex_unlock(&private_client->lock);
+       }
+
+       pthread_mutex_unlock(&private_client->lock);
+}
+
+tdm_error
+tdm_client_voutput_commit_done(tdm_client_voutput *voutput)
+{
+       tdm_private_client_voutput *private_voutput;
+
+       TDM_RETURN_VAL_IF_FAIL(voutput != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+       private_voutput = (tdm_private_client_voutput *)voutput;
+       wl_tdm_voutput_commit_done(private_voutput->wl_voutput);
+
+       return TDM_ERROR_NONE;
+}
+
 tdm_client_output *
 tdm_client_voutput_get_client_output(tdm_client_voutput *voutput, tdm_error *error)
 {

diff --git a/client/tdm_client.h b/client/tdm_client.h
index c0ffeb7..d6dc32a 100644 (file)
--- a/client/tdm_client.h
+++ b/client/tdm_client.h
@@ -448,11 +448,17 @@ tdm_error
 tdm_client_voutput_set_physical_size(tdm_client_voutput *voutput, unsigned int mmWidth, unsigned int mmHeight);
 
 tdm_error
-tdm_client_voutput_add_commit_handler(tdm_client_voutput *voutput, tdm_client_voutput_commit_handler *func);
+tdm_client_voutput_add_commit_handler(tdm_client_voutput *voutput, tdm_client_voutput_commit_handler func, void *user_data);
+
+void
+tdm_client_voutput_remove_commit_handler(tdm_client_voutput *voutput, tdm_client_voutput_commit_handler func, void *user_data);
 
 tdm_error
 tdm_client_voutput_get_committed_tbm_surface(tdm_client_voutput *voutput, tbm_surface_h surface);
 
+tdm_error
+tdm_client_voutput_commit_done(tdm_client_voutput *voutput);
+
 tdm_client_output *
 tdm_client_voutput_get_client_output(tdm_client_voutput *voutput, tdm_error *error);
 

diff --git a/haltests/src/tc_tdm_client.cpp b/haltests/src/tc_tdm_client.cpp
index 1ee78c5..fc43491 100644 (file)
--- a/haltests/src/tc_tdm_client.cpp
+++ b/haltests/src/tc_tdm_client.cpp
@@ -1598,6 +1598,38 @@ TEST_F(TDMVirtualOutput, FailTestSetPhysicalSize)
        ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
 }
 
+static void
+_tc_tdm_client_voutput_commit_handler(tdm_client_voutput *voutput, void *user_data)
+{
+       int *flag;
+       flag = (int *)user_data;
+       *flag = 1;
+}
+
+TEST_F(TDMVirtualOutput, AddCommitHandler)
+{
+       tdm_error ret;
+       int flag_callback_called = 0;
+
+       ret = tdm_client_voutput_add_commit_handler(this->voutput,
+                                                                                               _tc_tdm_client_voutput_commit_handler,
+                                                                                               &flag_callback_called);
+       ASSERT_EQ(ret, TDM_ERROR_NONE);
+//     ASSERT_EQ(flag_callback_called, 1);
+
+       tdm_client_voutput_remove_commit_handler(this->voutput,
+                                                                                        _tc_tdm_client_voutput_commit_handler,
+                                                                                        &flag_callback_called);
+}
+
+TEST_F(TDMVirtualOutput, CommitDone)
+{
+       tdm_error ret;
+
+       ret = tdm_client_voutput_commit_done(this->voutput);
+       ASSERT_EQ(ret, TDM_ERROR_NONE);
+}
+
 TEST_F(TDMVirtualOutput, GetClientOutput)
 {
        tdm_error ret;

diff --git a/protocol/tdm.xml b/protocol/tdm.xml
index f36636e..3de2c0f 100644 (file)
--- a/protocol/tdm.xml
+++ b/protocol/tdm.xml
@@ -94,6 +94,9 @@
 
         <request name="disconnect"/>
 
+        <request name="commit_done"/>
+
+        <event name="commit"/>
         <event name="ack_message">
             <arg name="msg" type="uint" enum="message" summary=""/>
         </event>

diff --git a/src/tdm_server.c b/src/tdm_server.c
index 08fb539..b99980b 100644 (file)
--- a/src/tdm_server.c
+++ b/src/tdm_server.c
@@ -821,13 +821,27 @@ _tdm_voutput_cb_disconnect(struct wl_client *client, struct wl_resource *resourc
        tdm_output_set_disconnect(voutput_info->output);
 }
 
+static void
+_tdm_voutput_cb_commit_done(struct wl_client *client, struct wl_resource *resource)
+{
+       tdm_server_voutput_info *voutput_info;
+
+       voutput_info = wl_resource_get_user_data(resource);
+       if (voutput_info->status != TDM_OUTPUT_CONN_STATUS_CONNECTED)
+       {
+               // handle error
+               return;
+       }
+}
+
 static const struct wl_tdm_voutput_interface tdm_voutput_implementation = {
        _tdm_voutput_cb_destroy,
        _tdm_voutput_cb_set_available_modes,
        _tdm_voutput_cb_set_available_formats,
        _tdm_voutput_cb_set_physical_size,
        _tdm_voutput_cb_connect,
-       _tdm_voutput_cb_disconnect
+       _tdm_voutput_cb_disconnect,
+       _tdm_voutput_cb_commit_done
 };
 
 void