tdm_backend: change _check_abi_version() return value

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

diff --git a/src/tdm.c b/src/tdm.c
index b04ab2d..74ebcb2 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -74,8 +74,7 @@ _tdm_display_find_private_output(tdm_private_display *private_display,
 }
 
 INTERN tdm_private_output *
-tdm_display_find_output_stamp(tdm_private_display *private_display,
-                                                         unsigned long stamp)
+tdm_display_find_output_stamp(tdm_private_display *private_display, double stamp)
 {
        tdm_private_output *private_output = NULL;
 
@@ -293,13 +292,17 @@ _tdm_display_update_caps_output(tdm_private_display *private_display, int pipe,
        tdm_func_output *func_output = &private_display->func_output;
        char temp[TDM_NAME_LEN];
        tdm_error ret;
+       double stamp;
 
        if (!func_output->output_get_capability) {
                TDM_ERR("no output_get_capability()");
                return TDM_ERROR_BAD_MODULE;
        }
 
+       stamp = tdm_helper_get_time();
        ret = func_output->output_get_capability(output_backend, caps);
+       TDM_DBG("backend output_get_capability() time: %.3f ms", (tdm_helper_get_time() - stamp) * 1000.0);
+
        if (ret != TDM_ERROR_NONE) {
                TDM_ERR("output_get_capability() failed");
                return TDM_ERROR_BAD_MODULE;
@@ -363,7 +366,7 @@ tdm_display_update_output(tdm_private_display *private_display,
                private_output = calloc(1, sizeof(tdm_private_output));
                TDM_RETURN_VAL_IF_FAIL(private_output != NULL, TDM_ERROR_OUT_OF_MEMORY);
 
-               private_output->stamp = tdm_helper_get_time_in_millis();
+               private_output->stamp = tdm_helper_get_time();
                while (tdm_display_find_output_stamp(private_display, private_output->stamp))
                        private_output->stamp++;
 
@@ -700,16 +703,12 @@ _tdm_display_check_backend_functions(tdm_private_display *private_display)
        /* below functions should be implemented in backend side */
 
        TDM_RETURN_VAL_IF_FAIL(func_display != NULL, TDM_ERROR_BAD_MODULE);
-//     TDM_RETURN_VAL_IF_FAIL(func_display->display_get_capabilitiy, TDM_ERROR_BAD_MODULE);
        TDM_RETURN_VAL_IF_FAIL(func_display->display_get_outputs, TDM_ERROR_BAD_MODULE);
        TDM_RETURN_VAL_IF_FAIL(func_output->output_get_capability, TDM_ERROR_BAD_MODULE);
        TDM_RETURN_VAL_IF_FAIL(func_output->output_get_layers, TDM_ERROR_BAD_MODULE);
        TDM_RETURN_VAL_IF_FAIL(func_layer->layer_get_capability, TDM_ERROR_BAD_MODULE);
 
-       if (func_display->display_get_capability)
-               ret = func_display->display_get_capability(private_display->bdata, &private_display->caps_display);
-       else
-               ret = func_display->display_get_capabilitiy(private_display->bdata, &private_display->caps_display);
+       ret = func_display->display_get_capability(private_display->bdata, &private_display->caps_display);
        if (ret != TDM_ERROR_NONE) {
                TDM_ERR("display_get_capability() failed");
                return TDM_ERROR_BAD_MODULE;
@@ -745,9 +744,11 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
        tdm_backend_module *module_data;
        void *module;
        tdm_error ret;
+       double stamp;
 
        snprintf(path, sizeof(path), TDM_MODULE_PATH "/%s", file);
 
+       stamp = tdm_helper_get_time();
        TDM_TRACE_BEGIN(Load_Backend);
 
        module = dlopen(path, RTLD_LAZY);
@@ -765,6 +766,8 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
                goto failed_load;
        }
 
+       TDM_DBG("dlopen, dlsym time: %.3f ms", (tdm_helper_get_time() - stamp) * 1000.0);
+
        private_display->module_data = module_data;
        private_display->module = module;
 
@@ -777,8 +780,11 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
 
        /* We don't care if backend_data is NULL or not. It's up to backend. */
        TDM_TRACE_BEGIN(Init_Backend);
+       stamp = tdm_helper_get_time();
        private_display->bdata = module_data->init((tdm_display *)private_display, &ret);
+       TDM_DBG("backend init() time: %.3f ms", (tdm_helper_get_time() - stamp) * 1000.0);
        TDM_TRACE_END();
+
        if (ret != TDM_ERROR_NONE) {
                TDM_ERR("failed to init '%s' module", module_data->name);
                goto failed_load;
@@ -856,6 +862,7 @@ tdm_display_init(tdm_error *error)
        tdm_private_display *private_display = NULL;
        const char *debug;
        tdm_error ret;
+       double stamp1, stamp2, start;
 
        _pthread_mutex_lock(&gLock);
 
@@ -867,6 +874,8 @@ tdm_display_init(tdm_error *error)
                return g_private_display;
        }
 
+       start = stamp1 = tdm_helper_get_time();
+
        private_display = calloc(1, sizeof(tdm_private_display));
        if (!private_display) {
                ret = TDM_ERROR_OUT_OF_MEMORY;
@@ -894,14 +903,26 @@ tdm_display_init(tdm_error *error)
 
        _pthread_mutex_lock(&private_display->lock);
 
+       stamp2 = tdm_helper_get_time();
+       TDM_DBG("prepare init time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       stamp1 = stamp2;
+
        ret = tdm_event_loop_init(private_display);
        if (ret != TDM_ERROR_NONE)
                goto failed_event;
 
+       stamp2 = tdm_helper_get_time();
+       TDM_DBG("creating event loop time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       stamp1 = stamp2;
+
        ret = _tdm_display_load_module(private_display);
        if (ret != TDM_ERROR_NONE)
                goto failed_load;
 
+       stamp2 = tdm_helper_get_time();
+       TDM_DBG("loading backend time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       stamp1 = stamp2;
+
 #ifdef INIT_BUFMGR
        int tdm_drm_fd = tdm_helper_get_fd("TDM_DRM_MASTER_FD");
        if (tdm_drm_fd >= 0) {
@@ -913,6 +934,10 @@ tdm_display_init(tdm_error *error)
                } else {
                        TDM_INFO("tbm_bufmgr_init successed");
                }
+
+               stamp2 = tdm_helper_get_time();
+               TDM_DBG("initializing bufmgr time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+               stamp1 = stamp2;
        }
 #endif
 
@@ -922,6 +947,10 @@ tdm_display_init(tdm_error *error)
        if (ret != TDM_ERROR_NONE)
                goto failed_update;
 
+       stamp2 = tdm_helper_get_time();
+       TDM_DBG("updating display time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       stamp1 = stamp2;
+
        tdm_event_loop_create_backend_source(private_display);
 
        private_display->init_count = 1;
@@ -934,6 +963,8 @@ tdm_display_init(tdm_error *error)
        _pthread_mutex_unlock(&private_display->lock);
        _pthread_mutex_unlock(&gLock);
 
+       TDM_INFO("init time: %.3f ms", (tdm_helper_get_time() - start) * 1000.0);
+
        return (tdm_display *)private_display;
 
 failed_update:
@@ -1058,7 +1089,7 @@ INTERN tdm_error
 tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_str, char *reply, int *len)
 {
        char temp[TDM_PATH_LEN] = {0,}, temp2[TDM_PATH_LEN] = {0,};
-       char *path, *path2;
+       char *path = NULL, *path2;
        char *arg;
        char *end;
 
@@ -1069,9 +1100,6 @@ tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_s
        else
                path2++;
 
-       path = tdm_helper_dump_make_directory(path2, reply, len);
-       TDM_GOTO_IF_FAIL(path != NULL, done);
-
        tdm_debug_dump = 0;
 
        snprintf(temp, sizeof(temp), "%s", dump_str);
@@ -1088,6 +1116,9 @@ tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_s
                goto done;
        }
 
+       path = tdm_helper_dump_make_directory(path2, reply, len);
+       TDM_GOTO_IF_FAIL(path != NULL, done);
+
        if (!strncmp(arg, "current", 7)) {
                tdm_private_output *o = NULL;
                if (!private_display) {
@@ -1136,7 +1167,9 @@ tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_s
        TDM_INFO("dump... '%s'", dump_str);
 
 done:
-       free(path);
+       if (path)
+               free(path);
+
        return TDM_ERROR_NONE;
 }