commit 0ed447df56fe14f9a83886c955365b6d13f972de
author Jan Beich <jbeich@FreeBSD.org> Fri Oct 16 18:12:01 2020 +0000
committer Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com> Fri Oct 16 13:37:22 2020 -0700
tree cf9f1a645ab510999ad126c573e412a1502195b1
parent 437d42611b50462e52352b61b0ac073a611cf071

va/va_trace: ignore system gettid() on Linux

glibc could probably use `__GLIBC_PREREQ(2, 30)` but musl doesn't
expose version to consumers. Instead of dancing around various libc
always use local definition.

va/va_trace.c

diff --git a/va/va_trace.c b/va/va_trace.c
index f9847d2..5cb498d 100644
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -63,8 +63,8 @@
 #include <thread.h>
 #endif
 
-#if !defined(__BIONIC__)
-static pid_t gettid()
+/* bionic, glibc >= 2.30, musl >= 1.3 have gettid(), so add va_ prefix */
+static pid_t va_gettid()
 {
 #if defined(__linux__)
   return syscall(__NR_gettid);
@@ -81,7 +81,6 @@
   return (intptr_t)pthread_self();
 #endif
 }
-#endif
 
 /*
  * Env. to debug some issue, e.g. the decode/encode issue in a video conference scenerio:
@@ -317,7 +316,7 @@
 {
     struct trace_config_info *pconfig_info;
     int idx = 0;
-    pid_t thd_id = gettid();
+    pid_t thd_id = va_gettid();
 
     LOCK_RESOURCE(pva_trace);
 
@@ -695,7 +694,7 @@
 {
     struct trace_log_files_manager *plog_files_mgr = NULL;
     struct trace_log_file *plog_file = NULL;
-    pid_t thd_id = gettid();
+    pid_t thd_id = va_gettid();
     int i = 0;
 
     LOCK_RESOURCE(pva_trace);
@@ -734,7 +733,7 @@
     struct trace_context *ptra_ctx)
 {
     struct trace_log_file *plog_file = NULL;
-    pid_t thd_id = gettid();
+    pid_t thd_id = va_gettid();
     int i = 0;
 
     plog_file = ptra_ctx->plog_file;
@@ -1260,7 +1259,7 @@
 {
     struct trace_context *trace_ctx = NULL;
     int i = 0, delete = 1;
-    pid_t thd_id = gettid();
+    pid_t thd_id = va_gettid();
 
     if(tra_ctx_idx >= MAX_TRACE_CTX_NUM)
         return;