[bug] fix log_color

linuxkerneltravel · Aug 12, 2023 · 9dd6a75 · 9dd6a75
1 parent 655a715
commit 9dd6a75
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/eBPF_Supermarket/User_Function_Tracer/.clang-format b/eBPF_Supermarket/User_Function_Tracer/.clang-format
@@ -10,9 +10,9 @@ IncludeCategories:
     Priority: 0
   - Regex: '<getopt.h>'
     Priority: -1
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        2
-  - Regex:           '.\*'
-    Priority:        1
+  - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority: 2
+  - Regex: '^(<|"(gtest|isl|json)/)'
+    Priority: 2
+  - Regex: '.\*'
+    Priority: 1
diff --git a/eBPF_Supermarket/User_Function_Tracer/src/log.c b/eBPF_Supermarket/User_Function_Tracer/src/log.c
@@ -26,7 +26,7 @@ int debug;
 
 void log_color(const char* color) {
   char* term = getenv("TERM");
-  if (isatty(fileno(stdout)) && !(term && !strcmp(term, "dumb"))) {
+  if (isatty(fileno(stderr)) && !(term && !strcmp(term, "dumb"))) {
     LOG("%s", color);
   }
 }

diff --git a/eBPF_Supermarket/User_Function_Tracer/src/utrace.c b/eBPF_Supermarket/User_Function_Tracer/src/utrace.c
@@ -199,7 +199,10 @@ static int handle_event(void *ctx, void *data, size_t data_sz) {
       log_time(r->duration_ns);
       log_split();
       log_char(' ', 2 * r->ustack_sz);
-      LOG("} " TERM_GRAY "/* %s */" TERM_NC "\n", stack_func[r->global_sz]);
+      LOG("} ");
+      log_color(TERM_GRAY);
+      LOG("/* %s */\n", stack_func[r->global_sz]);
+      log_color(TERM_NC);
     }
     pending = 0;
     status = 1;