Omaha #3274 switch viz to G1 garbage collector

Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 44cb0e6ae6 [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]
Former-commit-id: 4a91c3320b
This commit is contained in:
Nate Jensen 2014-06-17 10:54:57 -05:00
parent 985c88d38b
commit 14a520dbd9
4 changed files with 15 additions and 8 deletions

View file

@ -394,7 +394,7 @@
<site-type>wfo</site-type>
<ini-substitutions>
<max-memory>
<value>3072M</value>
<value>2560M</value>
</max-memory>
<max-perm>
@ -433,7 +433,7 @@
<site-type>cwsu</site-type>
<ini-substitutions>
<max-memory>
<value>3072M</value>
<value>2560M</value>
</max-memory>
<max-perm>

View file

@ -47,6 +47,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.util.ITimer;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.memory.GarbageUtil;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.GfeClientConfig;
@ -68,6 +69,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* Feb 13, 2013 1597 randerso Made number of concurrent save threads a configurable value.
* Added logging to support GFE Performance metrics
* Nov 20, 2013 2488 randerso Changed to use DejaVu font
* Jun 16, 2014 3274 njensen Garbage collect after save is finished
*
* </pre>
*
@ -236,6 +238,11 @@ public abstract class AbstractSaveParameterDialog extends CaveJFACEDialog
.saveFinished(allSuccessful.get());
}
});
/*
* this dialog is already blocking so a user's not going to
* notice the pause caused by a garbage collect
*/
GarbageUtil.releaseMemoryToOS();
}
return Status.OK_STATUS;
}

View file

@ -16,10 +16,9 @@
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean</programArgs>
<programArgsLin>-consoleLog</programArgsLin>
<vmArgs>-Xincgc -Dosgi.instance.area.readOnly=true
<vmArgs>-XX:+UseG1GC
-Dosgi.instance.area.readOnly=true
-Declipse.log.enabled=false
-XX:+UnlockDiagnosticVMOptions
-XX:+UnsyncloadClass
-Dorg.eclipse.update.reconcile=false
-XX:MaxPermSize=128m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
@ -32,7 +31,7 @@
-Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
-Dthrift.stream.maxsize=200
-Dviz.memory.warn.threshold=98</vmArgs>
<vmArgsLin>-Xmx1280M -XX:MaxDirectMemorySize=2G</vmArgsLin>
<vmArgsLin>-Xmx2048M -XX:MaxDirectMemorySize=2G</vmArgsLin>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx768M</vmArgsWin>
</launcherArgs>

View file

@ -15,9 +15,10 @@
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -alertviz</programArgs>
<vmArgs>-Xincgc -Xmx1024M -Dosgi.instance.area.readOnly=true
<vmArgs>-Xmx1536M
-XX:+UseG1GC
-Dosgi.instance.area.readOnly=true
-Declipse.log.enabled=false
-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass
-Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=256m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
-Dqpid.dest_syntax=BURL