AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Rename DETECT_OS_UNIX to DETECT_OS_POSIX

Browse Source 
Looking at each usage of DETECT_OS_UNIX, it's more about the POSIX API usage, not the
Unix-like OS, so let's rename it

And for POSIX it's a standard to claim which API present, but for UNIX there is no such thing

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29555>
This commit is contained in:
Yonggang Luo
2024-06-06 01:19:35 +08:00
committed by Marge Bot
parent 73cc6c6738
commit 85ff3f525c
22 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/clc/clc_helpers.cpp
View File

@@ -61,7 +61,7 @@
#include "spirv.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <dlfcn.h>
#endif

2
src/gallium/auxiliary/driver_ddebug/dd_draw.c
View File

@@ -698,7 +698,7 @@ dd_dump_call(FILE *f, struct dd_draw_state *state, struct dd_call *call)
static void
dd_kill_process(void)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
sync();
#endif
fprintf(stderr, "dd: Aborting the process...\n");

2
src/gallium/auxiliary/driver_ddebug/dd_util.h
View File

@@ -37,7 +37,7 @@
#include "util/u_string.h"
#include "util/detect.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <unistd.h>
#include <sys/stat.h>
#elif DETECT_OS_WINDOWS

6
src/gallium/auxiliary/hud/hud_context.c
View File

@@ -79,7 +79,7 @@ static int hud_scale = HUD_DEFAULT_SCALE;
static int hud_rotate = HUD_DEFAULT_ROTATION;
static float hud_opacity = HUD_DEFAULT_OPACITY / 100.0f;
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
static void
signal_visible_handler(int sig, siginfo_t *siginfo, void *context)
{
@@ -1965,7 +1965,7 @@ hud_create(struct cso_context *cso, struct hud_context *share,
}
const char *env = debug_get_option("GALLIUM_HUD",
emulate_libgl_show_fps ? "stdout,fps" : NULL);
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
unsigned signo = debug_get_num_option("GALLIUM_HUD_TOGGLE_SIGNAL", 0);
static bool sig_handled = false;
struct sigaction action;
@@ -2056,7 +2056,7 @@ hud_create(struct cso_context *cso, struct hud_context *share,
list_inithead(&hud->pane_list);
/* setup sig handler once for all hud contexts */
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
if (!sig_handled && signo != 0) {
action.sa_sigaction = &signal_visible_handler;
action.sa_flags = SA_SIGINFO;

2
src/gallium/auxiliary/rtasm/rtasm_execmem.c
View File

@@ -47,7 +47,7 @@
#include <windows.h>
#endif
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
/*

4
src/gallium/auxiliary/util/u_file.h
View File

@@ -29,7 +29,7 @@
#ifndef U_FILE_H_
#define U_FILE_H_
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <unistd.h>
#endif
#if DETECT_OS_WINDOWS
@@ -42,7 +42,7 @@ extern "C" {
static inline int
u_file_access(const char *path, int mode) {
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
return access(path, mode);
#elif DETECT_OS_WINDOWS
return _access(path, mode);

2
src/gallium/drivers/nouveau/nouveau_fence.c
View File

@@ -26,7 +26,7 @@
#include "nouveau_fence.h"
#include "util/os_time.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <sched.h>
#endif

2
src/gallium/include/pipe/p_defines.h
View File

@@ -1325,7 +1325,7 @@ enum pipe_perf_counter_data_type
#define PIPE_UUID_SIZE 16
#define PIPE_LUID_SIZE 8
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#define PIPE_MEMORY_FD
#endif

8
src/gallium/winsys/sw/dri/dri_sw_winsys.c
View File

@@ -41,7 +41,7 @@
#include "util/format/u_formats.h"
#include "util/detect_os.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
# include <sys/stat.h>
# include <errno.h>
# include <sys/mman.h>
@@ -248,7 +248,7 @@ dri_sw_displaytarget_map(struct sw_winsys *ws,
dri_sw_dt->map_flags = flags;
if (dri_sw_dt->unbacked)
return dri_sw_dt->mapped;
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
if (dri_sw_dt->fd > -1) {
bool success = false;
if (!success) {
@@ -297,7 +297,7 @@ dri_sw_displaytarget_unmap(struct sw_winsys *ws,
dri_sw_dt->map_flags = 0;
return;
}
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
if (dri_sw_dt->fd > -1) {
munmap(dri_sw_dt->data, dri_sw_dt->size);
dri_sw_dt->data = NULL;
@@ -317,7 +317,7 @@ dri_sw_displaytarget_from_handle(struct sw_winsys *winsys,
struct winsys_handle *whandle,
unsigned *stride)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
int fd = os_dupfd_cloexec(whandle->handle);
struct sw_displaytarget *sw = dri_sw_displaytarget_create(winsys, templ->usage, templ->format, templ->width0, templ->height0, 64, NULL, stride);
struct dri_sw_displaytarget *dri_sw_dt = dri_sw_displaytarget(sw);

28
src/util/detect_os.h
View File

@@ -17,11 +17,11 @@
#if defined(__linux__)
#define DETECT_OS_LINUX 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
/*
* Android defines __linux__, so DETECT_OS_LINUX and DETECT_OS_UNIX will
* Android defines __linux__, so DETECT_OS_LINUX and DETECT_OS_POSIX will
* also be defined.
*/
#if defined(__ANDROID__)
@@ -31,40 +31,40 @@
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define DETECT_OS_FREEBSD 1
#define DETECT_OS_BSD 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__OpenBSD__)
#define DETECT_OS_OPENBSD 1
#define DETECT_OS_BSD 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__NetBSD__)
#define DETECT_OS_NETBSD 1
#define DETECT_OS_BSD 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__DragonFly__)
#define DETECT_OS_DRAGONFLY 1
#define DETECT_OS_BSD 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__GNU__)
#define DETECT_OS_HURD 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__sun)
#define DETECT_OS_SOLARIS 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__APPLE__)
#define DETECT_OS_APPLE 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(_WIN32) || defined(WIN32)
@@ -73,17 +73,17 @@
#if defined(__HAIKU__)
#define DETECT_OS_HAIKU 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__CYGWIN__)
#define DETECT_OS_CYGWIN 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
#if defined(__managarm__)
#define DETECT_OS_MANAGARM 1
#define DETECT_OS_UNIX 1
#define DETECT_OS_POSIX 1
#endif
@@ -126,8 +126,8 @@
#ifndef DETECT_OS_SOLARIS
#define DETECT_OS_SOLARIS 0
#endif
#ifndef DETECT_OS_UNIX
#define DETECT_OS_UNIX 0
#ifndef DETECT_OS_POSIX
#define DETECT_OS_POSIX 0
#endif
#ifndef DETECT_OS_WINDOWS
#define DETECT_OS_WINDOWS 0

10
src/util/log.c
View File

@@ -31,7 +31,7 @@
#include "util/ralloc.h"
#include "util/u_debug.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <syslog.h>
#include "util/u_process.h"
#endif
@@ -106,7 +106,7 @@ mesa_log_init_once(void)
}
#endif
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
if (mesa_log_control & MESA_LOG_CONTROL_SYSLOG)
openlog(util_get_process_name(), LOG_NDELAY | LOG_PID, LOG_USER);
#endif
@@ -232,7 +232,7 @@ logger_file(enum mesa_log_level level,
free(msg);
}
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
static inline int
level_to_syslog(enum mesa_log_level l)
@@ -263,7 +263,7 @@ logger_syslog(enum mesa_log_level level,
free(msg);
}
#endif /* DETECT_OS_UNIX */
#endif /* DETECT_OS_POSIX */
#if DETECT_OS_ANDROID
@@ -364,7 +364,7 @@ mesa_log_v(enum mesa_log_level level, const char *tag, const char *format,
va_list va);
} loggers[] = {
{ MESA_LOG_CONTROL_FILE, logger_file },
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
{ MESA_LOG_CONTROL_SYSLOG, logger_syslog },
#endif
#if DETECT_OS_ANDROID

2
src/util/os_memory_fd.c
View File

@@ -34,7 +34,7 @@
#include <linux/fcntl.h>
#endif
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <string.h>
#include <fcntl.h>

2
src/util/os_memory_stdc.h
View File

@@ -57,7 +57,7 @@
#include "os_memory_aligned.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include "os_memory_fd.h"

2
src/util/os_misc.c
View File

@@ -381,7 +381,7 @@ os_get_available_system_memory(uint64_t *size)
bool
os_get_page_size(uint64_t *size)
{
#if DETECT_OS_UNIX && !DETECT_OS_APPLE && !DETECT_OS_HAIKU
#if DETECT_OS_POSIX && !DETECT_OS_APPLE && !DETECT_OS_HAIKU
const long page_size = sysconf(_SC_PAGE_SIZE);
if (page_size <= 0)

4
src/util/os_misc.h
View File

@@ -40,7 +40,7 @@
#include "util/detect.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
# include <signal.h> /* for kill() */
# include <unistd.h> /* getpid() */
#endif
@@ -58,7 +58,7 @@ extern "C" {
# define os_break() __asm("int3")
#elif DETECT_CC_MSVC
# define os_break() __debugbreak()
#elif DETECT_OS_UNIX
#elif DETECT_OS_POSIX
# define os_break() kill(getpid(), SIGTRAP)
#else
# define os_break() abort()

2
src/util/os_mman.h
View File

@@ -40,7 +40,7 @@
#include "util/detect_os.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
# include <sys/mman.h>
#else
# error Unsupported OS

10
src/util/os_time.c
View File

@@ -39,7 +39,7 @@
#include "util/u_atomic.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
# include <unistd.h> /* usleep */
# include <time.h> /* timeval */
# include <sys/time.h> /* timeval */
@@ -71,7 +71,7 @@ os_time_sleep(int64_t usecs)
time.tv_nsec = (usecs % 1000000) * 1000;
while (clock_nanosleep(CLOCK_MONOTONIC, 0, &time, &time) == EINTR);
#elif DETECT_OS_UNIX
#elif DETECT_OS_POSIX
usleep(usecs);
#elif DETECT_OS_WINDOWS
@@ -118,7 +118,7 @@ os_wait_until_zero(volatile int *var, uint64_t timeout)
if (timeout == OS_TIMEOUT_INFINITE) {
while (p_atomic_read(var)) {
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
sched_yield();
#endif
}
@@ -132,7 +132,7 @@ os_wait_until_zero(volatile int *var, uint64_t timeout)
if (os_time_timeout(start_time, end_time, os_time_get_nano()))
return false;
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
sched_yield();
#endif
}
@@ -154,7 +154,7 @@ os_wait_until_zero_abs_timeout(volatile int *var, int64_t timeout)
if (os_time_get_nano() >= timeout)
return false;
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
sched_yield();
#endif
}

2
src/util/tests/os_mman_test.cpp
View File

@@ -25,7 +25,7 @@
#include "util/detect_os.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include "util/os_mman.h"

6
src/util/u_cpu_detect.c
View File

@@ -72,7 +72,7 @@
#include <elf.h>
#endif
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <unistd.h>
#endif
@@ -736,7 +736,7 @@ _util_cpu_detect_once(void)
GetSystemInfo(&system_info);
available_cpus = MAX2(1, system_info.dwNumberOfProcessors);
}
#elif DETECT_OS_UNIX
#elif DETECT_OS_POSIX
# if defined(HAS_SCHED_GETAFFINITY)
{
/* sched_setaffinity() can be used to further restrict the number of
@@ -804,7 +804,7 @@ _util_cpu_detect_once(void)
total_cpus = ncpu;
}
# endif /* DETECT_OS_BSD */
#endif /* DETECT_OS_UNIX */
#endif /* DETECT_OS_POSIX */
util_cpu_caps.nr_cpus = MAX2(1, available_cpus);
total_cpus = MAX2(total_cpus, util_cpu_caps.nr_cpus);

10
src/util/u_dl.c
View File

@@ -29,7 +29,7 @@
#include "detect_os.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <dlfcn.h>
#endif
#if DETECT_OS_WINDOWS
@@ -43,7 +43,7 @@
struct util_dl_library *
util_dl_open(const char *filename)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
return (struct util_dl_library *)dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
#elif DETECT_OS_WINDOWS
return (struct util_dl_library *)LoadLibraryA(filename);
@@ -57,7 +57,7 @@ util_dl_proc
util_dl_get_proc_address(struct util_dl_library *library,
const char *procname)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
return (util_dl_proc) pointer_to_func(dlsym((void *)library, procname));
#elif DETECT_OS_WINDOWS
return (util_dl_proc)GetProcAddress((HMODULE)library, procname);
@@ -70,7 +70,7 @@ util_dl_get_proc_address(struct util_dl_library *library,
void
util_dl_close(struct util_dl_library *library)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
dlclose((void *)library);
#elif DETECT_OS_WINDOWS
FreeLibrary((HMODULE)library);
@@ -83,7 +83,7 @@ util_dl_close(struct util_dl_library *library)
const char *
util_dl_error(void)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
return dlerror();
#elif DETECT_OS_WINDOWS
return "unknown error";

6
src/util/u_hash_table.c
View File

@@ -29,7 +29,7 @@
#include "util/u_pointer.h"
#include "util/u_hash_table.h"
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
#include <sys/stat.h>
#endif
@@ -57,7 +57,7 @@ util_hash_table_create_ptr_keys(void)
static uint32_t hash_fd(const void *key)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
int fd = pointer_to_intptr(key);
struct stat stat;
@@ -72,7 +72,7 @@ static uint32_t hash_fd(const void *key)
static bool equal_fd(const void *key1, const void *key2)
{
#if DETECT_OS_UNIX
#if DETECT_OS_POSIX
int fd1 = pointer_to_intptr(key1);
int fd2 = pointer_to_intptr(key2);
struct stat stat1, stat2;

2
src/util/u_process.c
View File

@@ -238,7 +238,7 @@ util_get_process_exec_path(char* process_path, size_t len)
process_path[len - 1] = '\0';
return len;
#elif DETECT_OS_UNIX
#elif DETECT_OS_POSIX
ssize_t r;
if ((r = readlink("/proc/self/exe", process_path, len)) > 0)