azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI: drop "-pp" flag for preloader profiling

Browse Source 
It was never documented and was never supposed to be used. In the rare case
when someone must profile preloader, he can temporarily change "notime" to
"time" in the kotlinc-jvm bash/batch script
This commit is contained in:
Alexander Udalov
2014-08-10 20:30:03 +04:00
parent 5a792ca11f
commit d3f201dd45
4 changed files with 14 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/bin/kotlinc-js
+2 -7
View File
@@ -2,7 +2,7 @@
# #
############################################################################## ##############################################################################
# Copyright 2002-2011, LAMP/EPFL # Copyright 2002-2011, LAMP/EPFL
# Copyright 2011-2013, JetBrains # Copyright 2011-2014, JetBrains
# #
# This is free software; see the distribution for copying conditions. # This is free software; see the distribution for copying conditions.
# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -45,7 +45,6 @@ fi
# -D options will be available as system properties. # -D options will be available as system properties.
declare -a java_args declare -a java_args
declare -a kotlin_args declare -a kotlin_args
profile_preloader="notime"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
@@ -63,10 +62,6 @@ while [ $# -gt 0 ]; do
kotlin_args=("${kotlin_args[@]}" "$1") kotlin_args=("${kotlin_args[@]}" "$1")
shift shift
;; ;;
-pp)
profile_preloader="time"
shift
;;
*) *)
kotlin_args=("${kotlin_args[@]}" "$1") kotlin_args=("${kotlin_args[@]}" "$1")
shift shift
@@ -87,4 +82,4 @@ CPSELECT="-cp "
$JAVA_OPTS \ $JAVA_OPTS \
"${java_args[@]}" \ "${java_args[@]}" \
${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \ ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \
org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar:${KOTLIN_HOME}/lib/kotlin-runtime.jar" org.jetbrains.jet.cli.js.K2JSCompiler 4096 $profile_preloader "$@" org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar:${KOTLIN_HOME}/lib/kotlin-runtime.jar" org.jetbrains.jet.cli.js.K2JSCompiler 4096 notime "$@"
compiler/cli/bin/kotlinc-js.bat
+5 -18
View File
@@ -2,7 +2,7 @@
rem based on scalac.bat from the Scala distribution rem based on scalac.bat from the Scala distribution
rem ########################################################################## rem ##########################################################################
rem # Copyright 2002-2011, LAMP/EPFL rem # Copyright 2002-2011, LAMP/EPFL
rem # Copyright 2011-2013, JetBrains rem # Copyright 2011-2014, JetBrains
rem # rem #
rem # This is free software; see the distribution for copying conditions. rem # This is free software; see the distribution for copying conditions.
rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -22,26 +22,13 @@ if not "%JAVA_HOME%"=="" (
if "%_JAVACMD%"=="" set _JAVACMD=java if "%_JAVACMD%"=="" set _JAVACMD=java
set _PROFILE_PRELOADER=notime
rem re: E%1 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c45
if E%1==E-pp (
shift
set _PROFILE_PRELOADER=time
)
rem We use the value of the JAVA_OPTS environment variable if defined rem We use the value of the JAVA_OPTS environment variable if defined
set _JAVA_OPTS=-Xmx256M -Xms32M -noverify set _JAVA_OPTS=-Xmx256M -Xms32M -noverify
rem re: %1 %2 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c60 "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
if "%_PROFILE_PRELOADER%"=="time" ( org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar;%_KOTLIN_HOME%\lib\kotlin-runtime.jar" ^
"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ org.jetbrains.jet.cli.js.K2JSCompiler 4096 notime %*
org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar;%_KOTLIN_HOME%\lib\kotlin-runtime.jar" ^
org.jetbrains.jet.cli.js.K2JSCompiler 4096 %_PROFILE_PRELOADER% %1 %2 %3 %4 %5 %6 %7 %8 %9
) else (
"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar;%_KOTLIN_HOME%\lib\kotlin-runtime.jar" ^
org.jetbrains.jet.cli.js.K2JSCompiler 4096 %_PROFILE_PRELOADER% %*
)
exit /b %ERRORLEVEL% exit /b %ERRORLEVEL%
goto end goto end
compiler/cli/bin/kotlinc-jvm
+2 -7
View File
@@ -2,7 +2,7 @@
# #
############################################################################## ##############################################################################
# Copyright 2002-2011, LAMP/EPFL # Copyright 2002-2011, LAMP/EPFL
# Copyright 2011-2013, JetBrains # Copyright 2011-2014, JetBrains
# #
# This is free software; see the distribution for copying conditions. # This is free software; see the distribution for copying conditions.
# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -45,7 +45,6 @@ fi
# -D options will be available as system properties. # -D options will be available as system properties.
declare -a java_args declare -a java_args
declare -a kotlin_args declare -a kotlin_args
profile_preloader="notime"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
@@ -63,10 +62,6 @@ while [ $# -gt 0 ]; do
kotlin_args=("${kotlin_args[@]}" "$1") kotlin_args=("${kotlin_args[@]}" "$1")
shift shift
;; ;;
-pp)
profile_preloader="time"
shift
;;
*) *)
kotlin_args=("${kotlin_args[@]}" "$1") kotlin_args=("${kotlin_args[@]}" "$1")
shift shift
@@ -87,4 +82,4 @@ CPSELECT="-cp "
$JAVA_OPTS \ $JAVA_OPTS \
"${java_args[@]}" \ "${java_args[@]}" \
${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \ ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \
org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar:${KOTLIN_HOME}/lib/kotlin-runtime.jar" org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 $profile_preloader "$@" org.jetbrains.jet.preloading.Preloader "${KOTLIN_HOME}/lib/kotlin-compiler.jar:${KOTLIN_HOME}/lib/kotlin-runtime.jar" org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 notime "$@"
compiler/cli/bin/kotlinc-jvm.bat
+5 -18
View File
@@ -2,7 +2,7 @@
rem based on scalac.bat from the Scala distribution rem based on scalac.bat from the Scala distribution
rem ########################################################################## rem ##########################################################################
rem # Copyright 2002-2011, LAMP/EPFL rem # Copyright 2002-2011, LAMP/EPFL
rem # Copyright 2011-2013, JetBrains rem # Copyright 2011-2014, JetBrains
rem # rem #
rem # This is free software; see the distribution for copying conditions. rem # This is free software; see the distribution for copying conditions.
rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -22,26 +22,13 @@ if not "%JAVA_HOME%"=="" (
if "%_JAVACMD%"=="" set _JAVACMD=java if "%_JAVACMD%"=="" set _JAVACMD=java
set _PROFILE_PRELOADER=notime
rem re: E%1 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c45
if E%1==E-pp (
shift
set _PROFILE_PRELOADER=time
)
rem We use the value of the JAVA_OPTS environment variable if defined rem We use the value of the JAVA_OPTS environment variable if defined
set _JAVA_OPTS=-Xmx256M -Xms32M -noverify set _JAVA_OPTS=-Xmx256M -Xms32M -noverify
rem re: %1 %2 &c., see http://www.riedquat.de/blog/2011-11-27-01#w9aab1c60 "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
if "%_PROFILE_PRELOADER%"=="time" ( org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar;%_KOTLIN_HOME%\lib\kotlin-runtime.jar" ^
"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 notime %*
org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar;%_KOTLIN_HOME%\lib\kotlin-runtime.jar" ^
org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 %_PROFILE_PRELOADER% %1 %2 %3 %4 %5 %6 %7 %8 %9
) else (
"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
org.jetbrains.jet.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar;%_KOTLIN_HOME%\lib\kotlin-runtime.jar" ^
org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 %_PROFILE_PRELOADER% %*
)
exit /b %ERRORLEVEL% exit /b %ERRORLEVEL%
goto end goto end