23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 AC_DEFUN([BPERF_CHECK_CORES], |
26 AC_DEFUN([BPERF_CHECK_CORES], |
27 [ |
27 [ |
28 AC_MSG_CHECKING([for number of cores]) |
28 AC_MSG_CHECKING([for number of cores]) |
29 NUM_CORES=1 |
29 NUM_CORES=1 |
30 FOUND_CORES=no |
30 FOUND_CORES=no |
31 |
31 |
32 if test -f /proc/cpuinfo; then |
32 if test -f /proc/cpuinfo; then |
33 # Looks like a Linux (or cygwin) system |
33 # Looks like a Linux (or cygwin) system |
34 NUM_CORES=`cat /proc/cpuinfo | grep -c processor` |
34 NUM_CORES=`cat /proc/cpuinfo | grep -c processor` |
35 FOUND_CORES=yes |
35 FOUND_CORES=yes |
36 elif test -x /usr/sbin/psrinfo; then |
36 elif test -x /usr/sbin/psrinfo; then |
37 # Looks like a Solaris system |
37 # Looks like a Solaris system |
38 NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` |
38 NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` |
39 FOUND_CORES=yes |
39 FOUND_CORES=yes |
40 elif test -x /usr/sbin/system_profiler; then |
40 elif test -x /usr/sbin/system_profiler; then |
41 # Looks like a MacOSX system |
41 # Looks like a MacOSX system |
42 NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` |
42 NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` |
43 FOUND_CORES=yes |
43 FOUND_CORES=yes |
44 elif test "x$OPENJDK_BUILD_OS" = xaix ; then |
44 elif test "x$OPENJDK_BUILD_OS" = xaix ; then |
45 NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` |
45 NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` |
46 FOUND_CORES=yes |
46 FOUND_CORES=yes |
47 elif test -n "$NUMBER_OF_PROCESSORS"; then |
47 elif test -n "$NUMBER_OF_PROCESSORS"; then |
48 # On windows, look in the env |
48 # On windows, look in the env |
49 NUM_CORES=$NUMBER_OF_PROCESSORS |
49 NUM_CORES=$NUMBER_OF_PROCESSORS |
50 FOUND_CORES=yes |
50 FOUND_CORES=yes |
51 fi |
51 fi |
52 |
52 |
53 if test "x$FOUND_CORES" = xyes; then |
53 if test "x$FOUND_CORES" = xyes; then |
54 AC_MSG_RESULT([$NUM_CORES]) |
54 AC_MSG_RESULT([$NUM_CORES]) |
55 else |
55 else |
56 AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) |
56 AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) |
57 AC_MSG_WARN([This will disable all parallelism from build!]) |
57 AC_MSG_WARN([This will disable all parallelism from build!]) |
58 fi |
58 fi |
59 |
|
60 ]) |
59 ]) |
61 |
60 |
62 AC_DEFUN([BPERF_CHECK_MEMORY_SIZE], |
61 AC_DEFUN([BPERF_CHECK_MEMORY_SIZE], |
63 [ |
62 [ |
64 AC_MSG_CHECKING([for memory size]) |
63 AC_MSG_CHECKING([for memory size]) |
65 # Default to 1024 MB |
64 # Default to 1024 MB |
66 MEMORY_SIZE=1024 |
65 MEMORY_SIZE=1024 |
67 FOUND_MEM=no |
66 FOUND_MEM=no |
68 |
67 |
69 if test -f /proc/meminfo; then |
68 if test -f /proc/meminfo; then |
70 # Looks like a Linux (or cygwin) system |
69 # Looks like a Linux (or cygwin) system |
71 MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` |
70 MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` |
72 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` |
71 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` |
73 FOUND_MEM=yes |
72 FOUND_MEM=yes |
74 elif test -x /usr/sbin/prtconf; then |
73 elif test -x /usr/sbin/prtconf; then |
75 # Looks like a Solaris or AIX system |
74 # Looks like a Solaris or AIX system |
76 MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'` |
75 MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'` |
77 FOUND_MEM=yes |
76 FOUND_MEM=yes |
78 elif test -x /usr/sbin/system_profiler; then |
77 elif test -x /usr/sbin/system_profiler; then |
79 # Looks like a MacOSX system |
78 # Looks like a MacOSX system |
80 MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'` |
79 MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'` |
81 MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` |
80 MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` |
82 FOUND_MEM=yes |
81 FOUND_MEM=yes |
83 elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
82 elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
84 # Windows, but without cygwin |
83 # Windows, but without cygwin |
85 MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
84 MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
86 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` |
85 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` |
87 FOUND_MEM=yes |
86 FOUND_MEM=yes |
88 fi |
87 fi |
89 |
88 |
90 if test "x$FOUND_MEM" = xyes; then |
89 if test "x$FOUND_MEM" = xyes; then |
91 AC_MSG_RESULT([$MEMORY_SIZE MB]) |
90 AC_MSG_RESULT([$MEMORY_SIZE MB]) |
92 else |
91 else |
93 AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) |
92 AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) |
94 AC_MSG_WARN([This might seriously impact build performance!]) |
93 AC_MSG_WARN([This might seriously impact build performance!]) |
95 fi |
94 fi |
96 ]) |
95 ]) |
97 |
96 |
98 AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES], |
97 AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES], |
99 [ |
98 [ |
100 # How many cores do we have on this build system? |
99 # How many cores do we have on this build system? |
101 AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores], |
100 AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores], |
102 [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) |
101 [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) |
103 if test "x$with_num_cores" = x; then |
102 if test "x$with_num_cores" = x; then |
104 # The number of cores were not specified, try to probe them. |
103 # The number of cores were not specified, try to probe them. |
105 BPERF_CHECK_CORES |
104 BPERF_CHECK_CORES |
106 else |
105 else |
107 NUM_CORES=$with_num_cores |
106 NUM_CORES=$with_num_cores |
158 AC_SUBST(JOBS) |
157 AC_SUBST(JOBS) |
159 ]) |
158 ]) |
160 |
159 |
161 AC_DEFUN([BPERF_SETUP_CCACHE], |
160 AC_DEFUN([BPERF_SETUP_CCACHE], |
162 [ |
161 [ |
163 AC_ARG_ENABLE([ccache], |
162 AC_ARG_ENABLE([ccache], |
164 [AS_HELP_STRING([--disable-ccache], |
163 [AS_HELP_STRING([--disable-ccache], |
165 [disable using ccache to speed up recompilations @<:@enabled@:>@])], |
164 [disable using ccache to speed up recompilations @<:@enabled@:>@])], |
166 [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes]) |
165 [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes]) |
167 if test "x$ENABLE_CCACHE" = xyes; then |
166 if test "x$ENABLE_CCACHE" = xyes; then |
168 OLD_PATH="$PATH" |
167 OLD_PATH="$PATH" |
169 if test "x$TOOLS_DIR" != x; then |
168 if test "x$TOOLS_DIR" != x; then |
170 PATH=$TOOLS_DIR:$PATH |
169 PATH=$TOOLS_DIR:$PATH |
171 fi |
170 fi |
172 AC_PATH_PROG(CCACHE, ccache) |
171 AC_PATH_PROG(CCACHE, ccache) |
173 PATH="$OLD_PATH" |
172 PATH="$OLD_PATH" |
|
173 else |
|
174 AC_MSG_CHECKING([for ccache]) |
|
175 AC_MSG_RESULT([explicitly disabled]) |
|
176 CCACHE= |
|
177 fi |
|
178 AC_SUBST(CCACHE) |
|
179 |
|
180 AC_ARG_WITH([ccache-dir], |
|
181 [AS_HELP_STRING([--with-ccache-dir], |
|
182 [where to store ccache files @<:@~/.ccache@:>@])]) |
|
183 |
|
184 if test "x$with_ccache_dir" != x; then |
|
185 # When using a non home ccache directory, assume the use is to share ccache files |
|
186 # with other users. Thus change the umask. |
|
187 SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" |
|
188 fi |
|
189 CCACHE_FOUND="" |
|
190 if test "x$CCACHE" != x; then |
|
191 BPERF_SETUP_CCACHE_USAGE |
|
192 fi |
|
193 ]) |
|
194 |
|
195 AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], |
|
196 [ |
|
197 if test "x$CCACHE" != x; then |
|
198 CCACHE_FOUND="true" |
|
199 # Only use ccache if it is 3.1.4 or later, which supports |
|
200 # precompiled headers. |
|
201 AC_MSG_CHECKING([if ccache supports precompiled headers]) |
|
202 HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` |
|
203 if test "x$HAS_GOOD_CCACHE" = x; then |
|
204 AC_MSG_RESULT([no, disabling ccache]) |
|
205 CCACHE= |
174 else |
206 else |
175 AC_MSG_CHECKING([for ccache]) |
207 AC_MSG_RESULT([yes]) |
176 AC_MSG_RESULT([explicitly disabled]) |
208 AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) |
|
209 PUSHED_FLAGS="$CXXFLAGS" |
|
210 CXXFLAGS="-fpch-preprocess $CXXFLAGS" |
|
211 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) |
|
212 CXXFLAGS="$PUSHED_FLAGS" |
|
213 if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then |
|
214 AC_MSG_RESULT([yes]) |
|
215 else |
|
216 AC_MSG_RESULT([no, disabling ccaching of precompiled headers]) |
177 CCACHE= |
217 CCACHE= |
178 fi |
218 fi |
179 AC_SUBST(CCACHE) |
219 fi |
180 |
220 fi |
181 AC_ARG_WITH([ccache-dir], |
221 |
182 [AS_HELP_STRING([--with-ccache-dir], |
222 if test "x$CCACHE" != x; then |
183 [where to store ccache files @<:@~/.ccache@:>@])]) |
223 CCACHE_SLOPPINESS=time_macros |
184 |
224 CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE" |
185 if test "x$with_ccache_dir" != x; then |
225 CCACHE_FLAGS=-fpch-preprocess |
186 # When using a non home ccache directory, assume the use is to share ccache files |
226 |
187 # with other users. Thus change the umask. |
227 if test "x$SET_CCACHE_DIR" != x; then |
188 SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" |
228 mkdir -p $CCACHE_DIR > /dev/null 2>&1 |
189 fi |
229 chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 |
190 CCACHE_FOUND="" |
230 fi |
191 if test "x$CCACHE" != x; then |
231 fi |
192 BPERF_SETUP_CCACHE_USAGE |
|
193 fi |
|
194 ]) |
|
195 |
|
196 AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], |
|
197 [ |
|
198 if test "x$CCACHE" != x; then |
|
199 CCACHE_FOUND="true" |
|
200 # Only use ccache if it is 3.1.4 or later, which supports |
|
201 # precompiled headers. |
|
202 AC_MSG_CHECKING([if ccache supports precompiled headers]) |
|
203 HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` |
|
204 if test "x$HAS_GOOD_CCACHE" = x; then |
|
205 AC_MSG_RESULT([no, disabling ccache]) |
|
206 CCACHE= |
|
207 else |
|
208 AC_MSG_RESULT([yes]) |
|
209 AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) |
|
210 PUSHED_FLAGS="$CXXFLAGS" |
|
211 CXXFLAGS="-fpch-preprocess $CXXFLAGS" |
|
212 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) |
|
213 CXXFLAGS="$PUSHED_FLAGS" |
|
214 if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then |
|
215 AC_MSG_RESULT([yes]) |
|
216 else |
|
217 AC_MSG_RESULT([no, disabling ccaching of precompiled headers]) |
|
218 CCACHE= |
|
219 fi |
|
220 fi |
|
221 fi |
|
222 |
|
223 if test "x$CCACHE" != x; then |
|
224 CCACHE_SLOPPINESS=time_macros |
|
225 CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE" |
|
226 CCACHE_FLAGS=-fpch-preprocess |
|
227 |
|
228 if test "x$SET_CCACHE_DIR" != x; then |
|
229 mkdir -p $CCACHE_DIR > /dev/null 2>&1 |
|
230 chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 |
|
231 fi |
|
232 fi |
|
233 ]) |
232 ]) |
234 |
233 |
235 AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS], |
234 AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS], |
236 [ |
235 [ |
237 |
236 |
238 ############################################################################### |
237 ############################################################################### |
239 # |
238 # |
240 # Can the C/C++ compiler use precompiled headers? |
239 # Can the C/C++ compiler use precompiled headers? |
241 # |
240 # |
242 AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], |
241 AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], |
243 [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], |
242 [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], |
244 [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) |
243 [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) |
245 |
244 |
246 USE_PRECOMPILED_HEADER=1 |
245 USE_PRECOMPILED_HEADER=1 |
247 if test "x$ENABLE_PRECOMPH" = xno; then |
246 if test "x$ENABLE_PRECOMPH" = xno; then |
248 USE_PRECOMPILED_HEADER=0 |
247 USE_PRECOMPILED_HEADER=0 |
249 fi |
248 fi |
250 |
249 |
251 if test "x$ENABLE_PRECOMPH" = xyes; then |
250 if test "x$ENABLE_PRECOMPH" = xyes; then |
252 # Check that the compiler actually supports precomp headers. |
251 # Check that the compiler actually supports precomp headers. |
253 if test "x$GCC" = xyes; then |
252 if test "x$GCC" = xyes; then |
254 AC_MSG_CHECKING([that precompiled headers work]) |
253 AC_MSG_CHECKING([that precompiled headers work]) |
255 echo "int alfa();" > conftest.h |
254 echo "int alfa();" > conftest.h |
256 $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD |
255 $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD |
257 if test ! -f conftest.hpp.gch; then |
256 if test ! -f conftest.hpp.gch; then |
258 USE_PRECOMPILED_HEADER=0 |
257 USE_PRECOMPILED_HEADER=0 |
259 AC_MSG_RESULT([no]) |
258 AC_MSG_RESULT([no]) |
260 else |
259 else |
261 AC_MSG_RESULT([yes]) |
260 AC_MSG_RESULT([yes]) |
262 fi |
261 fi |
263 rm -f conftest.h conftest.hpp.gch |
262 rm -f conftest.h conftest.hpp.gch |
264 fi |
263 fi |
265 fi |
264 fi |
266 |
265 |
267 AC_SUBST(USE_PRECOMPILED_HEADER) |
266 AC_SUBST(USE_PRECOMPILED_HEADER) |
268 ]) |
267 ]) |
269 |
268 |
270 |
269 |
271 AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC], |
270 AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC], |
272 [ |
271 [ |
273 AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], |
272 AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], |
274 [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) |
273 [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) |
275 |
274 |
276 if test "x$with_sjavac_server_java" != x; then |
275 if test "x$with_sjavac_server_java" != x; then |
277 SJAVAC_SERVER_JAVA="$with_sjavac_server_java" |
276 SJAVAC_SERVER_JAVA="$with_sjavac_server_java" |
278 FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""` |
277 FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""` |
279 if test "x$FOUND_VERSION" = x; then |
278 if test "x$FOUND_VERSION" = x; then |
280 AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) |
279 AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) |
281 fi |
280 fi |
282 else |
281 else |
283 SJAVAC_SERVER_JAVA="" |
282 SJAVAC_SERVER_JAVA="" |
284 # Hotspot specific options. |
283 # Hotspot specific options. |
285 ADD_JVM_ARG_IF_OK([-verbosegc],SJAVAC_SERVER_JAVA,[$JAVA]) |
284 ADD_JVM_ARG_IF_OK([-verbosegc],SJAVAC_SERVER_JAVA,[$JAVA]) |
286 # JRockit specific options. |
285 # JRockit specific options. |
287 ADD_JVM_ARG_IF_OK([-Xverbose:gc],SJAVAC_SERVER_JAVA,[$JAVA]) |
286 ADD_JVM_ARG_IF_OK([-Xverbose:gc],SJAVAC_SERVER_JAVA,[$JAVA]) |
288 SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA" |
287 SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA" |
289 fi |
288 fi |
290 AC_SUBST(SJAVAC_SERVER_JAVA) |
289 AC_SUBST(SJAVAC_SERVER_JAVA) |
291 |
290 |
292 if test "$MEMORY_SIZE" -gt "2500"; then |
291 if test "$MEMORY_SIZE" -gt "2500"; then |
293 ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
292 ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
294 if test "$JVM_ARG_OK" = true; then |
293 if test "$JVM_ARG_OK" = true; then |
295 JVM_64BIT=true |
294 JVM_64BIT=true |
296 JVM_ARG_OK=false |
295 JVM_ARG_OK=false |
297 fi |
296 fi |
298 fi |
297 fi |
299 |
298 |
300 if test "$JVM_64BIT" = true; then |
299 if test "$JVM_64BIT" = true; then |
301 if test "$MEMORY_SIZE" -gt "17000"; then |
300 if test "$MEMORY_SIZE" -gt "17000"; then |
302 ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
301 ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
303 fi |
302 fi |
304 if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then |
303 if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then |
305 ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
304 ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
306 fi |
305 fi |
307 if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then |
306 if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then |
308 ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
307 ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
309 fi |
308 fi |
310 if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then |
309 if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then |
311 ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
310 ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
312 fi |
311 fi |
313 fi |
312 fi |
314 if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then |
313 if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then |
315 ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
314 ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
316 fi |
315 fi |
317 if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then |
316 if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then |
318 ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
317 ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
319 fi |
318 fi |
320 if test "$JVM_ARG_OK" = false; then |
319 if test "$JVM_ARG_OK" = false; then |
321 ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
320 ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
322 fi |
321 fi |
323 |
322 |
324 AC_MSG_CHECKING([whether to use sjavac]) |
323 AC_MSG_CHECKING([whether to use sjavac]) |
325 AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], |
324 AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], |
326 [use sjavac to do fast incremental compiles @<:@disabled@:>@])], |
325 [use sjavac to do fast incremental compiles @<:@disabled@:>@])], |
327 [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) |
326 [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) |
328 AC_MSG_RESULT([$ENABLE_SJAVAC]) |
327 AC_MSG_RESULT([$ENABLE_SJAVAC]) |
329 AC_SUBST(ENABLE_SJAVAC) |
328 AC_SUBST(ENABLE_SJAVAC) |
330 |
329 |
331 if test "x$ENABLE_SJAVAC" = xyes; then |
330 if test "x$ENABLE_SJAVAC" = xyes; then |
332 SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers" |
331 SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers" |
333 else |
332 else |
334 SJAVAC_SERVER_DIR= |
333 SJAVAC_SERVER_DIR= |
335 fi |
334 fi |
336 AC_SUBST(SJAVAC_SERVER_DIR) |
335 AC_SUBST(SJAVAC_SERVER_DIR) |
337 |
336 ]) |
338 ]) |
|