vblank: calculating SW target time properly
[platform/core/uifw/libtdm.git] / src / tdm_server.c
index 5d7159a..13a7867 100644 (file)
 #include "config.h"
 #endif
 
-#include "tdm.h"
+#include <tdm-server-protocol.h>
+
 #include "tdm_private.h"
-#include "tdm_list.h"
-#include "tdm-server-protocol.h"
 
 /* CAUTION:
  * - tdm server doesn't care about thread things.
@@ -72,6 +71,7 @@ typedef struct _tdm_server_vblank_info {
        struct wl_resource *resource;
 
        tdm_vblank *vblank;
+       unsigned int stamp;
 } tdm_server_vblank_info;
 
 typedef struct _tdm_server_wait_info {
@@ -79,12 +79,14 @@ typedef struct _tdm_server_wait_info {
        tdm_server_vblank_info *vblank_info;
 
        unsigned int req_id;
+       double req_time;
 } tdm_server_wait_info;
 
 typedef struct _tdm_server_client_info {
        struct list_head link;
        pid_t pid;
        char name[TDM_NAME_LEN];
+       struct wl_resource *resource;
 } tdm_server_client_info;
 
 static tdm_private_server *keep_private_server;
@@ -119,45 +121,7 @@ _tdm_server_get_process_name(pid_t pid, char *name, unsigned int size)
        fclose(h);
 }
 
-static tdm_output*
-_tdm_server_find_output(tdm_private_server *private_server, const char *name)
-{
-       tdm_private_loop *private_loop = private_server->private_loop;
-       tdm_output *found = NULL;
-
-       if (!strncasecmp(name, "primary", 7) || !strncasecmp(name, "default", 7))
-               found = tdm_display_get_output(private_loop->dpy, 0, NULL);
-
-       if (!found) {
-               int count = 0, i;
-
-               tdm_display_get_output_count(private_loop->dpy, &count);
-
-               for (i = 0; i < count; i++) {
-                       tdm_output *output = tdm_display_get_output(private_loop->dpy, i, NULL);
-                       tdm_output_conn_status status;
-                       const char *model = NULL;
-                       tdm_error ret;
-
-                       ret = tdm_output_get_conn_status(output, &status);
-                       if (ret || status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
-                               continue;
-
-                       ret = tdm_output_get_model_info(output, NULL, &model, NULL);
-                       if (ret || !model)
-                               continue;
-
-                       if (strncmp(model, name, TDM_NAME_LEN))
-                               continue;
-
-                       found = output;
-                       break;
-               }
-       }
-
-       return found;
-}
-
+/* LCOV_EXCL_START */
 static void
 _tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error,
                                          unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec)
@@ -165,34 +129,40 @@ _tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error,
        tdm_server_wait_info *found;
        tdm_server_vblank_info *vblank_info;
 
-       if (!keep_private_server)
-               return;
+       TDM_RETURN_IF_FAIL(keep_private_server != NULL);
 
        LIST_FIND_ITEM(wait_info, &keep_private_server->wait_list,
                                   tdm_server_wait_info, link, found);
        if (!found) {
-               TDM_DBG("wait_info(%p) is destroyed", wait_info);
+               TDM_ERR("wait_info(%p) is destroyed", wait_info);
                return;
        }
 
        if (tdm_debug_module & TDM_DEBUG_VBLANK)
                TDM_DBG("req_id(%d) done", wait_info->req_id);
 
-       TDM_TRACE_COUNT(ServerDoneVBlank, wait_info->req_id);
-
        vblank_info = wait_info->vblank_info;
+
+       if (tdm_ttrace_module & TDM_TTRACE_SERVER_VBLANK)
+               TDM_TRACE_ASYNC_END((int)wait_info->req_time, "TDM_Server_Vblank:%u", vblank_info->stamp);
+
        wl_tdm_vblank_send_done(vblank_info->resource, wait_info->req_id,
                                                        sequence, tv_sec, tv_usec, error);
+
        destroy_wait(wait_info);
 }
+/* LCOV_EXCL_STOP */
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_cb_vblank(tdm_vblank *vblank, tdm_error error, unsigned int sequence,
                                          unsigned int tv_sec, unsigned int tv_usec, void *user_data)
 {
        _tdm_server_send_done((tdm_server_wait_info*)user_data, error, sequence, tv_sec, tv_usec);
 }
+/* LCOV_EXCL_STOP */
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_cb_output_change(tdm_output *output, tdm_output_change_type type,
                                                         tdm_value value, void *user_data)
@@ -226,6 +196,7 @@ _tdm_server_cb_output_change(tdm_output *output, tdm_output_change_type type,
                break;
        }
 }
+/* LCOV_EXCL_STOP */
 
 static void
 destroy_wait(tdm_server_wait_info *wait_info)
@@ -255,42 +226,58 @@ destroy_vblank_callback(struct wl_resource *resource)
        free(vblank_info);
 }
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_vblank_cb_destroy(struct wl_client *client, struct wl_resource *resource)
 {
        wl_resource_destroy(resource);
 }
+/* LCOV_EXCL_STOP */
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_vblank_cb_set_name(struct wl_client *client, struct wl_resource *resource, const char *name)
 {
        tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+       tdm_error ret;
 
-       tdm_vblank_set_name(vblank_info->vblank, name);
+       ret = tdm_vblank_set_name(vblank_info->vblank, name);
+       TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 }
+/* LCOV_EXCL_STOP */
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_vblank_cb_set_fps(struct wl_client *client, struct wl_resource *resource, uint32_t fps)
 {
        tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+       tdm_error ret;
 
-       tdm_vblank_set_fps(vblank_info->vblank, fps);
+       ret = tdm_vblank_set_fps(vblank_info->vblank, fps);
+       TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 }
+/* LCOV_EXCL_STOP */
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_vblank_cb_set_offset(struct wl_client *client, struct wl_resource *resource, int32_t offset)
 {
        tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+       tdm_error ret;
 
-       tdm_vblank_set_offset(vblank_info->vblank, offset);
+       ret = tdm_vblank_set_offset(vblank_info->vblank, offset);
+       TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 }
+/* LCOV_EXCL_STOP */
 
 static void
 _tdm_server_vblank_cb_set_enable_fake(struct wl_client *client, struct wl_resource *resource, uint32_t enable_fake)
 {
        tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+       tdm_error ret;
 
-       tdm_vblank_set_enable_fake(vblank_info->vblank, enable_fake);
+       ret = tdm_vblank_set_enable_fake(vblank_info->vblank, enable_fake);
+       TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 }
 
 static void
@@ -304,22 +291,28 @@ _tdm_server_vblank_cb_wait_vblank(struct wl_client *client, struct wl_resource *
        unsigned int enable_fake = 0;
        tdm_error ret;
 
-       TDM_TRACE_COUNT(ServerWaitVBlank, req_id);
-
        wait_info = calloc(1, sizeof * wait_info);
        if (!wait_info) {
+               /* LCOV_EXCL_START */
+
                TDM_ERR("alloc failed");
                ret = TDM_ERROR_OUT_OF_MEMORY;
                goto wait_failed;
+
+               /* LCOV_EXCL_STOP */
        }
 
        LIST_ADDTAIL(&wait_info->link, &private_server->wait_list);
        wait_info->vblank_info = vblank_info;
        wait_info->req_id = req_id;
+       wait_info->req_time = TDM_TIME(req_sec, req_usec);
 
        if (tdm_debug_module & TDM_DEBUG_VBLANK)
                TDM_DBG("req_id(%d) wait", req_id);
 
+       if (tdm_ttrace_module & TDM_TTRACE_SERVER_VBLANK)
+               TDM_TRACE_ASYNC_BEGIN((int)wait_info->req_time, "TDM_Server_Vblank:%u", vblank_info->stamp);
+
        ret = tdm_vblank_wait(vblank_info->vblank, req_sec, req_usec, interval, _tdm_server_cb_vblank, wait_info);
 
        tdm_vblank_get_enable_fake(vblank_info->vblank, &enable_fake);
@@ -330,9 +323,13 @@ _tdm_server_vblank_cb_wait_vblank(struct wl_client *client, struct wl_resource *
 
        return;
 wait_failed:
+       /* LCOV_EXCL_START */
+
        wl_tdm_vblank_send_done(vblank_info->resource, req_id, 0, 0, 0, ret);
        if (wait_info)
                destroy_wait(wait_info);
+
+       /* LCOV_EXCL_STOP */
 }
 
 static void
@@ -346,22 +343,28 @@ _tdm_server_vblank_cb_wait_vblank_seq(struct wl_client *client, struct wl_resour
        unsigned int enable_fake = 0;
        tdm_error ret;
 
-       TDM_TRACE_COUNT(ServerWaitVBlank, req_id);
-
        wait_info = calloc(1, sizeof * wait_info);
        if (!wait_info) {
+               /* LCOV_EXCL_START */
+
                TDM_ERR("alloc failed");
                ret = TDM_ERROR_OUT_OF_MEMORY;
                goto wait_failed;
+
+               /* LCOV_EXCL_STOP */
        }
 
        LIST_ADDTAIL(&wait_info->link, &private_server->wait_list);
        wait_info->vblank_info = vblank_info;
        wait_info->req_id = req_id;
+       wait_info->req_time = TDM_TIME(req_sec, req_usec);
 
        if (tdm_debug_module & TDM_DEBUG_VBLANK)
                TDM_DBG("req_id(%d) wait", req_id);
 
+       if (tdm_ttrace_module & TDM_TTRACE_SERVER_VBLANK)
+               TDM_TRACE_ASYNC_BEGIN((int)wait_info->req_time, "TDM_Server_Vblank:%u", vblank_info->stamp);
+
        ret = tdm_vblank_wait_seq(vblank_info->vblank, req_sec, req_usec, sequence, _tdm_server_cb_vblank, wait_info);
 
        tdm_vblank_get_enable_fake(vblank_info->vblank, &enable_fake);
@@ -372,9 +375,13 @@ _tdm_server_vblank_cb_wait_vblank_seq(struct wl_client *client, struct wl_resour
 
        return;
 wait_failed:
+       /* LCOV_EXCL_START */
+
        wl_tdm_vblank_send_done(vblank_info->resource, req_id, 0, 0, 0, ret);
        if (wait_info)
                destroy_wait(wait_info);
+
+       /* LCOV_EXCL_STOP */
 }
 
 static const struct wl_tdm_vblank_interface tdm_vblank_implementation = {
@@ -387,11 +394,13 @@ static const struct wl_tdm_vblank_interface tdm_vblank_implementation = {
        _tdm_server_vblank_cb_wait_vblank_seq,
 };
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_output_cb_destroy(struct wl_client *client, struct wl_resource *resource)
 {
        wl_resource_destroy(resource);
 }
+/* LCOV_EXCL_STOP */
 
 static void
 _tdm_server_output_cb_create_vblank(struct wl_client *client, struct wl_resource *resource, uint32_t id)
@@ -407,41 +416,63 @@ _tdm_server_output_cb_create_vblank(struct wl_client *client, struct wl_resource
                wl_resource_create(client, &wl_tdm_vblank_interface,
                                                   wl_resource_get_version(resource), id);
        if (!vblank_resource) {
+               /* LCOV_EXCL_START */
+
                wl_resource_post_no_memory(resource);
                TDM_ERR("wl_resource_create failed");
                return;
+
+               /* LCOV_EXCL_STOP */
        }
 
        vblank = tdm_vblank_create(private_loop->dpy, output_info->output, NULL);
        if (!vblank) {
+               /* LCOV_EXCL_START */
+
                wl_resource_post_no_memory(resource);
                wl_resource_destroy(vblank_resource);
                TDM_ERR("tdm_vblank_create failed");
                return;
+
+               /* LCOV_EXCL_STOP */
        }
 
        vblank_info = calloc(1, sizeof * vblank_info);
        if (!vblank_info) {
+               /* LCOV_EXCL_START */
+
                wl_resource_post_no_memory(resource);
                wl_resource_destroy(vblank_resource);
                tdm_vblank_destroy(vblank);
                TDM_ERR("alloc 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;
        vblank_info->vblank = vblank;
+       vblank_info->stamp = (unsigned int)tdm_vblank_get_stamp(vblank);
 
        tdm_vblank_set_resource(vblank, vblank_resource);
 
        wl_resource_set_implementation(vblank_resource, &tdm_vblank_implementation,
                                                                   vblank_info, destroy_vblank_callback);
 
+       wl_tdm_vblank_send_stamp(vblank_info->resource, vblank_info->stamp);
+
+       if (tdm_ttrace_module & TDM_TTRACE_CLIENT_VBLANK) {
+               tdm_output *output = tdm_display_get_output(private_loop->dpy, tdm_ttrace_output, NULL);
+               if (output == output_info->output)
+                       wl_tdm_vblank_send_ttrace(vblank_info->resource, 1);
+       }
+
        return;
 }
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_output_cb_watch_output_changes(struct wl_client *client, struct wl_resource *resource, unsigned int enable)
 {
@@ -451,6 +482,7 @@ _tdm_server_output_cb_watch_output_changes(struct wl_client *client, struct wl_r
 
        output_info->watch_output_changes = enable;
 }
+/* LCOV_EXCL_STOP */
 
 static void
 _tdm_server_output_cb_get_connection(struct wl_client *client, struct wl_resource *resource)
@@ -462,7 +494,7 @@ _tdm_server_output_cb_get_connection(struct wl_client *client, struct wl_resourc
        TDM_RETURN_IF_FAIL(output_info != NULL);
 
        ret = tdm_output_get_conn_status(output_info->output, &status);
-       TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+       TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
 
        wl_tdm_output_send_connection(output_info->resource, status, ret);
 
@@ -482,14 +514,14 @@ _tdm_server_output_cb_get_mode(struct wl_client *client, struct wl_resource *res
        TDM_RETURN_IF_FAIL(output_info != NULL);
 
        ret = tdm_output_get_conn_status(output_info->output, &status);
-       TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+       TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
 
        if (status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
                const tdm_output_mode *mode = NULL;
                unsigned int hdisplay, vdisplay, vrefresh;
 
                ret = tdm_output_get_mode(output_info->output, &mode);
-               TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+               TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
 
                hdisplay = (mode) ? mode->hdisplay : 0;
                vdisplay = (mode) ? mode->vdisplay : 0;
@@ -515,13 +547,13 @@ _tdm_server_output_cb_get_dpms(struct wl_client *client, struct wl_resource *res
        TDM_RETURN_IF_FAIL(output_info != NULL);
 
        ret = tdm_output_get_conn_status(output_info->output, &status);
-       TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+       TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
 
        if (status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
                tdm_output_dpms dpms_value = TDM_OUTPUT_DPMS_OFF;
 
                ret = tdm_output_get_dpms(output_info->output, &dpms_value);
-               TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+               TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
 
                wl_tdm_output_send_dpms(output_info->resource, dpms_value, ret);
        } else {
@@ -573,29 +605,50 @@ _tdm_server_cb_create_output(struct wl_client *client, struct wl_resource *resou
        tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
        tdm_error ret;
 
-       output = _tdm_server_find_output(private_server, name);
+       output = tdm_display_find_output(private_server->private_loop->dpy, name, NULL);
        if (!output) {
+               /* LCOV_EXCL_START */
+
                TDM_ERR("There is no '%s' output", name);
                wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
                                                           "There is no '%s' output", name);
                return;
+
+               /* LCOV_EXCL_STOP */
        }
 
        output_resource =
                wl_resource_create(client, &wl_tdm_output_interface,
                                                   wl_resource_get_version(resource), id);
        if (!output_resource) {
+               /* LCOV_EXCL_START */
+
                wl_resource_post_no_memory(resource);
                TDM_ERR("wl_resource_create failed");
                return;
+
+               /* LCOV_EXCL_STOP */
        }
 
        output_info = calloc(1, sizeof * output_info);
        if (!output_info) {
+               /* LCOV_EXCL_START */
+
                wl_resource_post_no_memory(resource);
                wl_resource_destroy(output_resource);
                TDM_ERR("alloc failed");
                return;
+
+               /* LCOV_EXCL_STOP */
+       }
+
+       ret = tdm_output_add_change_handler(output, _tdm_server_cb_output_change, output_info);
+       if (ret != TDM_ERROR_NONE) {
+               wl_resource_post_no_memory(resource);
+               wl_resource_destroy(output_resource);
+               free(output_info);
+               TDM_ERR("tdm_output_add_change_handler failed");
+               return;
        }
 
        LIST_ADDTAIL(&output_info->link, &private_server->output_list);
@@ -604,8 +657,6 @@ _tdm_server_cb_create_output(struct wl_client *client, struct wl_resource *resou
        output_info->output = output;
        LIST_INITHEAD(&output_info->vblank_list);
 
-       tdm_output_add_change_handler(output, _tdm_server_cb_output_change, output_info);
-
        wl_resource_set_implementation(output_resource, &tdm_output_implementation,
                                                                   output_info, destroy_output_callback);
 
@@ -631,6 +682,7 @@ _tdm_server_cb_create_output(struct wl_client *client, struct wl_resource *resou
        }
 }
 
+/* LCOV_EXCL_START */
 static void
 _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, const char *options)
 {
@@ -670,21 +722,11 @@ _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con
 
        wl_tdm_send_debug_done(resource);
 }
-
-static void
-_tdm_server_cb_set_client_vblank_fps(struct wl_client *client, struct wl_resource *resource,
-                                                                        unsigned int pid, const char *name, unsigned int fps)
-{
-       tdm_error ret = tdm_vblank_set_client_vblank_fps(pid, name, fps);
-       TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
-
-       TDM_INFO("'%s' vblank fps(PID: '%u'): %u", name, pid, fps);
-}
+/* LCOV_EXCL_STOP */
 
 static const struct wl_tdm_interface tdm_implementation = {
        _tdm_server_cb_debug,
        _tdm_server_cb_create_output,
-       _tdm_server_cb_set_client_vblank_fps,
 };
 
 static void
@@ -692,15 +734,12 @@ destroy_client(struct wl_resource *resource)
 {
        tdm_server_client_info *c = NULL, *cc = NULL;
        struct wl_client *client;
-       pid_t pid = -1;
 
        client = wl_resource_get_client(resource);
        TDM_RETURN_IF_FAIL(client != NULL);
 
-       wl_client_get_credentials(client, &pid, NULL, NULL);
-
        LIST_FOR_EACH_ENTRY_SAFE(c, cc, &client_list, link) {
-               if (c->pid == pid) {
+               if (c->resource == resource) {
                        LIST_DEL(&c->link);
                        free(c);
                        return;
@@ -717,17 +756,27 @@ _tdm_server_bind(struct wl_client *client, void *data,
 
        resource = wl_resource_create(client, &wl_tdm_interface, version, id);
        if (!resource) {
+               /* LCOV_EXCL_START */
+
                wl_client_post_no_memory(client);
                return;
+
+               /* LCOV_EXCL_STOP */
        }
 
        cinfo = calloc(1, sizeof(tdm_server_client_info));
        if (!cinfo) {
+               /* LCOV_EXCL_START */
+
                wl_client_post_no_memory(client);
                wl_resource_destroy(resource);
                return;
+
+               /* LCOV_EXCL_STOP */
        }
 
+       cinfo->resource = resource;
+
        LIST_ADDTAIL(&cinfo->link, &client_list);
        wl_client_get_credentials(client, &cinfo->pid, NULL, NULL);
        _tdm_server_get_process_name(cinfo->pid, cinfo->name, TDM_NAME_LEN);
@@ -735,107 +784,6 @@ _tdm_server_bind(struct wl_client *client, void *data,
        wl_resource_set_implementation(resource, &tdm_implementation, data, destroy_client);
 }
 
-static int
-_tdm_getgrnam_r(const char *name)
-{
-       struct group *grp = NULL;
-       struct group *grp_res = NULL;
-       char* buf = NULL;
-       size_t buf_len;
-       int ret;
-       int id;
-
-       buf_len = sysconf(_SC_GETGR_R_SIZE_MAX);
-       if (buf_len == -1)
-               buf_len = 2048;
-
-       buf = calloc(1, buf_len * sizeof(char));
-       if (!buf) {
-               TDM_ERR("creating buffer failed");
-               goto failed;
-       }
-
-       grp = calloc(1, sizeof(struct group));
-       if (!grp) {
-               TDM_ERR("creating group failed");
-               goto failed;
-       }
-
-       ret = getgrnam_r(name, grp, buf, buf_len, &grp_res);
-       if (ret < 0) {
-               TDM_ERR("getgrnam_r failed errno:%d(%m)", ret);
-               goto failed;
-       }
-
-       if (grp_res == NULL) {
-               TDM_ERR("finding name:%s group failed", name);
-               goto failed;
-       }
-
-       id = grp->gr_gid;
-       free(buf);
-       free(grp);
-
-       return id;
-
-failed:
-       if (buf)
-               free(buf);
-       if (grp)
-               free(grp);
-
-       return -1;
-}
-
-static void
-_tdm_socket_init(tdm_private_loop *private_loop)
-{
-       const char *dir = NULL;
-       char socket_path[128];
-       int size;
-       int ret = -1;
-       uid_t uid;
-       gid_t gid;
-
-       dir = getenv("XDG_RUNTIME_DIR");
-       if (!dir) {
-               TDM_WRN("getting XDG_RUNTIME_DIR failed");
-               return;
-       }
-
-       size = snprintf(socket_path, sizeof(socket_path), "%s/%s", dir, "tdm-socket");
-       if (size >= (int)sizeof(socket_path)) {
-               TDM_WRN("too long: %s/tdm-socket", dir);
-               return;
-       };
-
-       ret = chmod(socket_path, 509);
-       if (ret < 0) {
-               TDM_WRN("changing modes of socket file failed:%s (%m)", socket_path);
-               return;
-       }
-
-       ret = _tdm_getgrnam_r("root");
-       if (ret < 0) {
-               TDM_WRN("getting uid failed");
-               return;
-       }
-       uid = ret;
-
-       ret = _tdm_getgrnam_r("display");
-       if (ret < 0) {
-               TDM_WRN("getting gid failed");
-               return;
-       }
-       gid = ret;
-
-       ret = chown(socket_path, uid, gid);
-       if (ret < 0) {
-               TDM_WRN("changing owner of socket file failed:%s (%m)", socket_path);
-               return;
-       }
-}
-
 INTERN tdm_error
 tdm_server_init(tdm_private_loop *private_loop)
 {
@@ -848,11 +796,13 @@ tdm_server_init(tdm_private_loop *private_loop)
                return TDM_ERROR_NONE;
 
        if (wl_display_add_socket(private_loop->wl_display, "tdm-socket")) {
+               /* LCOV_EXCL_START */
+
                TDM_ERR("createing a tdm-socket failed");
                return TDM_ERROR_OPERATION_FAILED;
-       }
 
-       _tdm_socket_init(private_loop);
+               /* LCOV_EXCL_STOP */
+       }
 
        private_server = calloc(1, sizeof * private_server);
        if (!private_server) {
@@ -865,9 +815,13 @@ tdm_server_init(tdm_private_loop *private_loop)
 
        if (!wl_global_create(private_loop->wl_display, &wl_tdm_interface, 1,
                                                  private_server, _tdm_server_bind)) {
+               /* LCOV_EXCL_START */
+
                TDM_ERR("creating a global resource failed");
                free(private_server);
                return TDM_ERROR_OUT_OF_MEMORY;
+
+               /* LCOV_EXCL_STOP */
        }
 
        private_server->private_loop = private_loop;
@@ -900,16 +854,16 @@ tdm_server_deinit(tdm_private_loop *private_loop)
                wl_resource_destroy(o->resource);
        }
 
+       LIST_FOR_EACH_ENTRY_SAFE(c, cc, &client_list, link) {
+               wl_resource_destroy(c->resource);
+       }
+
        free(private_server);
        private_loop->private_server = NULL;
        keep_private_server = NULL;
-
-       LIST_FOR_EACH_ENTRY_SAFE(c, cc, &client_list, link) {
-               LIST_DEL(&c->link);
-               free(c);
-       }
 }
 
+/* LCOV_EXCL_START */
 INTERN const char*
 tdm_server_get_client_name(pid_t pid)
 {
@@ -922,3 +876,29 @@ tdm_server_get_client_name(pid_t pid)
 
        return NULL;
 }
+/* LCOV_EXCL_STOP */
+
+/* LCOV_EXCL_START */
+INTERN tdm_error
+tdm_server_enable_ttrace_client_vblank(tdm_display *dpy, tdm_output *output, int enable)
+{
+       tdm_private_server *private_server = keep_private_server;
+       tdm_server_output_info *output_info = NULL;
+
+       if (!keep_private_server)
+               return TDM_ERROR_NONE;
+
+       LIST_FOR_EACH_ENTRY(output_info, &private_server->output_list, link) {
+               tdm_server_vblank_info *vblank_info = NULL;
+
+               if (output && output_info->output != output)
+                       continue;
+
+               LIST_FOR_EACH_ENTRY(vblank_info, &output_info->vblank_list, link) {
+                       wl_tdm_vblank_send_ttrace(vblank_info->resource, enable);
+               }
+       }
+
+       return TDM_ERROR_NONE;
+}
+/* LCOV_EXCL_STOP */