Changeset 2463df9 in mainline

Timestamp:

2014-02-11T04:38:26Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

89dcf93

Parents:

b6e481b

Message:

Remove the temptation to use mmap() and munmap() in native code.

Location:

uspace

Files:

• lib/block/block.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/include/sys/mman.h (deleted)
• lib/drv/generic/remote_audio_pcm.c (modified) (1 diff)
• lib/posix/Makefile (modified) (1 diff)
• lib/posix/include/posix/sys/mman.h (modified) (2 diffs)
• lib/posix/source/sys/mman.c (moved) (moved from uspace/lib/c/generic/mman.c ) (3 diffs)
• srv/fs/exfat/exfat_ops.c (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)
• srv/fs/udf/udf_ops.c (modified) (1 diff)

uspace/lib/block/block.c

@@ -40 +40 @@
 #include <ipc/services.h>
 #include <errno.h>
-#include <sys/mman.h>
 #include <async.h>
 #include <as.h>

uspace/lib/c/Makefile

@@ -131 +131 @@
         generic/time.c \
         generic/stdlib.c \
-        generic/mman.c \
         generic/udebug.c \
         generic/vfs/vfs.c \

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -38 +38 @@
 #include <macros.h>
 #include <str.h>
-#include <sys/mman.h>
+#include <as.h>
 
 #include "audio_pcm_iface.h"

uspace/lib/posix/Makefile

@@ -73 +73 @@
         source/string.c \
         source/strings.c \
+        source/sys/mman.c \
         source/sys/stat.c \
         source/sys/wait.c \

uspace/lib/posix/include/posix/sys/mman.h

@@ -40 +40 @@
 #endif
 
-#include "sys/types.h"
+#include "types.h"
 #include <abi/mm/as.h>
 
@@ -60 +60 @@
 #define PROT_EXEC  AS_AREA_EXEC
 
-extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
+extern void *
+__POSIX_DEF__(mmap)(void *start, size_t length, int prot, int flags, int fd,
     __POSIX_DEF__(off_t) offset);
-extern int munmap(void *start, size_t length);
+extern int __POSIX_DEF__(munmap)(void *start, size_t length);
 
 

uspace/lib/posix/source/sys/mman.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libposix
  * @{
  */
@@ -33 +33 @@
  */
 
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <as.h>
-#include <unistd.h>
+#define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
-void *mmap(void *start, size_t length, int prot, int flags, int fd,
-    aoff64_t offset)
+#include "../internal/common.h"
+#include <posix/sys/mman.h>
+#include <posix/sys/types.h>
+#include <libc/as.h>
+#include <posix/unistd.h>
+
+void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
+    __POSIX_DEF__(off_t) offset)
 {
         if (!start)
@@ -53 +57 @@
 }
 
-int munmap(void *start, size_t length)
+int posix_munmap(void *start, size_t length)
 {
         return as_area_destroy(start);

uspace/srv/fs/exfat/exfat_ops.c

@@ -58 +58 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/mman.h>
 #include <align.h>
 #include <malloc.h>

uspace/srv/fs/fat/fat_ops.c

@@ -55 +55 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/mman.h>
 #include <align.h>
 #include <malloc.h>

uspace/srv/fs/udf/udf_ops.c

@@ -50 +50 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/mman.h>
 #include <align.h>
 #include <malloc.h>