xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1148 - the resources used by the gfesuite component in CAVE are now configurable." into development

Browse source 
Former-commit-id: 9e432bdc6f [formerly ebe2da8387] [formerly 92d38e8d1d [formerly 605d00e89c56c794e00105edbd044bf6528e6e0a]]
Former-commit-id: 92d38e8d1d
Former-commit-id: cd63496131
This commit is contained in:
Ron Anderson 2012-09-19 14:12:46 -05:00 • committed by Gerrit Code Review
commit cab08ce01d
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cave/build/cave/memorySettings.xml
View file

@ -90,6 +90,23 @@
</max-perm> </max-perm>
</ini-substitutions> </ini-substitutions>
</memory-setting> </memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>gfeclient</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>1536M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
</arch.x86> </arch.x86>
<arch.x86_64> <arch.x86_64>
@ -148,6 +165,23 @@
</max-perm> </max-perm>
</ini-substitutions> </ini-substitutions>
</memory-setting> </memory-setting>
<memory-setting>
<command-line-args>
<first-arg>-component</first-arg>
<second-arg>gfeclient</second-arg>
</command-line-args>
<ini-substitutions>
<max-memory>
<value>2048M</value>
</max-memory>
<max-perm>
<value>DEFAULT</value>
</max-perm>
</ini-substitutions>
</memory-setting>
</arch.x86_64> </arch.x86_64>
</cave-memory-settings> </cave-memory-settings>

4
cave/com.raytheon.viz.gfe/GFESuite/gfeclient.sh
View file

@ -81,8 +81,10 @@ else
export SWITCHES="${SWITCHES} -no_shader" export SWITCHES="${SWITCHES} -no_shader"
fi fi
COMPONENT_ARGS="-component gfeclient"
export LD_PRELOAD=libpython.so export LD_PRELOAD=libpython.so
/awips2/cave/cave ${SWITCHES} -nosplash -component gfeclient "$@" lookupINI ${COMPONENT_ARGS}
/awips2/cave/cave ${SWITCHES} ${CAVE_INI_ARG} -nosplash ${COMPONENT_ARGS} "$@"
if [ -n "$xvfb" ] if [ -n "$xvfb" ]
then then