mirror of
https://git.freebsd.org/ports.git
synced 2025-06-26 15:10:35 -04:00
862b9b85de
Threading is still broken on DragonFly when alias is used, so fix by augmenting the same patches FreeBSD uses. These are no-op pre-processor changes for FreeBSD. Approved by: non-invasive DF support blanket
82 lines
2.1 KiB
C
82 lines
2.1 KiB
C
--- va/va_trace.c.orig 2016-06-21 01:29:25 UTC
|
|
+++ va/va_trace.c
|
|
@@ -48,6 +48,9 @@
|
|
#include <sys/stat.h>
|
|
#include <sys/syscall.h>
|
|
#include <pthread.h>
|
|
+#ifdef __FreeBSD__
|
|
+#include <pthread_np.h>
|
|
+#endif
|
|
#include <unistd.h>
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
@@ -294,7 +297,13 @@ static void add_trace_config_info(
|
|
{
|
|
struct trace_config_info *pconfig_info;
|
|
int idx = 0;
|
|
+#ifdef __FreeBSD__
|
|
+ pid_t thd_id = pthread_getthreadid_np();
|
|
+#elif defined __DragonFly__
|
|
+ pid_t thd_id = syscall(SYS_lwp_gettid);
|
|
+#else
|
|
pid_t thd_id = syscall(__NR_gettid);
|
|
+#endif
|
|
|
|
LOCK_RESOURCE(pva_trace);
|
|
|
|
@@ -318,7 +327,13 @@ static void delete_trace_config_info(
|
|
{
|
|
struct trace_config_info *pconfig_info;
|
|
int idx = 0;
|
|
+#ifdef __FreeBSD__
|
|
+ pid_t thd_id = pthread_getthreadid_np();
|
|
+#elif defined __DragonFly__
|
|
+ pid_t thd_id = syscall(SYS_lwp_gettid);
|
|
+#else
|
|
pid_t thd_id = syscall(__NR_gettid);
|
|
+#endif
|
|
|
|
LOCK_RESOURCE(pva_trace);
|
|
|
|
@@ -663,7 +678,13 @@ static struct trace_log_file *start_trac
|
|
{
|
|
struct trace_log_files_manager *plog_files_mgr = NULL;
|
|
struct trace_log_file *plog_file = NULL;
|
|
+#ifdef __FreeBSD__
|
|
+ pid_t thd_id = pthread_getthreadid_np();
|
|
+#elif defined __DragonFly__
|
|
+ pid_t thd_id = syscall(SYS_lwp_gettid);
|
|
+#else
|
|
pid_t thd_id = syscall(__NR_gettid);
|
|
+#endif
|
|
int i = 0;
|
|
|
|
LOCK_RESOURCE(pva_trace);
|
|
@@ -702,7 +723,13 @@ static void refresh_log_file(
|
|
struct trace_context *ptra_ctx)
|
|
{
|
|
struct trace_log_file *plog_file = NULL;
|
|
+#ifdef __FreeBSD__
|
|
+ pid_t thd_id = pthread_getthreadid_np();
|
|
+#elif defined __DragonFly__
|
|
+ pid_t thd_id = syscall(SYS_lwp_gettid);
|
|
+#else
|
|
pid_t thd_id = syscall(__NR_gettid);
|
|
+#endif
|
|
int i = 0;
|
|
|
|
plog_file = ptra_ctx->plog_file;
|
|
@@ -1226,7 +1253,13 @@ static void internal_TraceUpdateContext
|
|
{
|
|
struct trace_context *trace_ctx = NULL;
|
|
int i = 0, delete = 1;
|
|
+#ifdef __FreeBSD__
|
|
+ pid_t thd_id = pthread_getthreadid_np();
|
|
+#elif defined __DragonFly__
|
|
+ pid_t thd_id = syscall(SYS_lwp_gettid);
|
|
+#else
|
|
pid_t thd_id = syscall(__NR_gettid);
|
|
+#endif
|
|
|
|
if(tra_ctx_idx >= MAX_TRACE_CTX_NUM)
|
|
return;
|