Mercurial > hg > truffle
changeset 4657:d4e039a3e083
Print java.exe when execuing "mx vm"
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Tue, 21 Feb 2012 13:03:38 +0100 |
| parents | c1160de36474 |
| children | f6eee9c543fc |
| files | mx/commands.py src/share/vm/runtime/arguments.hpp |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Mon Feb 20 18:01:22 2012 +0100 +++ b/mx/commands.py Tue Feb 21 13:03:38 2012 +0100 @@ -476,6 +476,7 @@ if mx.java().debug: args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args exe = join(_jdk(build), 'bin', mx.exe_suffix('java')) + print('Executing VM ' + exe) return mx.run([exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
--- a/src/share/vm/runtime/arguments.hpp Mon Feb 20 18:01:22 2012 +0100 +++ b/src/share/vm/runtime/arguments.hpp Tue Feb 21 13:03:38 2012 +0100 @@ -228,9 +228,11 @@ // an array containing all jvm arguments specified in the command line static char** _jvm_args_array; static int _num_jvm_args; +#ifdef GRAAL // an array containing all graal arguments specified in the command line static char** _graal_args_array; static int _num_graal_args; +#endif // string containing all java command (class/jarfile name and app args) static char* _java_command; @@ -432,9 +434,9 @@ static char** jvm_args_array() { return _jvm_args_array; } #ifdef GRAAL static char** graal_args_array() { return _graal_args_array; } + static int num_graal_args() { return _num_graal_args; } #endif static int num_jvm_flags() { return _num_jvm_flags; } - static int num_graal_args() { return _num_graal_args; } static int num_jvm_args() { return _num_jvm_args; } // return the arguments passed to the Java application static const char* java_command() { return _java_command; }