Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 4006:436b4a3231bf
7098194: integrate macosx-port changes
Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29.
Reviewed-by: kvn, dholmes, never, phh
Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author | dcubed |
---|---|
date | Thu, 13 Oct 2011 09:35:42 -0700 |
parents | f08d439fab8c |
children | 5bda8dae4e14 |
comparison
equal
deleted
inserted
replaced
4005:2ef3386478e6 | 4006:436b4a3231bf |
---|---|
2600 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true); | 2600 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true); |
2601 } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) { | 2601 } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) { |
2602 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); | 2602 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); |
2603 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true); | 2603 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true); |
2604 } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) { | 2604 } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) { |
2605 #ifdef SOLARIS | 2605 #if defined(DTRACE_ENABLED) |
2606 FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true); | 2606 FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true); |
2607 FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true); | 2607 FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true); |
2608 FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true); | 2608 FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true); |
2609 FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true); | 2609 FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true); |
2610 #else // ndef SOLARIS | 2610 #else // defined(DTRACE_ENABLED) |
2611 jio_fprintf(defaultStream::error_stream(), | 2611 jio_fprintf(defaultStream::error_stream(), |
2612 "ExtendedDTraceProbes flag is only applicable on Solaris\n"); | 2612 "ExtendedDTraceProbes flag is not applicable for this configuration\n"); |
2613 return JNI_EINVAL; | 2613 return JNI_EINVAL; |
2614 #endif // ndef SOLARIS | 2614 #endif // defined(DTRACE_ENABLED) |
2615 #ifdef ASSERT | 2615 #ifdef ASSERT |
2616 } else if (match_option(option, "-XX:+FullGCALot", &tail)) { | 2616 } else if (match_option(option, "-XX:+FullGCALot", &tail)) { |
2617 FLAG_SET_CMDLINE(bool, FullGCALot, true); | 2617 FLAG_SET_CMDLINE(bool, FullGCALot, true); |
2618 // disable scavenge before parallel mark-compact | 2618 // disable scavenge before parallel mark-compact |
2619 FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false); | 2619 FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false); |