From c9e5484762fc42db262eeb714dfafffedc227dbd Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 31 Jan 2007 11:32:39 +0000
Subject: [PATCH] finish vm_memalign.c, though it's not a good idea after all
 and won't be used by default anywhere

svn: r5519
---
 src/mzscheme/gc2/Makefile.in   |  3 ++-
 src/mzscheme/gc2/vm_memalign.c | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/mzscheme/gc2/Makefile.in b/src/mzscheme/gc2/Makefile.in
index fdea62a89a..1a5b751580 100644
--- a/src/mzscheme/gc2/Makefile.in
+++ b/src/mzscheme/gc2/Makefile.in
@@ -288,7 +288,8 @@ main.@LTO@: $(XSRCDIR)/main.c
 	$(CC) $(CFLAGS) -c $(XSRCDIR)/main.c -o main.@LTO@
 
 gc2.@LTO@: $(srcdir)/gc2.c $(srcdir)/newgc.c $(srcdir)/compact.c $(srcdir)/newgc.c $(srcdir)/gc2.h \
-       $(srcdir)/vm_osx.c $(srcdir)/vm_mmap.c $(srcdir)/vm_osk.c $(srcdir)/alloc_cache.c \
+       $(srcdir)/vm_osx.c $(srcdir)/vm_mmap.c $(srcdir)/vm_osk.c $(srcdir)/vm.c\
+       $(srcdir)/vm_memalign.c $(srcdir)/alloc_cache.c \
        $(srcdir)/page_range.c $(srcdir)/protect_range.c $(srcdir)/var_stack.c $(srcdir)/stack_comp.c \
        $(srcdir)/../utils/splay.c $(srcdir)/my_qsort.c \
        $(srcdir)/weak.c $(srcdir)/fnls.c $(srcdir)/../include/scheme.h $(srcdir)/../src/schpriv.h
diff --git a/src/mzscheme/gc2/vm_memalign.c b/src/mzscheme/gc2/vm_memalign.c
index 5f8f074305..0ee7b0d28d 100644
--- a/src/mzscheme/gc2/vm_memalign.c
+++ b/src/mzscheme/gc2/vm_memalign.c
@@ -1,9 +1,8 @@
 /* 
    Provides:
-      posix_memalign-based allocator (uses alloc_cache.c)
+      posix_memalign-based allocator
       determine_max_heap_size() (uses rlimit_heapsize.c)
    Requires:
-      my_qsort (for alloc_cache.c)
       LOGICALLY_ALLOCATING_PAGES(len)
       ACTUALLY_ALLOCATING_PAGES(len)
       LOGICALLY_FREEING_PAGES(len)
@@ -27,7 +26,6 @@ static int page_size; /* OS page size */
 static void *malloc_dirty_pages(size_t len, size_t alignment)
 {
   void *r;
-  size_t extra = 0;
 
   if (!page_size)
     page_size = getpagesize();
@@ -38,13 +36,11 @@ static void *malloc_dirty_pages(size_t len, size_t alignment)
   if (len & (page_size - 1))
     len += page_size - (len & (page_size - 1));
 
-  /* Something from the cache, perhaps? */
-  r = find_cached_pages(len, alignment);
-  if (r)
-    return r;
-
-  if (posix_memalign(&r, alignment, len))
+  if (posix_memalign(&r, alignment, len)) {
+    if (errno == EINVAL)
+      printf("Invalid request\n");
     return NULL;
+  }
 
   ACTUALLY_ALLOCATING_PAGES(len);
   LOGICALLY_ALLOCATING_PAGES(len);
@@ -60,11 +56,17 @@ static void *malloc_pages(size_t len, size_t alignment)
   return p;
 }
 
-static void system_free_pages(void *p, size_t len)
+static void free_pages(void *p, size_t len)
 {
+  ACTUALLY_FREEING_PAGES(len);
+  LOGICALLY_FREEING_PAGES(len);
   free(p);
 }
 
+static void flush_freed_pages(void)
+{
+}
+
 static void protect_pages(void *p, size_t len, int writeable)
 {
   if (len & (page_size - 1)) {
@@ -74,8 +76,6 @@ static void protect_pages(void *p, size_t len, int writeable)
   mprotect(p, len, (writeable ? (PROT_READ | PROT_WRITE) : PROT_READ));
 }
 
-# include "alloc_cache.c"
-
 /*************************************************************/
 
 # include "rlimit_heapsize.c"