tdm_server: Use timeout handler of vblank instead timer

Remove duplicate timer for vblank

Change-Id: Iacde2b99f77ed910f351ca6247ba7d5894ff9629

diff --git a/src/tdm_server.c b/src/tdm_server.c
index a5274e1..e13fb83 100644 (file)
--- a/src/tdm_server.c
+++ b/src/tdm_server.c
@@ -104,9 +104,6 @@ typedef struct _tdm_server_vblank_info {
 
        tdm_vblank *vblank;
        unsigned int stamp;
-
-       /* for timeout */
-       tdm_event_loop_source *vblank_timeout_timer;
 } tdm_server_vblank_info;
 
 typedef struct _tdm_server_wait_info {
@@ -135,7 +132,6 @@ static tdm_private_server *keep_private_server;
 static struct list_head client_list;
 
 static void destroy_wait(tdm_server_wait_info *wait_info);
-static void _tdm_server_vblank_timeout_update(tdm_server_vblank_info *vblank_info, int ms_delay);
 
 static void
 _tdm_server_get_process_name(pid_t pid, char *name, unsigned int size)
@@ -170,9 +166,6 @@ _tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error,
 {
        tdm_server_wait_info *found;
        tdm_server_vblank_info *vblank_info;
-       tdm_server_output_info *output_info;
-       tdm_private_server *private_server;
-       tdm_private_loop *private_loop;
 
        TDM_RETURN_IF_FAIL(keep_private_server != NULL);
 
@@ -187,13 +180,6 @@ _tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error,
                TDM_DBG("req_id(%d) done", wait_info->req_id);
 
        vblank_info = wait_info->vblank_info;
-       output_info = vblank_info->output_info;
-       private_server = output_info->private_server;
-       private_loop = private_server->private_loop;
-
-       tdm_display_lock(private_loop->dpy);
-       _tdm_server_vblank_timeout_update(vblank_info, 0);
-       tdm_display_unlock(private_loop->dpy);
 
        if (tdm_ttrace_module & TDM_TTRACE_SERVER_VBLANK)
                TDM_TRACE_ASYNC_END((int)wait_info->req_time, "TDM_Server_Vblank:%u", vblank_info->stamp);
@@ -207,8 +193,8 @@ _tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error,
 /* LCOV_EXCL_STOP */
 
 /* LCOV_EXCL_START */
-static tdm_error
-_tdm_server_timeout_timer_cb(void *user_data)
+static void
+_tdm_server_vblank_timeout_cb(tdm_vblank *vblank, void *user_data)
 {
        tdm_server_vblank_info *vblank_info = user_data;
        tdm_server_wait_info *wait_info = NULL;
@@ -216,8 +202,8 @@ _tdm_server_timeout_timer_cb(void *user_data)
        unsigned int tv_sec;
        unsigned int tv_usec;
 
-       TDM_RETURN_VAL_IF_FAIL(vblank_info != NULL, TDM_ERROR_OPERATION_FAILED);
-       TDM_RETURN_VAL_IF_FAIL(keep_private_server != NULL, TDM_ERROR_OPERATION_FAILED);
+       TDM_RETURN_IF_FAIL(vblank_info != NULL);
+       TDM_RETURN_IF_FAIL(keep_private_server != NULL);
 
        curr = tdm_helper_get_time();
        tv_sec = TDM_TIME_SEC(curr);
@@ -232,38 +218,6 @@ _tdm_server_timeout_timer_cb(void *user_data)
                TDM_ERR("tdm_server_vblank(%p) req_id(%d) timeout force send vblank", vblank_info, wait_info->req_id);
                wait_info->timeout = 1;
        }
-
-       return TDM_ERROR_NONE;
-}
-
-static void
-_tdm_server_vblank_timeout_update(tdm_server_vblank_info *vblank_info, int ms_delay)
-{
-       tdm_server_output_info *output_info = vblank_info->output_info;
-       tdm_private_server *private_server = output_info->private_server;
-       tdm_private_loop *private_loop = private_server->private_loop;
-       tdm_error ret;
-
-       if (!vblank_info->vblank_timeout_timer) {
-               vblank_info->vblank_timeout_timer =
-                       tdm_event_loop_add_timer_handler(private_loop->dpy,
-                                                                                        _tdm_server_timeout_timer_cb,
-                                                                                        vblank_info,
-                                                                                        &ret);
-               if (!vblank_info->vblank_timeout_timer) {
-                       TDM_ERR("tdm_server_vblank(%p) couldn't add timer", vblank_info);
-                       return;
-               }
-
-               if (tdm_debug_module & TDM_DEBUG_VBLANK)
-                       TDM_INFO("tdm_server_vblank(%p) create vblank timeout timer", vblank_info);
-       }
-
-       ret = tdm_event_loop_source_timer_update(vblank_info->vblank_timeout_timer, ms_delay);
-       if (ret != TDM_ERROR_NONE) {
-               TDM_ERR("tdm_server_vblank(%p) couldn't update timer", vblank_info);
-               return;
-       }
 }
 
 static void
@@ -339,19 +293,10 @@ static void
 destroy_vblank_callback(struct wl_resource *resource)
 {
        tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
-       tdm_server_output_info *output_info = vblank_info->output_info;
-       tdm_private_server *private_server = output_info->private_server;
-       tdm_private_loop *private_loop = private_server->private_loop;
        tdm_server_wait_info *w = NULL, *ww = NULL;
 
        TDM_RETURN_IF_FAIL(vblank_info != NULL);
 
-       if (vblank_info->vblank_timeout_timer) {
-               tdm_display_lock(private_loop->dpy);
-               tdm_event_loop_source_remove(vblank_info->vblank_timeout_timer);
-               tdm_display_unlock(private_loop->dpy);
-       }
-
        LIST_DEL(&vblank_info->link);
 
        if (vblank_info->vblank)
@@ -425,7 +370,6 @@ _tdm_server_vblank_wait_vblank(tdm_server_vblank_info *vblank_info, tdm_server_v
 {
        tdm_server_output_info *output_info = vblank_info->output_info;
        tdm_private_server *private_server = output_info->private_server;
-       tdm_private_loop *private_loop = private_server->private_loop;
        tdm_server_wait_info *wait_info;
        unsigned int enable_fake = 0;
        tdm_error ret;
@@ -464,12 +408,6 @@ _tdm_server_vblank_wait_vblank(tdm_server_vblank_info *vblank_info, tdm_server_v
 
        TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, wait_failed);
 
-       if (wait_type == VBLANK_WAIT_TYPE_INTERVAL) {
-               tdm_display_lock(private_loop->dpy);
-               _tdm_server_vblank_timeout_update(vblank_info, 1000);
-               tdm_display_unlock(private_loop->dpy);
-       }
-
        return;
 
 wait_failed:
@@ -525,6 +463,7 @@ _tdm_server_output_cb_create_vblank(struct wl_client *client, struct wl_resource
        struct wl_resource *vblank_resource;
        tdm_vblank *vblank;
        tdm_server_vblank_info *vblank_info;
+       tdm_error ret;
 
        vblank_resource =
                wl_resource_create(client, &wl_tdm_vblank_interface,
@@ -564,6 +503,20 @@ _tdm_server_output_cb_create_vblank(struct wl_client *client, struct wl_resource
                /* LCOV_EXCL_STOP */
        }
 
+       ret = tdm_vblank_set_timeout_handler(vblank, _tdm_server_vblank_timeout_cb, vblank_info);
+       if (ret != TDM_ERROR_NONE) {
+               /* LCOV_EXCL_START */
+
+               wl_resource_post_no_memory(resource);
+               wl_resource_destroy(vblank_resource);
+               tdm_vblank_destroy(vblank);
+               free(vblank_info);
+               TDM_ERR("tdm_vblank_set_timeout_handler failed");
+               return;
+
+               /* LCOV_EXCL_STOP */
+       }
+
        LIST_ADDTAIL(&vblank_info->link, &output_info->vblank_list);
        vblank_info->output_info = output_info;
        vblank_info->resource = vblank_resource;