mirrors
/
mimalloc
mirror of https://github.com/microsoft/mimalloc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make syscall test in primitives positive and avoid unused function warnings. upstream python/cpython#111907, python/cpython#111593, python/cpython#117548

This commit is contained in:
daanx 2024-05-18 16:37:40 -07:00
parent 937fd19338
commit 87c4012f13
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/prim/unix/prim.c
View File

@ -57,8 +57,7 @@ terms of the MIT license. A copy of the license can be found in the file
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#if !defined(__HAIKU__) && !defined(__APPLE__) && !defined(__CYGWIN__) && \ #if defined(__linux__)
!defined(__OpenBSD__) && !defined(__sun) && !defined(_AIX)
#define MI_HAS_SYSCALL_H #define MI_HAS_SYSCALL_H
#include <sys/syscall.h> #include <sys/syscall.h>
#endif #endif
@ -68,37 +67,36 @@ terms of the MIT license. A copy of the license can be found in the file
// Use syscalls for some primitives to allow for libraries that override open/read/close etc. // Use syscalls for some primitives to allow for libraries that override open/read/close etc.
// and do allocation themselves; using syscalls prevents recursion when mimalloc is // and do allocation themselves; using syscalls prevents recursion when mimalloc is
// still initializing (issue #713) // still initializing (issue #713)
// Declare inline to avoid unused function warnings.
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
#if defined(MI_HAS_SYSCALL_H) && defined(SYS_open) && defined(SYS_close) && defined(SYS_read) && defined(SYS_access) #if defined(MI_HAS_SYSCALL_H) && defined(SYS_open) && defined(SYS_close) && defined(SYS_read) && defined(SYS_access)
static int mi_prim_open(const char* fpath, int open_flags) { static inline int mi_prim_open(const char* fpath, int open_flags) {
return syscall(SYS_open,fpath,open_flags,0); return syscall(SYS_open,fpath,open_flags,0);
} }
static ssize_t mi_prim_read(int fd, void* buf, size_t bufsize) { static inline ssize_t mi_prim_read(int fd, void* buf, size_t bufsize) {
return syscall(SYS_read,fd,buf,bufsize); return syscall(SYS_read,fd,buf,bufsize);
} }
static int mi_prim_close(int fd) { static inline int mi_prim_close(int fd) {
return syscall(SYS_close,fd); return syscall(SYS_close,fd);
} }
static int mi_prim_access(const char *fpath, int mode) { static inline int mi_prim_access(const char *fpath, int mode) {
return syscall(SYS_access,fpath,mode); return syscall(SYS_access,fpath,mode);
} }
#elif !defined(__sun) && !defined(_AIX) && \ #else
(!defined(__APPLE__) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7)) // avoid unused warnings on macOS et al.
static int mi_prim_open(const char* fpath, int open_flags) { static inline int mi_prim_open(const char* fpath, int open_flags) {
return open(fpath,open_flags); return open(fpath,open_flags);
} }
static ssize_t mi_prim_read(int fd, void* buf, size_t bufsize) { static inline ssize_t mi_prim_read(int fd, void* buf, size_t bufsize) {
return read(fd,buf,bufsize); return read(fd,buf,bufsize);
} }
static int mi_prim_close(int fd) { static inline int mi_prim_close(int fd) {
return close(fd); return close(fd);
} }
static int mi_prim_access(const char *fpath, int mode) { static inline int mi_prim_access(const char *fpath, int mode) {
return access(fpath,mode); return access(fpath,mode);
} }