projects / platform / upstream / enlightenment.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b75e1aa)
e_hwc: print output index instead id 36/294736/1
authorChangyeon Lee <cyeon.lee@samsung.com>
Tue, 20 Jun 2023 10:54:22 +0000 (19:54 +0900)
committerTizen Window System <tizen.windowsystem@gmail.com>
Mon, 26 Jun 2023 01:39:10 +0000 (10:39 +0900)
for reducing log length

Change-Id: I423e26ed291dbe89fc91441528a54bcefcc5fdc7

src/bin/e_hwc.c patch | blob | history
src/bin/e_hwc.h 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 bdca9e04d711f3efc87ad04be7848b3315cdb2ec..32223c5447a88907fd1ef457d7124ad3422a9abd 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -6,16 +6,16 @@
 #define EHERR(f, hwc, x...)                                           \
    do                                                                 \
      {                                                                \
-        ERR("EWL|%20.20s|              |             |%9s|"f,         \
-            "HWC", (e_hwc_output_id_get(hwc)), ##x);                  \
+        ERR("EWL|%20.20s|              |             |%2d|"f,         \
+            "HWC", (e_hwc_output_index_get(hwc)), ##x);               \
      }                                                                \
    while (0)
 
 #define EHINF(f, hwc, x...)                                           \
    do                                                                 \
      {                                                                \
-        INF("EWL|%20.20s|              |             |%9s|"f,         \
-            "HWC", (e_hwc_output_id_get(hwc)), ##x);                  \
+        INF("EWL|%20.20s|              |             |%2d|"f,         \
+            "HWC", (e_hwc_output_index_get(hwc)), ##x);               \
      }                                                                \
    while (0)
 
@@ -712,14 +712,14 @@ e_hwc_client_is_above_hwc(E_Client *ec, E_Client *hwc_ec)
    return EINA_FALSE;
 }
 
-EINTERN char *
-e_hwc_output_id_get(E_Hwc *hwc)
+EINTERN int
+e_hwc_output_index_get(E_Hwc *hwc)
 {
-   if (!hwc) return "NULL";
+   if (!hwc) return -1;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(hwc->output, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(hwc->output, -1);
 
-   return hwc->output->id;
+   return hwc->output->index;
 }
 
 EINTERN tbm_surface_queue_h
diff --git a/src/bin/e_hwc.h b/src/bin/e_hwc.h
index d8d3b3e1c2d4de7eac94d679b311deee67ef8933..94f22f2267cb42c00b5aa815db8d2578f7e01170 100644 (file)
--- a/src/bin/e_hwc.h
+++ b/src/bin/e_hwc.h
@@ -218,7 +218,7 @@ EINTERN E_Hwc_Mode            e_hwc_mode_get(E_Hwc *hwc);
 EINTERN void                  e_hwc_deactive_set(E_Hwc *hwc, Eina_Bool set);
 EINTERN Eina_Bool             e_hwc_deactive_get(E_Hwc *hwc);
 EINTERN Eina_Bool             e_hwc_client_is_above_hwc(E_Client *ec, E_Client *hwc_ec);
-EINTERN char                 *e_hwc_output_id_get(E_Hwc *hwc);
+EINTERN int                   e_hwc_output_index_get(E_Hwc *hwc);
 EINTERN tbm_surface_queue_h   e_hwc_tbm_surface_queue_get(E_Hwc *hwc);
 
 EINTERN void                  e_hwc_norender_push(E_Hwc *hwc);
diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index db13f8d4e8bf10a94f77419acbffbcdf520aa7c0..cef2a5c24931c1b5116744f27d0e3e95930d2191 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -13,17 +13,17 @@
    do                                                                      \
      {                                                                     \
         if ((!ec) && (!ehw))                                               \
-          ERR("EWL|%20.20s|            |             |%9s|"f,              \
-              "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);                 \
+          ERR("EWL|%20.20s|            |             |%2d|"f,              \
+              "HWC-WIN", (e_hwc_output_index_get(hwc)), ##x);              \
         else if (!ec)                                                      \
-          ERR("EWL|%20.20s|            |             |%9s|ehw :%8p|"f,     \
-              "HWC-WIN", (e_hwc_output_id_get(hwc)),(ehw), ##x);           \
+          ERR("EWL|%20.20s|            |             |%2d|ehw :%8p|"f,     \
+              "HWC-WIN", (e_hwc_output_index_get(hwc)),(ehw), ##x);        \
         else                                                               \
-          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehw: %8p|"f,               \
+          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehw: %8p|"f,               \
               "HWC-WIN",                                                   \
               (e_client_util_win_get(ec)),                                 \
               (ec),                                                        \
-              (e_hwc_output_id_get(hwc)), (ehw),                           \
+              (e_hwc_output_index_get(hwc)), (ehw),                        \
               ##x);                                                        \
      }                                                                     \
    while (0)
@@ -32,17 +32,17 @@
    do                                                                      \
      {                                                                     \
         if ((!ec) && (!ehw))                                               \
-          INF("EWL|%20.20s|            |             |%9s|"f,              \
-              "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);                 \
+          INF("EWL|%20.20s|            |             |%2d|"f,              \
+              "HWC-WIN", (e_hwc_output_index_get(hwc)), ##x);              \
         else if (!ec)                                                      \
-          INF("EWL|%20.20s|            |             |%9s|ehw :%8p|"f,     \
-              "HWC-WIN", (e_hwc_output_id_get(hwc)),(ehw), ##x);           \
+          INF("EWL|%20.20s|            |             |%2d|ehw :%8p|"f,     \
+              "HWC-WIN", (e_hwc_output_index_get(hwc)),(ehw), ##x);        \
         else                                                               \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehw :%8p|"f,               \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehw :%8p|"f,               \
               "HWC-WIN",                                                   \
               (e_client_util_win_get(ec)),                                 \
               (ec),                                                        \
-              (e_hwc_output_id_get(hwc)), (ehw),                           \
+              (e_hwc_output_index_get(hwc)), (ehw),                        \
               ##x);                                                        \
      }                                                                     \
    while (0)
@@ -53,17 +53,17 @@
         if (ehw_trace)                                                     \
           {                                                                \
              if ((!ec) && (!ehw))                                          \
-               INF("EWL|%20.20s|            |             |%9s|"f,         \
-                   "HWC-WIN", (e_hwc_output_id_get(hwc)), ##x);            \
+               INF("EWL|%20.20s|            |             |%2d|"f,         \
+                   "HWC-WIN", (e_hwc_output_index_get(hwc)), ##x);         \
              else if (!ec)                                                 \
-               INF("EWL|%20.20s|            |             |%9s|ehw :%8p|"f,\
-                   "HWC-WIN", (e_hwc_output_id_get(hwc)),(ehw), ##x);      \
+               INF("EWL|%20.20s|            |             |%2d|ehw :%8p|"f,\
+                   "HWC-WIN", (e_hwc_output_index_get(hwc)),(ehw), ##x);   \
              else                                                          \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehw :%8p|"f,          \
+               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehw :%8p|"f,          \
                    "HWC-WIN",                                              \
                    (e_client_util_win_get(ec)),                            \
                    (ec),                                                   \
-                   (e_hwc_output_id_get(hwc)), (ehw),                      \
+                   (e_hwc_output_index_get(hwc)), (ehw),                   \
                    ##x);                                                   \
           }                                                                \
      }                                                                     \
diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index d936d49434448864f53fe277c8d70190c965caee..a0c485feeb40c783cf05b03639bcf13162a8a95f 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -34,17 +34,17 @@
    do                                                                      \
      {                                                                     \
         if ((!ec) && (!ehwq))                                              \
-          ERR("EWL|%20.20s|            |             |%9s|"f,              \
-              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);                \
+          ERR("EWL|%20.20s|            |             |%2d|"f,              \
+              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ##x);             \
         else if(!ec)                                                       \
-          ERR("EWL|%20.20s|            |             |%9s|ehwq:%8p|"f,     \
-              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ehwq, ##x);          \
+          ERR("EWL|%20.20s|            |             |%2d|ehwq:%8p|"f,     \
+              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ehwq, ##x);       \
         else                                                               \
-          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehwq:%8p|"f,               \
+          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehwq:%8p|"f,               \
               "HWC-WINQ",                                                  \
               (e_client_util_win_get(ec)),                                 \
               (ec),                                                        \
-              (e_hwc_output_id_get(hwc)), (ehwq),                          \
+              (e_hwc_output_index_get(hwc)), (ehwq),                       \
               ##x);                                                        \
      }                                                                     \
    while (0)
@@ -53,17 +53,17 @@
    do                                                                      \
      {                                                                     \
         if ((!ec) && (!ehwq))                                              \
-          INF("EWL|%20.20s|            |             |%9s|"f,              \
-              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);                \
+          INF("EWL|%20.20s|            |             |%2d|"f,              \
+              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ##x);             \
         else if(!ec)                                                       \
-          INF("EWL|%20.20s|            |             |%9s|ehwq:%8p|"f,     \
-              "HWC-WINQ", (e_hwc_output_id_get(hwc)), ehwq, ##x);          \
+          INF("EWL|%20.20s|            |             |%2d|ehwq:%8p|"f,     \
+              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ehwq, ##x);       \
         else                                                               \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehwq:%8p|"f,               \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehwq:%8p|"f,               \
               "HWC-WINQ",                                                  \
               (e_client_util_win_get(ec)),                                 \
               (ec),                                                        \
-              (e_hwc_output_id_get(hwc)), (ehwq),                          \
+              (e_hwc_output_index_get(hwc)), (ehwq),                       \
               ##x);                                                        \
      }                                                                     \
    while (0)
@@ -74,17 +74,17 @@
         if (ehwq_trace)                                                    \
           {                                                                \
              if ((!ec) && (!ehwq))                                         \
-               INF("EWL|%20.20s|            |             |%9s|"f,         \
-                   "HWC-WINQ", (e_hwc_output_id_get(hwc)), ##x);           \
+               INF("EWL|%20.20s|            |             |%2d|"f,         \
+                   "HWC-WINQ", (e_hwc_output_index_get(hwc)), ##x);        \
              else if(!ec)                                                  \
-               INF("EWL|%20.20s|            |             |%9s|ehwq:%8p|"f,\
-                   "HWC-WINQ", (e_hwc_output_id_get(hwc)), ehwq, ##x);     \
+               INF("EWL|%20.20s|            |             |%2d|ehwq:%8p|"f,\
+                   "HWC-WINQ", (e_hwc_output_index_get(hwc)), ehwq, ##x);  \
              else                                                          \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%9s|ehwq:%8p|"f,          \
+               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehwq:%8p|"f,          \
                    "HWC-WINQ",                                             \
                    (e_client_util_win_get(ec)),                            \
                    (ec),                                                   \
-                   (e_hwc_output_id_get(hwc)), (ehwq),                     \
+                   (e_hwc_output_index_get(hwc)), (ehwq),                  \
                    ##x);                                                   \
           }                                                                \
      }                                                                     \
diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index e314a164d47ee032d89b82175b13951c2c3304c1..e7e956caeb3b23591fd49628b4596f2f5ad65857 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -15,45 +15,45 @@
 #define CLEAR(x) memset(&(x), 0, sizeof (x))
 #endif
 
-#define EHWSERR(f, hwc, x...)                                     \
-   do                                                             \
-     {                                                            \
-        ERR("EWL|%20.20s|            |             |%9s|"f,       \
-            "HWC-WINS", (e_hwc_output_id_get(hwc)), ##x);         \
-     }                                                            \
+#define EHWSERR(f, hwc, x...)                                      \
+   do                                                              \
+     {                                                             \
+        ERR("EWL|%20.20s|            |             |%2d|"f,        \
+            "HWC-WINS", (e_hwc_output_index_get(hwc)), ##x);       \
+     }                                                             \
    while (0)
 
-#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);                                               \
-     }                                                            \
+#define EHWSINF(f, ec, hwc, x...)                                  \
+   do                                                              \
+     {                                                             \
+        if (!ec)                                                   \
+          INF("EWL|%20.20s|            |             |%2d|"f,      \
+              "HWC-WINS", (e_hwc_output_index_get(hwc)), ##x);     \
+        else                                                       \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|"f,                \
+              "HWC-WINS",                                          \
+              (e_client_util_win_get(ec)),                         \
+              (ec), (e_hwc_output_index_get(hwc)),                 \
+              ##x);                                                \
+     }                                                             \
    while (0)
 
-#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);                                          \
-          }                                                       \
-     }                                                            \
+#define EHWSTRACE(f, ec, hwc, x...)                                \
+   do                                                              \
+     {                                                             \
+        if (ehws_trace)                                            \
+          {                                                        \
+             if (!ec)                                              \
+               INF("EWL|%20.20s|            |             |%2d|"f, \
+                   "HWC-WINS", (e_hwc_output_index_get(hwc)), ##x);\
+             else                                                  \
+               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|"f,           \
+                   "HWC-WINS",                                     \
+                   (e_client_util_win_get(ec)),                    \
+                   (ec), (e_hwc_output_index_get(hwc)),            \
+                   ##x);                                           \
+          }                                                        \
+     }                                                             \
    while (0)
 
 #define ROUNDUP(s,c)        (((s) + (c-1)) & ~(c-1))
Domain: Graphics System / Display Server;