[MLton-commit] r7283

[Wesley Terpstra]

Don't grab all available memory on a shared system.


----------------------------------------------------------------------

U   mlton/trunk/package/debian/changelog
A   mlton/trunk/package/debian/heap-size
U   mlton/trunk/package/debian/rules

----------------------------------------------------------------------

Modified: mlton/trunk/package/debian/changelog
===================================================================
--- mlton/trunk/package/debian/changelog	2009-10-16 21:40:40 UTC (rev 7282)
+++ mlton/trunk/package/debian/changelog	2009-10-17 17:42:53 UTC (rev 7283)
@@ -1,3 +1,16 @@
+mlton (20091017) unstable; urgency=low
+
+  * Debian buildds are heavily loaded -> ram-slop 0.7 is a bad idea.
+   * caused thrashing on nautilus (amd64)
+   * bootstrap troubles from 20070812 on paer (hppa)
+  * Solution => fixed-heap based on debian target (rules/heap-size)
+   * 800MB for 32-bit systems (should work well with 1GB RAM)
+    * hppa, hurd-i386, i386, kfreebsd-i386, mips, mipsel, powerpc, s390, sparc
+   * 1200MB for 64-bit systems (should work well with 1.5GB RAM)
+    * alpha, amd64, ia64, kfreebsd-amd64
+
+ -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Sat, 17 Oct 2009 19:12:00 +0200
+
 mlton (20091015) unstable; urgency=low
 
   * Rebuild proper packages using the buildd

Added: mlton/trunk/package/debian/heap-size
===================================================================
--- mlton/trunk/package/debian/heap-size	2009-10-16 21:40:40 UTC (rev 7282)
+++ mlton/trunk/package/debian/heap-size	2009-10-17 17:42:53 UTC (rev 7283)
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+if dpkg-architecture -iany-hppa;    then result=800m; fi
+if dpkg-architecture -iany-i386;    then result=800m; fi
+if dpkg-architecture -iany-mips;    then result=800m; fi
+if dpkg-architecture -iany-mipsel;  then result=800m; fi
+if dpkg-architecture -iany-powerpc; then result=800m; fi
+if dpkg-architecture -iany-s390;    then result=800m; fi
+
+if dpkg-architecture -iany-alpha; then result=1.2g; fi
+if dpkg-architecture -iany-amd64; then result=1.2g; fi
+if dpkg-architecture -iany-ia64;  then result=1.2g; fi
+
+# Default to more
+if test -z "$result"; then result=1.2g; echo "Warning: Unknown architecture." >&2; fi
+
+echo "$result"


Property changes on: mlton/trunk/package/debian/heap-size
___________________________________________________________________
Name: svn:executable
   + *

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2009-10-16 21:40:40 UTC (rev 7282)
+++ mlton/trunk/package/debian/rules	2009-10-17 17:42:53 UTC (rev 7283)
@@ -1,16 +1,18 @@
 #!/usr/bin/make -f
 
-VERSION := $(shell dpkg-parsechangelog  | grep Version | cut -d" " -f2)
+VERSION  := $(shell dpkg-parsechangelog  | grep Version | cut -d" " -f2)
+HEAPSIZE := $(shell . rules/heap-size)
 CP = cp -fpR
 
 configure: configure-stamp
 configure-stamp:
+	free
 	make VERSION=$(VERSION) RELEASE=1 version
 	touch configure-stamp
 
 build: configure-stamp build-stamp
 build-stamp:
-	$(MAKE)
+	$(MAKE) RUNTIME_ARGS="fixed-heap $(HEAPSIZE)"
 	./bin/regression
 	touch build-stamp