add stdout log in tdm_display_init

Change-Id: I971cabd91d5ff977a18bb5cd8869245cfbe0704b

diff --git a/include/tdm_log.h b/include/tdm_log.h
index de56386..0a9bbf3 100644 (file)
--- a/include/tdm_log.h
+++ b/include/tdm_log.h
@@ -116,6 +116,20 @@ extern unsigned int tdm_log_debug_level;
                } \
        } while (0)
 
+#define TDM_INIT_INFO(fmt, args...) \
+       do { \
+               if (tdm_log_debug_level >= TDM_LOG_LEVEL_INFO) { \
+                       struct timespec ts; \
+                       clock_gettime(CLOCK_MONOTONIC, &ts); \
+                       tdm_log_printf(TDM_LOG_LEVEL_INFO, "[%5d.%06d][%d][%s %d]"fmt, \
+                                                  (int)ts.tv_sec, (int)ts.tv_nsec / 1000, \
+                                                  (int)syscall(SYS_gettid), __FUNCTION__, __LINE__, ##args);  \
+                       tdm_log_print(TDM_LOG_LEVEL_INFO, "[%5d.%06d][%d][%s %d]"fmt, \
+                                                 (int)ts.tv_sec, (int)ts.tv_nsec / 1000, \
+                                                 (int)syscall(SYS_gettid), __FUNCTION__, __LINE__, ##args);  \
+               } \
+       } while (0)
+
 #define TDM_NEVER_GET_HERE() TDM_WRN("** NEVER GET HERE **")
 #define TDM_DEPRECATED(str) \
        do { \

diff --git a/src/tdm.c b/src/tdm.c
index f20bfa4..c7289e8 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -805,7 +805,7 @@ _tdm_display_setup(tdm_private_display *private_display)
                tdm_output **outputs;
                int i, count = 0;
 
-               TDM_INFO("loading a %s backend", TDM_DUMMY_MODULE);
+               TDM_INIT_INFO("loading a %s backend", TDM_DUMMY_MODULE);
                ret = _tdm_display_load_module_with_file(private_display, TDM_DUMMY_MODULE);
                TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed_update);
                TDM_GOTO_IF_FAIL(private_display->dummy_module != NULL, failed_update);
@@ -825,7 +825,7 @@ _tdm_display_setup(tdm_private_display *private_display)
 
        virtual = tdm_config_get_int(TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT, 0);
        if (virtual) {
-               TDM_INFO("loading a %s backend", TDM_VIRTUAL_MODULE);
+               TDM_INIT_INFO("loading a %s backend", TDM_VIRTUAL_MODULE);
                ret = _tdm_display_load_module_with_file(private_display, TDM_VIRTUAL_MODULE);
                TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed_update);
                TDM_GOTO_IF_FAIL(private_display->virtual_module != NULL, failed_update);
@@ -1035,7 +1035,9 @@ _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("TDM_Init_Backend");
        stamp = tdm_helper_get_time();
+       TDM_INIT_INFO("init backend");
        bdata = module_data->init((tdm_display *)private_display, &ret);
+       TDM_INIT_INFO("init backend done");
        TDM_DBG("backend init() time: %.3f ms", (tdm_helper_get_time() - stamp) * 1000.0);
        TDM_TRACE_END();
 
@@ -1067,7 +1069,7 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
 
        LIST_ADDTAIL(&private_module->link, &private_display->module_list);
 
-       TDM_INFO("Success to load '%s' module", module_data->name);
+       TDM_INIT_INFO("Success to load '%s' module", module_data->name);
 
        return TDM_ERROR_NONE;
 failed_load:
@@ -1097,12 +1099,12 @@ _tdm_display_load_modules(tdm_private_display *private_display)
 
        arg = strtok_r(temp, TDM_CONFIG_DELIM, &end);
        while (arg) {
-               TDM_INFO("loading a %s backend", arg);
+               TDM_INIT_INFO("loading a %s backend", arg);
                ret = _tdm_display_load_module_with_file(private_display, arg);
                if (ret == TDM_ERROR_NONE)
-                       TDM_INFO("%s backend loading success", arg);
+                       TDM_INIT_INFO("%s backend loading success", arg);
                else
-                       TDM_INFO("%s backend loading failed", arg);
+                       TDM_INIT_INFO("%s backend loading failed", arg);
                arg = strtok_r(NULL, TDM_CONFIG_DELIM, &end);
        }
 
@@ -1194,7 +1196,7 @@ tdm_display_init(tdm_error *error)
                goto failed_event;
 
        stamp2 = tdm_helper_get_time();
-       TDM_INFO("event loop init time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       TDM_INIT_INFO("event loop init time: %.3f ms", (stamp2 - stamp1) * 1000.0);
        stamp1 = stamp2;
 
        ret = tdm_vblank_init(private_display);
@@ -1222,7 +1224,7 @@ tdm_display_init(tdm_error *error)
                goto failed_load;
 
        stamp2 = tdm_helper_get_time();
-       TDM_INFO("loading backend time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       TDM_INIT_INFO("loading backend time: %.3f ms", (stamp2 - stamp1) * 1000.0);
        stamp1 = stamp2;
 
 #ifdef INIT_BUFMGR
@@ -1245,6 +1247,7 @@ tdm_display_init(tdm_error *error)
 
        TDM_TRACE_BEGIN("TDM_Update_Display");
        ret = _tdm_display_setup(private_display);
+       TDM_INIT_INFO("updating display");
        TDM_TRACE_END();
        if (ret != TDM_ERROR_NONE)
                goto failed_update;
@@ -1284,7 +1287,7 @@ 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);
+       TDM_INIT_INFO("init time: %.3f ms", (tdm_helper_get_time() - start) * 1000.0);
 
        return (tdm_display *)private_display;