vblank: add tdm_vblank_get_output
[platform/core/uifw/libtdm.git] / src / tdm_server.c
index 5f88332..1bb5683 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.
@@ -169,13 +168,12 @@ _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;
        }
 
@@ -183,6 +181,10 @@ _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;
+
+       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);
 
@@ -339,6 +341,9 @@ _tdm_server_vblank_cb_wait_vblank(struct wl_client *client, struct wl_resource *
        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);
@@ -388,6 +393,9 @@ _tdm_server_vblank_cb_wait_vblank_seq(struct wl_client *client, struct wl_resour
        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);
@@ -486,7 +494,7 @@ _tdm_server_output_cb_create_vblank(struct wl_client *client, struct wl_resource
 
        wl_tdm_vblank_send_stamp(vblank_info->resource, vblank_info->stamp);
 
-       if (tdm_ttrace_module & TDM_TTRACE_CLIENT) {
+       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);
@@ -740,22 +748,9 @@ _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con
 }
 /* LCOV_EXCL_STOP */
 
-/* LCOV_EXCL_START */
-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
@@ -813,136 +808,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:
-       /* LCOV_EXCL_START */
-
-       if (buf)
-               free(buf);
-       if (grp)
-               free(grp);
-
-       return -1;
-
-       /* LCOV_EXCL_STOP */
-}
-
-static void
-_tdm_socket_init(tdm_private_loop *private_loop)
-{
-       const char *dir = NULL;
-       char socket_path[TDM_NAME_LEN * 2];
-       int ret = -1, len;
-       uid_t uid;
-       gid_t gid;
-
-       dir = getenv("XDG_RUNTIME_DIR");
-       if (!dir) {
-               /* LCOV_EXCL_START */
-
-               TDM_WRN("getting XDG_RUNTIME_DIR failed");
-               return;
-
-               /* LCOV_EXCL_STOP */
-       }
-
-       len = strlen(dir);
-       if (len > TDM_NAME_LEN - 1) {
-               TDM_ERR("XDG_RUNTIME_DIR is too long\n");
-               return;
-       }
-
-       strncpy(socket_path, dir, TDM_NAME_LEN - 1);
-       socket_path[TDM_NAME_LEN - 1] = '\0';
-
-       strncat(socket_path, "/tdm-socket", 11);
-       socket_path[TDM_NAME_LEN + 10] = '\0';
-
-       ret = chmod(socket_path, 509);
-       if (ret < 0) {
-               /* LCOV_EXCL_START */
-
-               TDM_WRN("changing modes of socket file failed:%s (%m)", socket_path);
-               return;
-
-               /* LCOV_EXCL_STOP */
-       }
-
-       ret = _tdm_getgrnam_r("root");
-       if (ret < 0) {
-               /* LCOV_EXCL_START */
-
-               TDM_WRN("getting uid failed");
-               return;
-
-               /* LCOV_EXCL_STOP */
-       }
-       uid = ret;
-
-       ret = _tdm_getgrnam_r("display");
-       if (ret < 0) {
-               /* LCOV_EXCL_START */
-
-               TDM_WRN("getting gid failed");
-               return;
-
-               /* LCOV_EXCL_STOP */
-       }
-       gid = ret;
-
-       ret = chown(socket_path, uid, gid);
-       if (ret < 0) {
-               /* LCOV_EXCL_START */
-
-               TDM_WRN("changing owner of socket file failed:%s (%m)", socket_path);
-               return;
-
-               /* LCOV_EXCL_STOP */
-       }
-}
-
 INTERN tdm_error
 tdm_server_init(tdm_private_loop *private_loop)
 {
@@ -963,8 +828,6 @@ tdm_server_init(tdm_private_loop *private_loop)
                /* LCOV_EXCL_STOP */
        }
 
-       _tdm_socket_init(private_loop);
-
        private_server = calloc(1, sizeof * private_server);
        if (!private_server) {
                TDM_ERR("alloc failed");