Changeset 835

Timestamp:

08/06/08 14:50:05 (4 years ago)

Author:

mwhitworth

Message:

Use MemoryMap for allocation in malloc, and no longer use locks.

Files:

• Whitix/trunk/user/libc/stdlib/mem.c (modified) (3 diffs)

Whitix/trunk/user/libc/stdlib/mem.c

@@ -435 +435 @@
 
 /* Whitix specific defines here */
-#define HAVE_MMAP 0 /* Use soon */
-#define HAVE_MORECORE 1
-#define MORECORE SysMoreCore
-#define MORECORE_CONTIGUOUS 0 /* Should be contiguous */
-#define MORECORE_FAILURE ((void*)0)
+#define HAVE_MMAP 1 /* Use soon */
+#define HAVE_MREMAP     0
+#define HAVE_MORECORE 0
 #define LACKS_UNISTD_H
 #define LACKS_SYS_PARAM_H
@@ -446 +444 @@
 #define LACKS_SYS_TYPES_H
 #define LACKS_ERRNO_H
-#define USE_LOCKS 1
+#define USE_LOCKS 0
 #define MALLOC_FAILURE_ACTION
 
@@ -1273 +1271 @@
 
 #ifndef WIN32
-#define CALL_MUNMAP(a, s)    munmap((a), (s))
+#define CALL_MUNMAP(a, s)    SysMemoryUnmap((a), (s))
 #define MMAP_PROT            (PROT_READ|PROT_WRITE)
+
 #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
 #define MAP_ANONYMOUS        MAP_ANON
 #endif
-#ifdef MAP_ANONYMOUS
-#define MMAP_FLAGS           (MAP_PRIVATE|MAP_ANONYMOUS)
-#define CALL_MMAP(s)         mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0)
-#else
-/*
-   Nearly all versions of mmap support MAP_ANONYMOUS, so the following
-   is unlikely to be needed, but is supplied just in case.
-*/
-#define MMAP_FLAGS           (MAP_PRIVATE)
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
-#define CALL_MMAP(s) ((dev_zero_fd < 0) ? \
-           (dev_zero_fd = open("/dev/zero", O_RDWR), \
-            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \
-            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0))
-#endif
+
+#define MMAP_FLAGS           (_SYS_MMAP_PRIVATE)
+#define CALL_MMAP(s)         SysMemoryMap(0, (s), 7, -1, 0, MMAP_FLAGS)
 
 #define DIRECT_MMAP(s)       CALL_MMAP(s)