OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/os_misc: use detect_os.h to start uncoupling from gallium

Browse Source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Eric Engestrom
2019-08-01 22:33:05 +01:00
parent 87adc898b3
commit 7f12a66ad5
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/os_misc.c
View File

@@ -47,13 +47,13 @@
#endif
#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)
#if DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS || DETECT_OS_HURD
# include <unistd.h>
#elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
#elif DETECT_OS_APPLE || DETECT_OS_BSD
# include <sys/sysctl.h>
#elif defined(PIPE_OS_HAIKU)
#elif DETECT_OS_HAIKU
# include <kernel/OS.h>
#elif defined(PIPE_OS_WINDOWS)
#elif DETECT_OS_WINDOWS
# include <windows.h>
#else
#error unexpected platform in os_sysinfo.c
@@ -124,7 +124,7 @@ os_get_option(const char *name)
bool
os_get_total_physical_memory(uint64_t *size)
{
#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)
#if DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS || DETECT_OS_HURD
const long phys_pages = sysconf(_SC_PHYS_PAGES);
const long page_size = sysconf(_SC_PAGE_SIZE);
@@ -133,25 +133,25 @@ os_get_total_physical_memory(uint64_t *size)
*size = (uint64_t)phys_pages * (uint64_t)page_size;
return true;
#elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
#elif DETECT_OS_APPLE || DETECT_OS_BSD
size_t len = sizeof(*size);
int mib[2];
mib[0] = CTL_HW;
#if defined(PIPE_OS_APPLE)
#if DETECT_OS_APPLE
mib[1] = HW_MEMSIZE;
#elif defined(PIPE_OS_NETBSD) || defined(PIPE_OS_OPENBSD)
#elif DETECT_OS_NETBSD || DETECT_OS_OPENBSD
mib[1] = HW_PHYSMEM64;
#elif defined(PIPE_OS_FREEBSD)
#elif DETECT_OS_FREEBSD
mib[1] = HW_REALMEM;
#elif defined(PIPE_OS_DRAGONFLY)
#elif DETECT_OS_DRAGONFLY
mib[1] = HW_PHYSMEM;
#else
#error Unsupported *BSD
#endif
return (sysctl(mib, 2, size, &len, NULL, 0) == 0);
#elif defined(PIPE_OS_HAIKU)
#elif DETECT_OS_HAIKU
system_info info;
status_t ret;
@@ -161,7 +161,7 @@ os_get_total_physical_memory(uint64_t *size)
*size = (uint64_t)info.max_pages * (uint64_t)B_PAGE_SIZE;
return true;
#elif defined(PIPE_OS_WINDOWS)
#elif DETECT_OS_WINDOWS
MEMORYSTATUSEX status;
BOOL ret;