Let execStat keep track of heap free/total size

OpenModelica · Apr 9, 2016 · 6a704ad · 6a704ad
1 parent 312e5a4
commit 6a704ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Compiler/Global/Global.mo b/Compiler/Global/Global.mo
@@ -46,8 +46,6 @@ constant Integer instOnlyForcedFunctions = 0;
 constant Integer codegenTryThrowIndex = 1;
 // Global roots start at index=9
 constant Integer instHashIndex = 9;
-constant Integer typesIndex = 10;
-constant Integer crefIndex = 11;
 constant Integer builtinIndex = 12;
 constant Integer builtinEnvIndex = 13;
 constant Integer profilerTime1Index = 14;

diff --git a/Compiler/Util/Error.mo b/Compiler/Util/Error.mo
@@ -833,7 +833,7 @@ public constant Message SUBCLOCK_CONFLICT = MESSAGE(570, TRANSLATION(), ERROR(),
 public constant Message CLOCK_CONFLICT = MESSAGE(571, TRANSLATION(), ERROR(),
   Util.gettext("Partitions have different base clocks."));
 public constant Message EXEC_STAT = MESSAGE(572, TRANSLATION(), NOTIFICATION(),
-  Util.gettext("Performance of %s: time %s/%s, memory: %s / %s"));
+  Util.gettext("Performance of %s: time %s/%s, allocations: %s / %s, free: %s / %s"));
 public constant Message EXEC_STAT_GC = MESSAGE(573, TRANSLATION(), NOTIFICATION(),
   Util.gettext("Performance of %s: time %s/%s, GC stats:%s"));
 public constant Message MAX_TEARING_SIZE = MESSAGE(574, SYMBOLIC(), NOTIFICATION(),

diff --git a/Compiler/Util/ExecStat.mo b/Compiler/Util/ExecStat.mo
@@ -30,11 +30,11 @@ function execStat
 protected
   Real t, total;
   String timeStr, totalTimeStr, gcStr;
-  Integer memory, oldMemory, since, before;
+  Integer memory, oldMemory, heapsize_full, free_bytes_full, since, before;
   GC.ProfStats stats, oldStats;
 algorithm
   if Flags.isSet(Flags.EXEC_STAT) then
-    (stats as GC.PROFSTATS(bytes_allocd_since_gc=since, allocd_bytes_before_gc=before)) := GC.getProfStats();
+    (stats as GC.PROFSTATS(bytes_allocd_since_gc=since, allocd_bytes_before_gc=before, heapsize_full=heapsize_full, free_bytes_full=free_bytes_full)) := GC.getProfStats();
     memory := since+before;
     oldStats := getGlobalRoot(Global.gcProfilingIndex);
     (oldStats as GC.PROFSTATS(bytes_allocd_since_gc=since, allocd_bytes_before_gc=before)) := oldStats;
@@ -49,7 +49,9 @@ algorithm
     else
       Error.addMessage(Error.EXEC_STAT, {name, timeStr, totalTimeStr,
           StringUtil.bytesToReadableUnit(memory-oldMemory, maxSizeInUnit=500, significantDigits=4),
-          StringUtil.bytesToReadableUnit(memory, maxSizeInUnit=500, significantDigits=4)
+          StringUtil.bytesToReadableUnit(memory, maxSizeInUnit=500, significantDigits=4),
+          StringUtil.bytesToReadableUnit(free_bytes_full, maxSizeInUnit=500, significantDigits=4),
+          StringUtil.bytesToReadableUnit(heapsize_full, maxSizeInUnit=500, significantDigits=4)
       });
     end if;
     System.realtimeTick(ClockIndexes.RT_CLOCK_EXECSTAT);