sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cluster] Log "Cluster capped" as warn. Better memory info massage.

Browse source 
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
This commit is contained in:
Dennis Huebner 2016-03-03 10:34:09 +01:00
parent 0ba45fac8a
commit ef0cbdd914
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/clustering/DynamicResourceClusteringPolicy.java
View file

@ -51,16 +51,17 @@ public class DynamicResourceClusteringPolicy implements IResourceClusteringPolic
if (alreadyProcessed == 0)
return true;
final long maxMemory = Runtime.getRuntime().maxMemory();
if (maxMemory > Runtime.getRuntime().totalMemory() + minimumFreeMemory)
final long totalMemory = Runtime.getRuntime().totalMemory();
if (maxMemory > totalMemory + minimumFreeMemory)
return true;
final long freeMemory = Runtime.getRuntime().freeMemory();
if (freeMemory < minimumFreeMemory) {
logClusterCapped(resourceSet, alreadyProcessed, freeMemory, maxMemory);
logClusterCapped(resourceSet, alreadyProcessed, freeMemory, totalMemory);
return false;
} else if (alreadyProcessed < minimumClusterSize) {
return true;
} else if (freeMemory < maxMemory / 100 * minimumPercentFreeMemory) {
logClusterCapped(resourceSet, alreadyProcessed, freeMemory, maxMemory);
logClusterCapped(resourceSet, alreadyProcessed, freeMemory, totalMemory);
return false;
}
@ -78,7 +79,8 @@ public class DynamicResourceClusteringPolicy implements IResourceClusteringPolic
}
if (!hasLoggedAboutIncreasingHeap) {
hasLoggedAboutIncreasingHeap = true;
LOGGER.error("Your total heap size ("+(totalMemory >> 20)+"m) is too small. Please increase the maximum heap for your running JVM!");
LOGGER.warn("Your total heap size (" + (totalMemory >> 20) + "m) is too small (free: " + (freeMemory >> 20) + "m, max: "
+ (Runtime.getRuntime().maxMemory() >> 20) + "m). Please increase the maximum heap for your running JVM!");
}
}