From e472f946fc2316959e8480e2371233fd275b1da2 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Mon, 15 Aug 2011 11:26:10 -0400 Subject: Compiler frees as much memory as possible before passing control to C compiler --- src/compiler.mlb | 1 + src/compiler.sig | 5 +++++ src/compiler.sml | 3 +++ src/main.mlton.sml | 2 ++ 4 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/compiler.mlb b/src/compiler.mlb index 83212484..f0007284 100644 --- a/src/compiler.mlb +++ b/src/compiler.mlb @@ -1,4 +1,5 @@ $(SML_LIB)/basis/basis.mlb +$(SML_LIB)/basis/mlton.mlb urweb.mlb diff --git a/src/compiler.sig b/src/compiler.sig index 587b3a94..62b57856 100644 --- a/src/compiler.sig +++ b/src/compiler.sig @@ -65,6 +65,11 @@ signature COMPILER = sig val compileC : {cname : string, oname : string, ename : string, libs : string, profile : bool, debug : bool, link : string list} -> bool + val beforeC : (unit -> unit) ref + (* This function is called before beginning C compilation. + * The current use is for MLton to compact its heap here, to avoid hogging + * space after all the interesting ML code is done. *) + type ('src, 'dst) phase type ('src, 'dst) transform diff --git a/src/compiler.sml b/src/compiler.sml index 21ffae27..de6b14b4 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -1311,6 +1311,8 @@ val toSqlify = transform sqlify "sqlify" o toMono_opt2 val escapeFilename = String.translate (fn #" " => "\\ " | #"\"" => "\\\"" | #"'" => "\\'" | ch => str ch) +val beforeC = ref (fn () => ()) + fun compileC {cname, oname, ename, libs, profile, debug, link = link'} = let val proto = Settings.currentProtocol () @@ -1348,6 +1350,7 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} = (); OS.Process.isSuccess (OS.Process.system s)) in + !beforeC (); system compile andalso system link end diff --git a/src/main.mlton.sml b/src/main.mlton.sml index debbce15..6f38efa8 100644 --- a/src/main.mlton.sml +++ b/src/main.mlton.sml @@ -32,6 +32,8 @@ val demo = ref (NONE : (string * bool) option) val tutorial = ref false val css = ref false +val () = Compiler.beforeC := MLton.GC.pack + fun printVersion () = (print (Config.versionString ^ "\n"); OS.Process.exit OS.Process.success) fun printNumericVersion () = (print (Config.versionNumber ^ "\n"); -- cgit v1.2.3