hurd-l4/physmem ChangeLog Makefile.am zalloc.c ...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/24 18:13:56

Modified files:
        physmem        : ChangeLog Makefile.am zalloc.c malloc-wrap.c 
Added files:
        physmem        : mmap.c 

Log message:
        2003-09-24  Marcus Brinkmann  <address@hidden>
        
        * mmap.c: New file.
        * Makefile.am (physmem_SOURCES): Add mmap.c.
        * malloc-wrap.c (LACKS_SYS_MMAN_H, mmap, munmap, PROT_READ,
        PROT_WRITE, MAP_PRIVATE, MAP_ANONYMOUS, MUNMAP_FAILURE): Remove
        macros.
        * zalloc.c (panic): Remove macro.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/mmap.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/Makefile.am.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/zalloc.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/malloc-wrap.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd-l4/physmem/ChangeLog
diff -u hurd-l4/physmem/ChangeLog:1.3 hurd-l4/physmem/ChangeLog:1.4
--- hurd-l4/physmem/ChangeLog:1.3       Mon Sep 22 09:32:56 2003
+++ hurd-l4/physmem/ChangeLog   Wed Sep 24 18:13:56 2003
@@ -1,3 +1,11 @@
+2003-09-24  Marcus Brinkmann  <address@hidden>
+
+       * mmap.c: New file.
+       * Makefile.am (physmem_SOURCES): Add mmap.c.
+       * malloc-wrap.c (LACKS_SYS_MMAN_H, mmap, munmap, PROT_READ,
+       PROT_WRITE, MAP_PRIVATE, MAP_ANONYMOUS, MUNMAP_FAILURE): Remove
+       macros.
+
 2003-09-22  Marcus Brinkmann  <address@hidden>
 
        * Makefile.am (AM_CPPFLAGS, physmem_CFLAGS): Removed.
Index: hurd-l4/physmem/Makefile.am
diff -u hurd-l4/physmem/Makefile.am:1.9 hurd-l4/physmem/Makefile.am:1.10
--- hurd-l4/physmem/Makefile.am:1.9     Mon Sep 22 18:57:48 2003
+++ hurd-l4/physmem/Makefile.am Wed Sep 24 18:13:56 2003
@@ -29,7 +29,7 @@
 
 physmem_SOURCES = $(ARCH_SOURCES)                              \
        output.h output.c                                       \
-       zalloc.h zalloc.c malloc-wrap.c                         \
+       zalloc.h zalloc.c mmap.c malloc-wrap.c                  \
        physmem.h physmem.c
 
 # Doug Lea's malloc is included by malloc-wrap.c.
Index: hurd-l4/physmem/malloc-wrap.c
diff -u hurd-l4/physmem/malloc-wrap.c:1.1 hurd-l4/physmem/malloc-wrap.c:1.2
--- hurd-l4/physmem/malloc-wrap.c:1.1   Mon Sep 22 09:32:15 2003
+++ hurd-l4/physmem/malloc-wrap.c       Wed Sep 24 18:13:56 2003
@@ -1,4 +1,4 @@
-/* malloc-wrap.c: Doug Lea's malloc for the physical memory server.
+/* malloc-wrap.c - Doug Lea's malloc for the physical memory server.
    Copyright (C) 2003 Free Software Foundation, Inc.
    Written by Marcus Brinkmann.
 
@@ -34,7 +34,6 @@
 #define __STD_C 1
 #define LACKS_UNISTD_H
 #define LACKS_SYS_PARAM_H
-#define LACKS_SYS_MMAN_H
 #define LACKS_FCNTL_H
 
 /* We want to use optimized versions of memset and memcpy.  */
@@ -44,19 +43,10 @@
 #define MORECORE(x) MORECORE_FAILURE
 #define HAVE_MMAP 1
 #define HAVE_MREMAP 0
-#define MUNMAP_FAILURE  (-1)
 #define MMAP_CLEARS 1
 #define malloc_getpagesize l4_min_page_size ()
-#define mmap(addr, size, p, f, fd, o) (zalloc (size) ?: MUNMAP_FAILURE)
-#define munmap(addr, size) (zfree ((l4_word_t) addr, size), 0)
 #define MMAP_AS_MORECORE_SIZE (16 * malloc_getpagesize)
 #define DEFAULT_MMAP_THRESHOLD (4 * malloc_getpagesize)
-
-/* These values don't really matter in mmap emulation */
-#define MAP_PRIVATE 1
-#define MAP_ANONYMOUS 2
-#define PROT_READ 1
-#define PROT_WRITE 2
 
 /* Suppress debug output in mstats().  */
 #define fprintf(...)
Index: hurd-l4/physmem/zalloc.c
diff -u hurd-l4/physmem/zalloc.c:1.6 hurd-l4/physmem/zalloc.c:1.7
--- hurd-l4/physmem/zalloc.c:1.6        Fri Sep 19 14:48:59 2003
+++ hurd-l4/physmem/zalloc.c    Wed Sep 24 18:13:56 2003
@@ -27,7 +27,6 @@
 
 #include "zalloc.h"
 
-#define panic(...) do { printf (__VA_ARGS__); l4_sleep (l4_never); } while (0)
 
 #ifndef NDEBUG
 #define DODEBUG(level, func) \