Changeset 12152 in project

Timestamp:

10/14/08 10:39:25 (12 years ago)

Author:

felix winkelmann

Message:

fixes in cscbench; removed lockts feature

Location:

chicken/branches/cmi

Files:

• benchmarks/cscbench.scm (moved) (moved from chicken/branches/cmi/cscbench.scm) (3 diffs)
• distribution/manifest (modified) (2 diffs)
• library.scm (modified) (1 diff)
• rules.make (modified) (1 diff)
• runtime.c (modified) (13 diffs)

chicken/branches/cmi/benchmarks/cscbench.scm

@@ -7 +7 @@
 (define flonum-files '("fft" "maze"))
 
-(define cc "`../csc -cc-name`")
-(define chicken "../chicken")
+(define cc "`csc -cc-name`")
+(define chicken "chicken")
 
 (define (abort-run) #f)
@@ -87 +87 @@
       (system* "~A -v" cc) )
   (dflush "\nCFLAGS:\n")
-  (system* "echo `../csc -cflags`")
-  (display "\n                  base       unsafe     max\n")
+  (system* "echo `csc -cflags`")
+  (display "\n                     base     unsafe        max\n")
   (let ((sum-base 0.0)
         (sum-unsafe 0.0)
@@ -106 +106 @@
        (newline)
        (flush-output) ) )
-   (lset-difference string=? (sort (glob "*.scm") string<?) '("plists.scm")))
+   (lset-difference string=? (sort (glob "*.scm") string<?) '("cscbench.scm")))
   (display "\nTOTAL            ")
   (display-f-4.3 sum-base)

chicken/branches/cmi/distribution/manifest

@@ -9 +9 @@
 banner.scm
 batch-driver.scm
+benchmarks/cscbench.scm
 benchmarks/boyer.scm
 benchmarks/browse.scm
@@ -110 +111 @@
 csc.1
 csc.scm
-cscbench.scm
 csi.1
 csi.scm

chicken/branches/cmi/library.scm

@@ -3249 +3249 @@
                    (if (##sys#fudge 32) " gchooks" "") 
                    (if (##sys#fudge 35) " applyhook" "")
-                   (if (##sys#fudge 22) " lockts" "")
                    (if (##sys#fudge 37) " hostpcre" "")
                    (if (##sys#fudge 39) " cross" "") ) ) )

chicken/branches/cmi/rules.make

@@ -1393 +1393 @@
 
 bench:
-        here=`pwd`; cd $(SRCDIR)benchmark; \
-        LD_LIBRARY_PATH=$$here DYLD_LIBRARY_PATH=$$here \
-        $$here/csi -s $(SRCDIR)cscbench.scm $(BENCHMARK_OPTIONS)
+        here=`pwd`; \
+        cd $(SRCDIR)benchmarks; \
+        LD_LIBRARY_PATH=$$here DYLD_LIBRARY_PATH=$$here PATH=$$here:$$PATH \
+        csi -s cscbench.scm $(BENCHMARK_OPTIONS)

chicken/branches/cmi/runtime.c

@@ -148 +148 @@
 #if defined(C_NO_HACKED_APPLY) && defined(C_HACKED_APPLY)
 # undef C_HACKED_APPLY
-#endif
-
-#ifdef C_LOCK_TOSPACE
-#include <sys/mman.h>
 #endif
 
@@ -529 +525 @@
 static C_word get_unbound_variable_value(C_word sym);
 static LF_LIST *find_module_handle(C_char *name);
-static void lock_tospace(int lock);
 
 static C_ccall void call_cc_wrapper(C_word c, C_word closure, C_word k, C_word result) C_noret;
@@ -658 +653 @@
     return 0;
 
-#ifdef C_LOCK_TOSPACE
-  page_size = sysconf(_SC_PAGESIZE);
-  assert(page_size > -1);
-#else
   page_size = 0;
-#endif
   stack_size = stack ? stack : DEFAULT_STACK_SIZE;
   C_set_or_change_heap_size(heap ? heap : DEFAULT_HEAP_SIZE, 0);
@@ -1037 +1027 @@
 /* Align memory to page boundary */
 
-#ifndef C_LOCK_TOSPACE
 static void *align_to_page(void *mem)
 {
   return (void *)C_align((C_uword)mem);
 }
-#endif
+
 
 static C_byte *
@@ -1048 +1037 @@
 {
   C_byte *p;
-#ifdef C_LOCK_TOSPACE
-  p = (C_byte *)mmap (NULL, size, (PROT_READ | PROT_WRITE),
-                      (MAP_PRIVATE | MAP_ANON), -1, 0);
-  if (p != NULL && page_aligned) *page_aligned = p;
-#else
   p = (C_byte *)C_malloc (size + page_size);
+
   if (p != NULL && page_aligned) *page_aligned = align_to_page (p);
-#endif
-
-  /* . */
+
   return p;
 }
+
 
 static void
 heap_free (C_byte *ptr, size_t size)
 {
-#ifdef C_LOCK_TOSPACE
-  int r = munmap (ptr, size);
-  assert (r == 0);
-#else
   C_free (ptr);
-#endif
-  /* . */
-}
+}
+
 
 static C_byte *
@@ -1078 +1057 @@
 {
   C_byte *p;
-#ifdef C_LOCK_TOSPACE
-  p = (C_byte *)mmap (NULL, new_size, (PROT_READ | PROT_WRITE),
-                      (MAP_PRIVATE | MAP_ANON), -1, 0);
-  if (ptr != NULL) {
-    memcpy (p, ptr, old_size);
-    heap_free (ptr, old_size);
-  }
-  if (p != NULL && page_aligned) *page_aligned = p;
-#else
   p = (C_byte *)C_realloc (ptr, new_size + page_size);
+
   if (p != NULL && page_aligned) *page_aligned = align_to_page (p);
-#endif
-
-  /* . */
+
   return p;
 }
+
 
 /* Modify heap size at runtime: */
@@ -1127 +1097 @@
   tospace_limit = tospace_start + size;
   mutation_stack_top = mutation_stack_bottom;
-  lock_tospace(1);
 
   if(reintern) initialize_symbol_table();
@@ -2708 +2677 @@
 
 
-static void lock_tospace(int lock)
-{
-#ifdef C_LOCK_TOSPACE
-  int r;
-
-  r = mprotect(tospace_start, (heap_size / 2), 
-               lock ? PROT_NONE : (PROT_READ | PROT_WRITE));
-
-  if(r == -1) panic(strerror(errno));
-#endif
-}
-
-
 C_regparm void C_fcall C_reclaim(void *trampoline, void *proc)
 {
@@ -2746 +2702 @@
   if(C_pre_gc_hook != NULL) C_pre_gc_hook(GC_MINOR);
 
-  lock_tospace(0);
   finalizers_checked = 0;
   C_restart_trampoline = (TRAMPOLINE)trampoline;
@@ -3015 +2970 @@
   if(C_post_gc_hook != NULL) C_post_gc_hook(gc_mode, tgc);
 
-  lock_tospace(1);
   /* Jump from the Empire State Building... */
   C_longjmp(C_restart, 1);
@@ -3195 +3149 @@
   size_t  new_heapspace_size;
 
-  lock_tospace(0);
-
   if(C_pre_gc_hook != NULL) C_pre_gc_hook(GC_REALLOC);
 
@@ -3323 +3275 @@
   C_fromspace_top = new_tospace_top;
   C_fromspace_limit = new_tospace_limit;
-  lock_tospace(1);
 
   if(gc_report_flag) {
@@ -4193 +4144 @@
     return C_fix(C_MOST_POSITIVE_FIXNUM);
 
-  case C_fix(22):
-#ifdef C_LOCK_TOSPACE
-    return C_SCHEME_TRUE;
-#else
-    return C_SCHEME_FALSE;
-#endif
+    /* 22 */
 
   case C_fix(23):