- try to improve on #3318 by giving memory back as much as possible t…

…o the OS on Windows
OpenModelica · May 19, 2015 · 0fa54dd · 0fa54dd
1 parent e2a2224
commit 0fa54dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Compiler/Main/Main.mo b/Compiler/Main/Main.mo
@@ -799,7 +799,7 @@ algorithm
   // 150M for Windows, 300M for others makes the GC try to unmap less and so it crashes less.
   // Disabling unmap is another alternative that seems to work well (but could cause the memory consumption to not be released, and requires manually calling collect and unmap
   if true then
-    GC.setForceUnmapOnGcollect(false);
+    GC.setForceUnmapOnGcollect(if System.os() == "Windows_NT" then true else false);
   else
     GC.expandHeap(if System.os() == "Windows_NT"
                       then 1024*1024*150

diff --git a/Makefile.omdev.mingw b/Makefile.omdev.mingw
@@ -31,7 +31,7 @@ OPENCL = Yes
 LINK = cp -rl
 AR = ar
 # LIBGC configuration is different for Windows (this file) and Linux (Makefile.in)
-LIBGC_EXTRA_CONFIGURATION=--enable-threads=posix --enable-munmap=5 --disable-parallel-mark
+LIBGC_EXTRA_CONFIGURATION=--enable-threads=posix --enable-munmap=1 --disable-parallel-mark
 MSL321_CONFIG_EXTRA_FLAGS=--enable-static --disable-shared
 LIBFMILIB=libfmilib.a
 LIBCMINPACKLIB=libcminpack.a