Skip to content

va: Allow clean build on OpenBSD 6.6 #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

va: Allow clean build on OpenBSD 6.6 #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions va/va.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,10 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
}

va_infoMessage(dpy, "Trying to open %s\n", driver_path);
#ifndef ANDROID
handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
#else
#if (!defined(RTLD_NODELETE) || defined(ANDROID))
handle = dlopen( driver_path, RTLD_NOW| RTLD_GLOBAL);
#else
handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
#endif
if (!handle) {
/* Don't give errors for non-existing files */
Expand Down
21 changes: 17 additions & 4 deletions va/va_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
*/

#define _GNU_SOURCE 1

#ifdef __OpenBSD__
#include <tib.h>
#endif

#include "sysdeps.h"
#include "va.h"
#include "va_enc_h264.h"
Expand Down Expand Up @@ -261,6 +266,14 @@ VAStatus vaUnlockSurface(VADisplay dpy,
VASurfaceID surface
);

pid_t get_pid_t()
{
#ifdef __OpenBSD__
return TIB_GET()->tib_tid;
#else
return syscall(__NR_gettid);
#endif
}
static int get_valid_config_idx(
struct va_trace *pva_trace,
VAConfigID config_id)
Expand Down Expand Up @@ -288,7 +301,7 @@ static void add_trace_config_info(
{
struct trace_config_info *pconfig_info;
int idx = 0;
pid_t thd_id = syscall(__NR_gettid);
pid_t thd_id = get_pid_t();

LOCK_RESOURCE(pva_trace);

Expand Down Expand Up @@ -666,7 +679,7 @@ static struct trace_log_file *start_tracing2log_file(
{
struct trace_log_files_manager *plog_files_mgr = NULL;
struct trace_log_file *plog_file = NULL;
pid_t thd_id = syscall(__NR_gettid);
pid_t thd_id = get_pid_t();
int i = 0;

LOCK_RESOURCE(pva_trace);
Expand Down Expand Up @@ -705,7 +718,7 @@ static void refresh_log_file(
struct trace_context *ptra_ctx)
{
struct trace_log_file *plog_file = NULL;
pid_t thd_id = syscall(__NR_gettid);
pid_t thd_id = get_pid_t();
int i = 0;

plog_file = ptra_ctx->plog_file;
Expand Down Expand Up @@ -1231,7 +1244,7 @@ static void internal_TraceUpdateContext (
{
struct trace_context *trace_ctx = NULL;
int i = 0, delete = 1;
pid_t thd_id = syscall(__NR_gettid);
pid_t thd_id = get_pid_t();

if(tra_ctx_idx >= MAX_TRACE_CTX_NUM)
return;
Expand Down