You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/29 11:38:51 UTC
svn commit: r1527292 - in /openmeetings/trunk/singlewebapp:
WebContent/red5/red5-highperf.bat WebContent/red5/red5-highperf.sh
WebContent/red5/red5.bat WebContent/red5/red5.sh build.xml
Author: solomax
Date: Sun Sep 29 09:38:51 2013
New Revision: 1527292
URL: http://svn.apache.org/r1527292
Log:
[OPENMEETINGS-808] scripts are updated with increased MaxPermSize option
Added:
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh
openmeetings/trunk/singlewebapp/WebContent/red5/red5.bat
openmeetings/trunk/singlewebapp/WebContent/red5/red5.sh
Modified:
openmeetings/trunk/singlewebapp/build.xml
Added: openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat?rev=1527292&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat (added)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat Sun Sep 29 09:38:51 2013
@@ -0,0 +1,32 @@
+REM #############################################
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM #############################################
+@echo off
+
+SETLOCAL
+
+if NOT DEFINED RED5_HOME set RED5_HOME=%~dp0
+
+REM Previous option set
+REM -Xrs -Xms512M -Xmx768M -Xss128K -XX:PermSize=256M -XX:MaxPermSize=512M -XX:NewRatio=2 -XX:MinHeapFreeRatio=20 -XX:+AggressiveHeap -XX:+DisableExplicitGC -XX:ParallelGCThreads=2 -XX:+UseParallelOldGC -XX:+MaxFDLimit -Dsun.rmi.dgc.client.gcInterval=990000 -Dsun.rmi.dgc.server.gcInterval=990000 -Djava.net.preferIPv4Stack=true -Xverify:none
+
+REM Update 06/2008
+REM -Xmx768m -Xms256 -Xmn512m -Xss128k -XX:+AggressiveOpts -XX:+AggressiveHeap -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true -Dsun.rmi.dgc.client.gcInterval=990000 -Dsun.rmi.dgc.server.gcInterval=990000
+
+REM Update 03/2013
+set JVM_OPTS=-Xmx1024m -Xms512m -Xss256k -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=512M -XX:+AggressiveOpts -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:+UseStringCache -XX:+UseParNewGC -XX:SurvivorRatio=16 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true
+
+echo Running High Performance Red5
+"%RED5_HOME%\red5.bat" >> "%RED5_HOME%\log\jvm.stdout"
+
+ENDLOCAL
\ No newline at end of file
Added: openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh?rev=1527292&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh (added)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.sh Sun Sep 29 09:38:51 2013
@@ -0,0 +1,22 @@
+#!/bin/bash
+# #############################################
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# #############################################
+
+if [ -z "$RED5_HOME" ]; then export RED5_HOME=.; fi
+
+export JVM_OPTS="-Xmx1024m -Xms512m -Xss256k -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=512M -XX:+AggressiveOpts -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:+UseStringCache -XX:+UseParNewGC -XX:SurvivorRatio=16 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true"
+
+# start Red5
+echo "Setting Hi Performance Options"
+exec $RED5_HOME/red5.sh >> $RED5_HOME/log/jvm.stdout 2>&1 &
Added: openmeetings/trunk/singlewebapp/WebContent/red5/red5.bat
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/red5.bat?rev=1527292&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/red5.bat (added)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/red5.bat Sun Sep 29 09:38:51 2013
@@ -0,0 +1,53 @@
+REM #############################################
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM #############################################
+@echo off
+
+SETLOCAL
+
+if NOT DEFINED RED5_HOME set RED5_HOME=%~dp0
+
+if NOT DEFINED RED5_MAINCLASS set RED5_MAINCLASS=org.red5.server.Bootstrap
+
+if NOT DEFINED JAVA_HOME goto err
+
+REM JAVA options
+REM You can set JVM additional options here if you want
+if NOT DEFINED JVM_OPTS set JVM_OPTS=-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=512M -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:+UseStringCache -XX:+UseParNewGC -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true
+REM Set up logging options
+set LOGGING_OPTS=-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true
+REM Set up security options
+REM set SECURITY_OPTS=-Djava.security.debug=failure -Djava.security.manager -Djava.security.policy="%RED5_HOME%/conf/red5.policy"
+set SECURITY_OPTS=-Djava.security.debug=failure
+REM Setup python/jython path
+set JYTHON_OPTS=-Dpython.home=lib
+REM Combined java options
+set JAVA_OPTS=%LOGGING_OPTS% %SECURITY_OPTS% %JAVA_OPTS% %JVM_OPTS% %JYTHON_OPTS%
+
+set RED5_CLASSPATH=%RED5_HOME%\red5-server-bootstrap.jar;%RED5_HOME%\conf;%CLASSPATH%
+
+if NOT DEFINED RED5_OPTS set RED5_OPTS=
+
+goto launchRed5
+
+:launchRed5
+echo Starting Red5
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp "%RED5_CLASSPATH%" %RED5_MAINCLASS% %RED5_OPTS%
+goto finally
+
+:err
+echo JAVA_HOME environment variable not set! Take a look at the readme.
+pause
+
+:finally
+ENDLOCAL
Added: openmeetings/trunk/singlewebapp/WebContent/red5/red5.sh
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/red5/red5.sh?rev=1527292&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/red5/red5.sh (added)
+++ openmeetings/trunk/singlewebapp/WebContent/red5/red5.sh Sun Sep 29 09:38:51 2013
@@ -0,0 +1,77 @@
+#!/bin/bash
+# #############################################
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# #############################################
+
+if [ -z "$RED5_HOME" ]; then
+ export RED5_HOME=`pwd`;
+fi
+
+P=":" # The default classpath separator
+OS=`uname`
+case "$OS" in
+ CYGWIN*|MINGW*) # Windows Cygwin or Windows MinGW
+ P=";" # Since these are actually Windows, let Java know
+ ;;
+ Darwin*)
+
+ ;;
+ SunOS*)
+ if [ -z "$JAVA_HOME" ]; then
+ export JAVA_HOME=/opt/local/java/sun6;
+ fi
+ ;;
+ *)
+ # Do nothing
+ ;;
+esac
+
+echo "Running on " $OS
+
+# JAVA options
+# You can set JVM additional options here if you want
+if [ -z "$JVM_OPTS" ]; then
+ JVM_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=512M -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:+UseStringCache -XX:+UseParNewGC -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true"
+fi
+# Set up logging options
+LOGGING_OPTS="-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true"
+# Set up security options
+SECURITY_OPTS="-Djava.security.debug=failure"
+# Jython options
+JYTHON="-Dpython.home=lib"
+
+export JAVA_OPTS="$LOGGING_OPTS $SECURITY_OPTS $JAVA_OPTS $JVM_OPTS $JYTHON"
+
+if [ -z "$RED5_MAINCLASS" ]; then
+ export RED5_MAINCLASS=org.red5.server.Bootstrap
+fi
+
+for JAVA in "${JAVA_HOME}/bin/java" "${JAVA_HOME}/Home/bin/java" "/usr/bin/java" "/usr/local/bin/java"
+do
+ if [ -x "$JAVA" ]
+ then
+ break
+ fi
+done
+
+if [ ! -x "$JAVA" ]
+then
+ echo "Unable to locate Java. Please set JAVA_HOME environment variable."
+ exit
+fi
+
+export RED5_CLASSPATH="${RED5_HOME}/red5-server-bootstrap.jar${P}${RED5_HOME}/conf${P}${CLASSPATH}"
+
+# start Red5
+echo "Starting Red5"
+exec "$JAVA" -Dred5.root="${RED5_HOME}" $JAVA_OPTS -cp "${RED5_CLASSPATH}" "$RED5_MAINCLASS" $RED5_OPTS
Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1527292&r1=1527291&r2=1527292&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Sun Sep 29 09:38:51 2013
@@ -754,7 +754,8 @@
<!--this does only make sense if the unix executable is run obviously, however we do it for all -->
<chmod dir="${dist.dir}/testred5" perm="755" includes="**/*.sh" />
<exec dir="${dist.dir}/testred5" executable="/bin/bash" osfamily="unix" output="${dist.dir}/testred5/red5_system.log">
- <arg value="red5-highperf.sh"/>
+ <env key="JVM_OPTS" value="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=512M -Xmx1024m -Xms512m -Xss256k -XX:+AggressiveOpts -XX:+DisableExplicitGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:+UseStringCache -XX:+UseParNewGC -XX:SurvivorRatio=16 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=31 -Djava.net.preferIPv4Stack=true -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true"/>
+ <arg value="red5.sh"/>
</exec>
<!-- start up does take some time -->
<sleep seconds="30" />
@@ -1060,7 +1061,7 @@
<copy file="${webcontent.base.dir}/red5/index.html" todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
<copy file="${webcontent.base.dir}/red5/jee-container.xml" todir="${red5.lib}/conf" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
- <fileset dir="${webcontent.base.dir}/red5" includes="admin.*,network_test.sh" />
+ <fileset dir="${webcontent.base.dir}/red5" includes="red5*,admin.*,network_test.sh" />
</copy>
<!-- FIXME need to be removed as soon as JAudioTagger (will be officially Dual Licensed) -->
<xslt in="${red5.lib}/conf/red5-common.xml" out="${red5.lib}/conf/red5-common1.xml" style="build-jaudiotagger.xsl" />