projects / platform / upstream / enlightenment.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bdab312)
e_hwc: adjust log alignment 78/210978/3
authorChangyeon Lee <cyeon.lee@samsung.com>
Fri, 26 Jul 2019 12:18:30 +0000 (21:18 +0900)
committerSooChan Lim <sc1.lim@samsung.com>
Mon, 29 Jul 2019 12:25:48 +0000 (12:25 +0000)
Change-Id: Id54acfa315ccc0b8fd30ce00d8449227a60bd5be

src/bin/e_hwc.c patch | blob | history
src/bin/e_hwc_window.c patch | blob | history
src/bin/e_hwc_window_queue.c patch | blob | history
src/bin/e_hwc_windows.c patch | blob | history

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index 6b37502540b83c45c543a88e6b7493667a602893..5778cf090a0f63e0114422d94bdc016acafd5ed5 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -4,7 +4,7 @@
 #define EHERR(f, hwc, x...)                                           \
    do                                                                 \
      {                                                                \
-        ERR("EWL|%20.20s|              |             |%8s|"f,         \
+        ERR("EWL|%20.20s|              |             |%9s|"f,         \
             "HWC", (e_hwc_output_id_get(hwc)), ##x);                  \
      }                                                                \
    while (0)
@@ -12,7 +12,7 @@
 #define EHINF(f, hwc, x...)                                           \
    do                                                                 \
      {                                                                \
-        INF("EWL|%20.20s|              |             |%8s|"f,         \
+        INF("EWL|%20.20s|              |             |%9s|"f,         \
             "HWC", (e_hwc_output_id_get(hwc)), ##x);                  \
      }                                                                \
    while (0)
diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index 263e691f6d9f1106e4117b9052a2851a4969c91f..616c13ff3f59d8f5497627db3c5ac6a0c82c388c 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -11,55 +11,64 @@
 #define EHW_C(b,m)              (b ? ((b) >> (m)) & 0xFF : ' ')
 #define EHW_FOURCC_STR(id)      EHW_C(id,0), EHW_C(id,8), EHW_C(id,16), EHW_C(id,24)
 
-#define EHWERR(f, ec, hwc, ehw, x...)                               \
-   do                                                               \
-     {                                                              \
-        if ((!ec) && (!ehw))                                        \
-          ERR("EWL|%20.20s|            |             |%8s|"f,       \
-              "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);          \
-        else                                                        \
-          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p| ehw:%8p|%8s|"f,        \
-              "HWC-WIN",                                            \
-              (e_client_util_win_get(ec)),                          \
-              (ec),                                                 \
-              (ehw), (e_hwc_output_id_get(hwc)),                    \
-              ##x);                                                 \
-     }                                                              \
+#define EHWERR(f, ec, hwc, ehw, x...)                                      \
+   do                                                                      \
+     {                                                                     \
+        if ((!ec) && (!ehw))                                               \
+          ERR("EWL|%20.20s|            |             |%9s|"f,              \
+              "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);                 \
+        else if (!ec)                                                      \
+          ERR("EWL|%20.20s|            |             |%9s|ehw :%8p|"f,     \
+              "HWC-WIN", (e_hwc_output_id_get(hwc)),(ehw), ##x);           \
+        else                                                               \
+          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehw: %8p|"f,               \
+              "HWC-WIN",                                                   \
+              (e_client_util_win_get(ec)),                                 \
+              (ec),                                                        \
+              (e_hwc_output_id_get(hwc)), (ehw),                           \
+              ##x);                                                        \
+     }                                                                     \
    while (0)
 
-#define EHWINF(f, ec, hwc, ehw, x...)                               \
-   do                                                               \
-     {                                                              \
-        if ((!ec) && (!ehw))                                        \
-          INF("EWL|%20.20s|            |             |%8s|"f,       \
-              "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);          \
-        else                                                        \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p| ehw:%8p|%8s|"f,        \
-              "HWC-WIN",                                            \
-              (e_client_util_win_get(ec)),                          \
-              (ec),                                                 \
-              (ehw), (e_hwc_output_id_get(hwc)),                    \
-              ##x);                                                 \
-     }                                                              \
+#define EHWINF(f, ec, hwc, ehw, x...)                                      \
+   do                                                                      \
+     {                                                                     \
+        if ((!ec) && (!ehw))                                               \
+          INF("EWL|%20.20s|            |             |%9s|"f,              \
+              "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);                 \
+        else if (!ec)                                                      \
+          INF("EWL|%20.20s|            |             |%9s|ehw :%8p|"f,     \
+              "HWC-WIN", (e_hwc_output_id_get(hwc)),(ehw), ##x);           \
+        else                                                               \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehw :%8p|"f,               \
+              "HWC-WIN",                                                   \
+              (e_client_util_win_get(ec)),                                 \
+              (ec),                                                        \
+              (e_hwc_output_id_get(hwc)), (ehw),                           \
+              ##x);                                                        \
+     }                                                                     \
    while (0)
 
-#define EHWTRACE(f, ec, hwc, ehw, x...)                             \
-   do                                                               \
-     {                                                              \
-        if (ehw_trace)                                              \
-          {                                                         \
-            if ((!ec) && (!ehw))                                    \
-              INF("EWL|%20.20s|            |             |%8s|"f,   \
-                  "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);      \
-            else                                                    \
-              INF("EWL|%20.20s|w:0x%08zx|ec:%8p| ehw:%8p|%8s|"f,    \
-                  "HWC-WIN",                                        \
-                  (e_client_util_win_get(ec)),                      \
-                  (ec),                                             \
-                  (ehw), (e_hwc_output_id_get(hwc)),                \
-                  ##x);                                             \
-          }                                                         \
-     }                                                              \
+#define EHWTRACE(f, ec, hwc, ehw, x... )                                   \
+   do                                                                      \
+     {                                                                     \
+        if (ehw_trace)                                                     \
+          {                                                                \
+             if ((!ec) && (!ehw))                                          \
+               INF("EWL|%20.20s|            |             |%9s|"f,         \
+                   "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);            \
+             else if (!ec)                                                 \
+               INF("EWL|%20.20s|            |             |%9s|ehw :%8p|"f,\
+                   "HWC-WIN", (e_hwc_output_id_get(hwc)),(ehw), ##x);      \
+             else                                                          \
+               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehw :%8p|"f,          \
+                   "HWC-WIN",                                              \
+                   (e_client_util_win_get(ec)),                            \
+                   (ec),                                                   \
+                   (e_hwc_output_id_get(hwc)), (ehw),                      \
+                   ##x);                                                   \
+          }                                                                \
+     }                                                                     \
    while (0)
 
 static Eina_Bool ehw_trace = EINA_FALSE;
diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index d11fc706804690bd5752f3cde23f63385162c79c..22d8a43ab6256cbaf37d0795a801202eac8391b9 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -19,47 +19,64 @@
     } \
   while (0)
 
-#define EHWQERR(f, ec, hwc, ehwq, x...)                          \
-   do                                                            \
-     {                                                           \
-        ERR("EWL|%20.20s|            |             |%8s|"f,      \
-            "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);        \
-     }                                                           \
+#define EHWQERR(f, ec, hwc, ehwq, x...)                                    \
+   do                                                                      \
+     {                                                                     \
+        if ((!ec) && (!ehwq))                                              \
+          INF("EWL|%20.20s|            |             |%9s|"f,              \
+              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);                \
+        else if(!ec)                                                       \
+          INF("EWL|%20.20s|            |             |%9s|ehwq:%8p|"f,     \
+              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ehwq, ##x);          \
+        else                                                               \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehwq:%8p|"f,               \
+              "HWC-WINQ",                                                  \
+              (e_client_util_win_get(ec)),                                 \
+              (ec),                                                        \
+              (e_hwc_output_id_get(hwc)), (ehwq),                          \
+              ##x);                                                        \
+     }                                                                     \
    while (0)
 
-#define EHWQINF(f, ec, hwc, ehwq, x...)                          \
-   do                                                            \
-     {                                                           \
-        if ((!ec) && (!ehwq))                                    \
-          INF("EWL|%20.20s|            |             |%8s|"f,    \
-              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);      \
-        else                                                     \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p| ehwq:%8p|%8s|"f,    \
-              "HWC-WINQ",                                        \
-              (e_client_util_win_get(ec)),                       \
-              (ec),                                              \
-              (ehwq), (e_hwc_output_id_get(hwc)),                \
-              ##x);                                              \
-     }                                                           \
+#define EHWQINF(f, ec, hwc, ehwq, x...)                                    \
+   do                                                                      \
+     {                                                                     \
+        if ((!ec) && (!ehwq))                                              \
+          INF("EWL|%20.20s|            |             |%9s|"f,              \
+              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);                \
+        else if(!ec)                                                       \
+          INF("EWL|%20.20s|            |             |%9s|ehwq:%8p|"f,     \
+              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ehwq, ##x);          \
+        else                                                               \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehwq:%8p|"f,               \
+              "HWC-WINQ",                                                  \
+              (e_client_util_win_get(ec)),                                 \
+              (ec),                                                        \
+              (e_hwc_output_id_get(hwc)), (ehwq),                          \
+              ##x);                                                        \
+     }                                                                     \
    while (0)
 
-#define EHWQTRACE(f, ec, hwc, ehwq, x...)                             \
-   do                                                                 \
-     {                                                                \
-        if (ehwq_trace)                                               \
-          {                                                           \
-             if ((!ec) && (!ehwq))                                    \
-               INF("EWL|%20.20s|            |             |%8s|"f,    \
-                   "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);      \
-             else                                                     \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p| ehwq:%8p|%8s|"f,    \
-                   "HWC-WINQ",                                        \
-                   (e_client_util_win_get(ec)),                       \
-                   (ec),                                              \
-                   (ehwq), (e_hwc_output_id_get(hwc)),                \
-                   ##x);                                              \
-          }                                                           \
-     }                                                                \
+#define EHWQTRACE(f, ec, hwc, ehwq, x...)                                  \
+   do                                                                      \
+     {                                                                     \
+        if (ehwq_trace)                                                    \
+          {                                                                \
+             if ((!ec) && (!ehwq))                                         \
+               INF("EWL|%20.20s|            |             |%9s|"f,         \
+                   "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);           \
+             else if(!ec)                                                  \
+               INF("EWL|%20.20s|            |             |%9s|ehwq:%8p|"f,\
+                   "HWC-WINQ", (e_hwc_output_id_get(hwc)), ehwq, ##x);     \
+             else                                                          \
+               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehwq:%8p|"f,          \
+                   "HWC-WINQ",                                             \
+                   (e_client_util_win_get(ec)),                            \
+                   (ec),                                                   \
+                   (e_hwc_output_id_get(hwc)), (ehwq),                     \
+                   ##x);                                                   \
+          }                                                                \
+     }                                                                     \
    while (0)
 
 static Eina_Bool ehwq_trace = EINA_FALSE;
diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 0fa3356049b6627ef7b8a71318991bcbbab375ef..98ab327a31eb02f3b9abb4d87383658ab19ae9ff 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -10,45 +10,45 @@
 #define CLEAR(x) memset(&(x), 0, sizeof (x))
 #endif
 
-#define EHWSERR(f, hwc, x...)                                         \
-   do                                                                 \
-     {                                                                \
-        ERR("EWL|%20.20s|            |             |%8s|"f,           \
-            "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);             \
-     }                                                                \
+#define EHWSERR(f, hwc, x...)                                     \
+   do                                                             \
+     {                                                            \
+        ERR("EWL|%20.20s|            |             |%9s|"f,       \
+            "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);         \
+     }                                                            \
    while (0)
 
-#define EHWSINF(f, ec, hwc, x...)                                     \
-   do                                                                 \
-     {                                                                \
-        if (!ec)                                                      \
-          INF("EWL|%20.20s|            |             |%8s|"f,         \
-              "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);           \
-        else                                                          \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%8s|"f,                   \
-              "HWC-WINS",                                             \
-              (e_client_util_win_get(ec)),                            \
-              (ec), (e_hwc_output_id_get(hwc)),                       \
-              ##x);                                                   \
-     }                                                                \
+#define EHWSINF(f, ec, hwc, x...)                                 \
+   do                                                             \
+     {                                                            \
+        if (!ec)                                                  \
+          INF("EWL|%20.20s|            |             |%9s|"f,     \
+              "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);       \
+        else                                                      \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|"f,               \
+              "HWC-WINS",                                         \
+              (e_client_util_win_get(ec)),                        \
+              (ec), (e_hwc_output_id_get(hwc)),                   \
+              ##x);                                               \
+     }                                                            \
    while (0)
 
-#define EHWSTRACE(f, ec, hwc, x...)                                   \
-   do                                                                 \
-     {                                                                \
-        if (ehws_trace)                                               \
-          {                                                           \
-             if (!ec)                                                 \
-               INF("EWL|%20.20s|            |             |%8s|"f,    \
-                   "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);      \
-             else                                                     \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%8s|"f,              \
-                   "HWC-WINS",                                        \
-                   (e_client_util_win_get(ec)),                       \
-                   (ec), (e_hwc_output_id_get(hwc)),                  \
-                   ##x);                                              \
-          }                                                           \
-     }                                                                \
+#define EHWSTRACE(f, ec, hwc, x...)                               \
+   do                                                             \
+     {                                                            \
+        if (ehws_trace)                                           \
+          {                                                       \
+             if (!ec)                                             \
+               INF("EWL|%20.20s|            |             |%9s|"f,\
+                   "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);  \
+             else                                                 \
+               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|"f,          \
+                   "HWC-WINS",                                    \
+                   (e_client_util_win_get(ec)),                   \
+                   (ec), (e_hwc_output_id_get(hwc)),              \
+                   ##x);                                          \
+          }                                                       \
+     }                                                            \
    while (0)
 
 static Eina_Bool ehws_trace = EINA_FALSE;
@@ -546,7 +546,7 @@ _e_hwc_windows_target_window_surface_queue_trace_cb(tbm_surface_queue_h surface_
    /* tsurface has been released at the queue */
    if (trace == TBM_SURFACE_QUEUE_TRACE_RELEASE)
      {
-        EHWSTRACE("{%s} release ts:%p", NULL, NULL, "@TARGET WINDOW@", tsurface);
+        EHWSTRACE("{%s} release ts:%p", NULL, target_hwc_window->hwc, "@TARGET WINDOW@", tsurface);
 
         tbm_surface_internal_delete_user_data(tsurface, EHWS_RENDERED_BUFFERS_KEY);
 
Domain: Graphics System / Display Server;