From 85ff3f525cfd56cee03f5c727824607e5bbdb591 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 6 Jun 2024 01:19:35 +0800 Subject: [PATCH] util: Rename DETECT_OS_UNIX to DETECT_OS_POSIX 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 Acked-by: Rob Clark Reviewed-by: Gurchetan Singh Part-of: --- src/compiler/clc/clc_helpers.cpp | 2 +- src/gallium/auxiliary/driver_ddebug/dd_draw.c | 2 +- src/gallium/auxiliary/driver_ddebug/dd_util.h | 2 +- src/gallium/auxiliary/hud/hud_context.c | 6 ++-- src/gallium/auxiliary/rtasm/rtasm_execmem.c | 2 +- src/gallium/auxiliary/util/u_file.h | 4 +-- src/gallium/drivers/nouveau/nouveau_fence.c | 2 +- src/gallium/include/pipe/p_defines.h | 2 +- src/gallium/winsys/sw/dri/dri_sw_winsys.c | 8 +++--- src/util/detect_os.h | 28 +++++++++---------- src/util/log.c | 10 +++---- src/util/os_memory_fd.c | 2 +- src/util/os_memory_stdc.h | 2 +- src/util/os_misc.c | 2 +- src/util/os_misc.h | 4 +-- src/util/os_mman.h | 2 +- src/util/os_time.c | 10 +++---- src/util/tests/os_mman_test.cpp | 2 +- src/util/u_cpu_detect.c | 6 ++-- src/util/u_dl.c | 10 +++---- src/util/u_hash_table.c | 6 ++-- src/util/u_process.c | 2 +- 22 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp index 2a99158f7a4..2e3287ee84e 100644 --- a/src/compiler/clc/clc_helpers.cpp +++ b/src/compiler/clc/clc_helpers.cpp @@ -61,7 +61,7 @@ #include "spirv.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #endif diff --git a/src/gallium/auxiliary/driver_ddebug/dd_draw.c b/src/gallium/auxiliary/driver_ddebug/dd_draw.c index 4f6c56581d0..a220998276f 100644 --- a/src/gallium/auxiliary/driver_ddebug/dd_draw.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_draw.c @@ -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"); diff --git a/src/gallium/auxiliary/driver_ddebug/dd_util.h b/src/gallium/auxiliary/driver_ddebug/dd_util.h index e9a6a5e1b4e..ae90825e391 100644 --- a/src/gallium/auxiliary/driver_ddebug/dd_util.h +++ b/src/gallium/auxiliary/driver_ddebug/dd_util.h @@ -37,7 +37,7 @@ #include "util/u_string.h" #include "util/detect.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #include #elif DETECT_OS_WINDOWS diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c index b43ea363e58..db8027a7d8a 100644 --- a/src/gallium/auxiliary/hud/hud_context.c +++ b/src/gallium/auxiliary/hud/hud_context.c @@ -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; diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c index 90db1fe5b38..82c4d2f019c 100644 --- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -47,7 +47,7 @@ #include #endif -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX /* diff --git a/src/gallium/auxiliary/util/u_file.h b/src/gallium/auxiliary/util/u_file.h index 3f35562df9b..12b5212aab9 100644 --- a/src/gallium/auxiliary/util/u_file.h +++ b/src/gallium/auxiliary/util/u_file.h @@ -29,7 +29,7 @@ #ifndef U_FILE_H_ #define U_FILE_H_ -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #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); diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c index 11e8e5c7e86..c2b2ebc4034 100644 --- a/src/gallium/drivers/nouveau/nouveau_fence.c +++ b/src/gallium/drivers/nouveau/nouveau_fence.c @@ -26,7 +26,7 @@ #include "nouveau_fence.h" #include "util/os_time.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #endif diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index f94c7c6c262..4d572f0383f 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -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 diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c index 4c015543aba..6bd2e6adae0 100644 --- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c +++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c @@ -41,7 +41,7 @@ #include "util/format/u_formats.h" #include "util/detect_os.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX # include # include # include @@ -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); diff --git a/src/util/detect_os.h b/src/util/detect_os.h index 19f8e3372df..7e3933f7cd6 100644 --- a/src/util/detect_os.h +++ b/src/util/detect_os.h @@ -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 diff --git a/src/util/log.c b/src/util/log.c index 571c0b74a7e..41db2014f4c 100644 --- a/src/util/log.c +++ b/src/util/log.c @@ -31,7 +31,7 @@ #include "util/ralloc.h" #include "util/u_debug.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #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 diff --git a/src/util/os_memory_fd.c b/src/util/os_memory_fd.c index bb74ffc608f..dc55d99c412 100644 --- a/src/util/os_memory_fd.c +++ b/src/util/os_memory_fd.c @@ -34,7 +34,7 @@ #include #endif -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #include diff --git a/src/util/os_memory_stdc.h b/src/util/os_memory_stdc.h index 81645ec27dd..4009875dbee 100644 --- a/src/util/os_memory_stdc.h +++ b/src/util/os_memory_stdc.h @@ -57,7 +57,7 @@ #include "os_memory_aligned.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include "os_memory_fd.h" diff --git a/src/util/os_misc.c b/src/util/os_misc.c index 19fecb309d9..dd3726ab8aa 100644 --- a/src/util/os_misc.c +++ b/src/util/os_misc.c @@ -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) diff --git a/src/util/os_misc.h b/src/util/os_misc.h index 4301ae4594e..cfe3107c6e1 100644 --- a/src/util/os_misc.h +++ b/src/util/os_misc.h @@ -40,7 +40,7 @@ #include "util/detect.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX # include /* for kill() */ # include /* 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() diff --git a/src/util/os_mman.h b/src/util/os_mman.h index 9b0e45e8cdb..1567ee76079 100644 --- a/src/util/os_mman.h +++ b/src/util/os_mman.h @@ -40,7 +40,7 @@ #include "util/detect_os.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX # include #else # error Unsupported OS diff --git a/src/util/os_time.c b/src/util/os_time.c index 37548a8544b..12705565d3e 100644 --- a/src/util/os_time.c +++ b/src/util/os_time.c @@ -39,7 +39,7 @@ #include "util/u_atomic.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX # include /* usleep */ # include /* timeval */ # include /* 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 } diff --git a/src/util/tests/os_mman_test.cpp b/src/util/tests/os_mman_test.cpp index 7c00c983f0b..81742f91403 100644 --- a/src/util/tests/os_mman_test.cpp +++ b/src/util/tests/os_mman_test.cpp @@ -25,7 +25,7 @@ #include "util/detect_os.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include "util/os_mman.h" diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c index 66e9d48f39c..e77bdbb1b6a 100644 --- a/src/util/u_cpu_detect.c +++ b/src/util/u_cpu_detect.c @@ -72,7 +72,7 @@ #include #endif -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #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); diff --git a/src/util/u_dl.c b/src/util/u_dl.c index c0c0cbccbc6..27d7b366160 100644 --- a/src/util/u_dl.c +++ b/src/util/u_dl.c @@ -29,7 +29,7 @@ #include "detect_os.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #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"; diff --git a/src/util/u_hash_table.c b/src/util/u_hash_table.c index 7a6a513dd71..b3d37485783 100644 --- a/src/util/u_hash_table.c +++ b/src/util/u_hash_table.c @@ -29,7 +29,7 @@ #include "util/u_pointer.h" #include "util/u_hash_table.h" -#if DETECT_OS_UNIX +#if DETECT_OS_POSIX #include #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; diff --git a/src/util/u_process.c b/src/util/u_process.c index 23ab4bc0927..404936de508 100644 --- a/src/util/u_process.c +++ b/src/util/u_process.c @@ -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)