drop the minix_ prefixes for mmap and munmap
also cleanup of various minix-specific changes, cleanup of mmap-related testing. Change-Id: I289a4fc50cf8a13df4a6082038d860853a4bd024
This commit is contained in:
Ben Gras
145
sys/sys/mman.h
145
sys/sys/mman.h
@@ -37,7 +37,6 @@
|
||||
#include <sys/featuretest.h>
|
||||
|
||||
#include <machine/ansi.h>
|
||||
#include <minix/type.h>
|
||||
|
||||
#ifdef _BSD_SIZE_T_
|
||||
typedef _BSD_SIZE_T_ size_t;
|
||||
@@ -74,48 +73,144 @@ typedef __off_t off_t; /* file offset */
|
||||
#endif
|
||||
#define MAP_PRIVATE 0x0002 /* changes are private */
|
||||
|
||||
#ifdef _KERNEL
|
||||
/*
|
||||
* Deprecated flag; these are treated as MAP_PRIVATE internally by
|
||||
* the kernel.
|
||||
*/
|
||||
#define MAP_COPY 0x0004 /* "copy" region at mmap time */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Other flags
|
||||
*/
|
||||
#define MAP_FIXED 0x0010 /* map addr must be exactly as requested */
|
||||
#define MAP_RENAME 0x0020 /* Sun: rename private pages to file */
|
||||
#define MAP_NORESERVE 0x0040 /* Sun: don't reserve needed swap area */
|
||||
#define MAP_INHERIT 0x0080 /* region is retained after exec */
|
||||
#define MAP_HASSEMAPHORE 0x0200 /* region may contain semaphores */
|
||||
#define MAP_TRYFIXED 0x0400 /* attempt hint address, even within break */
|
||||
#define MAP_WIRED 0x0800 /* mlock() mapping when it is established */
|
||||
|
||||
/*
|
||||
* Mapping type
|
||||
*/
|
||||
#define MAP_ANON 0x0004 /* anonymous memory */
|
||||
#define MAP_FILE 0x0000 /* map from file (default) */
|
||||
#define MAP_ANON 0x1000 /* allocated from memory, swap space */
|
||||
#define MAP_STACK 0x2000 /* allocated from memory, swap space (stack) */
|
||||
|
||||
/*
|
||||
* Minix specific flags.
|
||||
* Alignment (expressed in log2). Must be >= log2(PAGE_SIZE) and
|
||||
* < # bits in a pointer (26 (acorn26), 32 or 64).
|
||||
*/
|
||||
#define MAP_PREALLOC 0x0008 /* not on-demand */
|
||||
#define MAP_CONTIG 0x0010 /* contiguous in physical memory */
|
||||
#define MAP_LOWER16M 0x0020 /* physically below 16MB */
|
||||
#define MAP_ALIGN64K 0x0040 /* physically aligned at 64kB */
|
||||
#define MAP_LOWER1M 0x0080 /* physically below 16MB */
|
||||
#define MAP_ALIGNMENT_64KB MAP_ALIGN64K
|
||||
#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)
|
||||
#define MAP_ALIGNMENT_SHIFT 24
|
||||
#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)
|
||||
#define MAP_ALIGNMENT_64KB MAP_ALIGNED(16) /* 2^16 */
|
||||
#define MAP_ALIGNMENT_16MB MAP_ALIGNED(24) /* 2^24 */
|
||||
#define MAP_ALIGNMENT_4GB MAP_ALIGNED(32) /* 2^32 */
|
||||
#define MAP_ALIGNMENT_1TB MAP_ALIGNED(40) /* 2^40 */
|
||||
#define MAP_ALIGNMENT_256TB MAP_ALIGNED(48) /* 2^48 */
|
||||
#define MAP_ALIGNMENT_64PB MAP_ALIGNED(56) /* 2^56 */
|
||||
|
||||
#define MAP_FIXED 0x0200 /* require mapping to happen at hint */
|
||||
#define MAP_THIRDPARTY 0x0400 /* perform on behalf of any process */
|
||||
#define MAP_UNINITIALIZED 0x0800 /* do not clear memory */
|
||||
#define MAP_FILE 0x1000 /* it's a file */
|
||||
#ifdef __minix
|
||||
/*
|
||||
* Minix-specific flags
|
||||
*/
|
||||
#define MAP_UNINITIALIZED 0x040000 /* do not clear memory */
|
||||
#define MAP_PREALLOC 0x080000 /* not on-demand */
|
||||
#define MAP_CONTIG 0x100000 /* contiguous in physical memory */
|
||||
#define MAP_LOWER16M 0x200000 /* physically below 16MB */
|
||||
#define MAP_LOWER1M 0x400000 /* physically below 16MB */
|
||||
#define MAP_THIRDPARTY 0x800000 /* perform on behalf of any process */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Error indicator returned by mmap(2)
|
||||
*/
|
||||
#define MAP_FAILED ((void *) -1) /* mmap() failed */
|
||||
|
||||
/*
|
||||
* Flags to msync
|
||||
*/
|
||||
#define MS_ASYNC 0x01 /* perform asynchronous writes */
|
||||
#define MS_INVALIDATE 0x02 /* invalidate cached data */
|
||||
#define MS_SYNC 0x04 /* perform synchronous writes */
|
||||
|
||||
/*
|
||||
* Flags to mlockall
|
||||
*/
|
||||
#define MCL_CURRENT 0x01 /* lock all pages currently mapped */
|
||||
#define MCL_FUTURE 0x02 /* lock all pages mapped in the future */
|
||||
|
||||
/*
|
||||
* POSIX memory avissory values.
|
||||
* Note: keep consistent with the original defintions below.
|
||||
*/
|
||||
#define POSIX_MADV_NORMAL 0 /* No further special treatment */
|
||||
#define POSIX_MADV_RANDOM 1 /* Expect random page references */
|
||||
#define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references */
|
||||
#define POSIX_MADV_WILLNEED 3 /* Will need these pages */
|
||||
#define POSIX_MADV_DONTNEED 4 /* Don't need these pages */
|
||||
|
||||
#if defined(_NETBSD_SOURCE)
|
||||
/*
|
||||
* Original advice values, equivalent to POSIX defintions,
|
||||
* and few implementation-specific ones.
|
||||
*/
|
||||
#define MADV_NORMAL POSIX_MADV_NORMAL
|
||||
#define MADV_RANDOM POSIX_MADV_RANDOM
|
||||
#define MADV_SEQUENTIAL POSIX_MADV_SEQUENTIAL
|
||||
#define MADV_WILLNEED POSIX_MADV_WILLNEED
|
||||
#define MADV_DONTNEED POSIX_MADV_DONTNEED
|
||||
#define MADV_SPACEAVAIL 5 /* Insure that resources are reserved */
|
||||
#define MADV_FREE 6 /* Pages are empty, free them */
|
||||
|
||||
/*
|
||||
* Flags to minherit
|
||||
*/
|
||||
#define MAP_INHERIT_SHARE 0 /* share with child */
|
||||
#define MAP_INHERIT_COPY 1 /* copy into child */
|
||||
#define MAP_INHERIT_NONE 2 /* absent from child */
|
||||
#define MAP_INHERIT_DONATE_COPY 3 /* copy and delete -- not
|
||||
implemented in UVM */
|
||||
#define MAP_INHERIT_DEFAULT MAP_INHERIT_COPY
|
||||
#endif
|
||||
|
||||
#ifndef _KERNEL
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
#ifndef __minix
|
||||
void * mmap(void *, size_t, int, int, int, off_t);
|
||||
int munmap(void *, size_t);
|
||||
#else
|
||||
void * minix_mmap(void *, size_t, int, int, int, off_t);
|
||||
void * minix_mmap64(void *, size_t, int, int, int, u64_t);
|
||||
void * minix_mmap_for(endpoint_t, void *, size_t, int, int, int, u64_t);
|
||||
int minix_munmap(void *, size_t);
|
||||
void * vm_remap(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
|
||||
void * vm_remap_ro(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
|
||||
int vm_unmap(endpoint_t endpt, void *addr);
|
||||
unsigned long vm_getphys(endpoint_t endpt, void *addr);
|
||||
u8_t vm_getrefcount(endpoint_t endpt, void *addr);
|
||||
#endif /* __minix */
|
||||
int mprotect(void *, size_t, int);
|
||||
#ifndef __LIBC12_SOURCE__
|
||||
int msync(void *, size_t, int) __RENAME(__msync13);
|
||||
#endif
|
||||
int mlock(const void *, size_t);
|
||||
int munlock(const void *, size_t);
|
||||
int mlockall(int);
|
||||
int munlockall(void);
|
||||
#if defined(_NETBSD_SOURCE)
|
||||
int madvise(void *, size_t, int);
|
||||
int mincore(void *, size_t, char *);
|
||||
int minherit(void *, size_t, int);
|
||||
void * mremap(void *, size_t, void *, size_t, int);
|
||||
#endif
|
||||
int posix_madvise(void *, size_t, int);
|
||||
|
||||
#ifdef __minix
|
||||
#include <minix/endpoint.h>
|
||||
void * vm_remap(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
|
||||
void * vm_remap_ro(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
|
||||
int vm_unmap(endpoint_t endpt, void *addr);
|
||||
unsigned long vm_getphys(endpoint_t endpt, void *addr);
|
||||
u8_t vm_getrefcount(endpoint_t endpt, void *addr);
|
||||
#endif
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* !_KERNEL */
|
||||
|
||||
#endif /* !_SYS_MMAN_H_ */
|
||||
|
||||
Reference in New Issue
Block a user