From 963c3852a3ab416096c1a297db858911d7556ee0 Mon Sep 17 00:00:00 2001 From: Anthony Scarpino Date: Fri, 10 Jul 2015 11:31:49 -0700 Subject: [PATCH 01/56] 8130341: GHASH 32bit intrinsics has AEADBadTagException Reviewed-by: kvn, mcberg --- .../src/cpu/x86/vm/stubGenerator_x86_32.cpp | 2 + .../compiler/codegen/7184394/TestAESBase.java | 52 ++++++++++++------- .../codegen/7184394/TestAESDecode.java | 6 ++- .../codegen/7184394/TestAESEncode.java | 2 +- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp index e4a70b4e3d1..9a128319586 100644 --- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp +++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp @@ -2780,6 +2780,7 @@ class StubGenerator: public StubCodeGenerator { const XMMRegister xmm_temp7 = xmm7; __ enter(); + handleSOERegisters(true); // Save registers __ movptr(state, state_param); __ movptr(subkeyH, subkeyH_param); @@ -2883,6 +2884,7 @@ class StubGenerator: public StubCodeGenerator { __ pshufb(xmm_temp6, ExternalAddress(StubRoutines::x86::ghash_long_swap_mask_addr())); __ movdqu(Address(state, 0), xmm_temp6); // store the result + handleSOERegisters(false); // restore registers __ leave(); __ ret(0); return start; diff --git a/hotspot/test/compiler/codegen/7184394/TestAESBase.java b/hotspot/test/compiler/codegen/7184394/TestAESBase.java index 602515bff19..04edf19636f 100644 --- a/hotspot/test/compiler/codegen/7184394/TestAESBase.java +++ b/hotspot/test/compiler/codegen/7184394/TestAESBase.java @@ -61,12 +61,12 @@ abstract public class TestAESBase { final Random random = Utils.getRandomInstance(); Cipher cipher; Cipher dCipher; - AlgorithmParameters algParams; + AlgorithmParameters algParams = null; SecretKey key; GCMParameterSpec gcm_spec; - byte[] aad; + byte[] aad = { 0x11, 0x22, 0x33, 0x44, 0x55 }; int tlen = 12; - byte[] iv; + byte[] iv = new byte[16]; static int numThreads = 0; int threadId; @@ -80,7 +80,10 @@ abstract public class TestAESBase { public void prepare() { try { - System.out.println("\nalgorithm=" + algorithm + ", mode=" + mode + ", paddingStr=" + paddingStr + ", msgSize=" + msgSize + ", keySize=" + keySize + ", noReinit=" + noReinit + ", checkOutput=" + checkOutput + ", encInputOffset=" + encInputOffset + ", encOutputOffset=" + encOutputOffset + ", decOutputOffset=" + decOutputOffset + ", lastChunkSize=" +lastChunkSize ); + System.out.println("\nalgorithm=" + algorithm + ", mode=" + mode + ", paddingStr=" + paddingStr + + ", msgSize=" + msgSize + ", keySize=" + keySize + ", noReinit=" + noReinit + + ", checkOutput=" + checkOutput + ", encInputOffset=" + encInputOffset + ", encOutputOffset=" + + encOutputOffset + ", decOutputOffset=" + decOutputOffset + ", lastChunkSize=" +lastChunkSize ); if (encInputOffset % ALIGN != 0 || encOutputOffset % ALIGN != 0 || decOutputOffset % ALIGN !=0 ) testingMisalignment = true; @@ -101,22 +104,24 @@ abstract public class TestAESBase { cipher = Cipher.getInstance(algorithm + "/" + mode + "/" + paddingStr, "SunJCE"); dCipher = Cipher.getInstance(algorithm + "/" + mode + "/" + paddingStr, "SunJCE"); + // CBC init if (mode.equals("CBC")) { - int ivLen = (algorithm.equals("AES") ? 16 : algorithm.equals("DES") ? 8 : 0); - IvParameterSpec initVector = new IvParameterSpec(new byte[ivLen]); + IvParameterSpec initVector = new IvParameterSpec(iv); cipher.init(Cipher.ENCRYPT_MODE, key, initVector); - } else if (mode.equals("GCM")) { - iv = new byte[64]; - random.nextBytes(iv); - aad = new byte[5]; - random.nextBytes(aad); - gcm_init(); - } else { algParams = cipher.getParameters(); + dCipher.init(Cipher.DECRYPT_MODE, key, initVector); + + // GCM init + } else if (mode.equals("GCM")) { + gcm_init(true); + gcm_init(false); + + // ECB init + } else { cipher.init(Cipher.ENCRYPT_MODE, key, algParams); + dCipher.init(Cipher.DECRYPT_MODE, key, algParams); } - algParams = cipher.getParameters(); - dCipher.init(Cipher.DECRYPT_MODE, key, algParams); + if (threadId == 0) { childShowCipher(); } @@ -198,11 +203,18 @@ abstract public class TestAESBase { abstract void childShowCipher(); - void gcm_init() throws Exception { - tlen = 12; + void gcm_init(boolean encrypt) throws Exception { gcm_spec = new GCMParameterSpec(tlen * 8, iv); - cipher = Cipher.getInstance(algorithm + "/" + mode + "/" + paddingStr, "SunJCE"); - cipher.init(Cipher.ENCRYPT_MODE, key, gcm_spec); - cipher.update(aad); + if (encrypt) { + // Get a new instance everytime because of reuse IV restrictions + cipher = Cipher.getInstance(algorithm + "/" + mode + "/" + paddingStr, "SunJCE"); + cipher.init(Cipher.ENCRYPT_MODE, key, gcm_spec); + cipher.updateAAD(aad); + } else { + dCipher.init(Cipher.DECRYPT_MODE, key, gcm_spec); + dCipher.updateAAD(aad); + + + } } } diff --git a/hotspot/test/compiler/codegen/7184394/TestAESDecode.java b/hotspot/test/compiler/codegen/7184394/TestAESDecode.java index 21f1f55595a..e90ef767e7e 100644 --- a/hotspot/test/compiler/codegen/7184394/TestAESDecode.java +++ b/hotspot/test/compiler/codegen/7184394/TestAESDecode.java @@ -32,7 +32,11 @@ public class TestAESDecode extends TestAESBase { @Override public void run() { try { - if (!noReinit) dCipher.init(Cipher.DECRYPT_MODE, key, algParams); + if (mode.equals("GCM")) { + gcm_init(false); + } else if (!noReinit) { + dCipher.init(Cipher.DECRYPT_MODE, key, algParams); + } decode = new byte[decodeLength]; if (testingMisalignment) { int tempSize = dCipher.update(encode, encOutputOffset, (decodeMsgSize - lastChunkSize), decode, decOutputOffset); diff --git a/hotspot/test/compiler/codegen/7184394/TestAESEncode.java b/hotspot/test/compiler/codegen/7184394/TestAESEncode.java index 163ebb8777d..cbfb81795c1 100644 --- a/hotspot/test/compiler/codegen/7184394/TestAESEncode.java +++ b/hotspot/test/compiler/codegen/7184394/TestAESEncode.java @@ -33,7 +33,7 @@ public class TestAESEncode extends TestAESBase { public void run() { try { if (mode.equals("GCM")) { - gcm_init(); + gcm_init(true); } else if (!noReinit) { cipher.init(Cipher.ENCRYPT_MODE, key, algParams); } From b5284a93ce14c6da4dbef1bd6708cbabdafd57ab Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Fri, 10 Jul 2015 11:59:09 -0700 Subject: [PATCH 02/56] 8129920: Vectorized loop unrolling Optimize loop opts for vectorizible loops. Reviewed-by: kvn, roland --- hotspot/src/share/vm/opto/loopTransform.cpp | 52 ++++++++++++++------- hotspot/src/share/vm/opto/loopUnswitch.cpp | 6 +++ hotspot/src/share/vm/opto/loopnode.cpp | 6 ++- hotspot/src/share/vm/opto/loopnode.hpp | 11 ++++- hotspot/src/share/vm/opto/superword.cpp | 33 +++++++++---- hotspot/src/share/vm/opto/superword.hpp | 2 +- 6 files changed, 83 insertions(+), 27 deletions(-) diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp index e87cc4a1ade..155216105e3 100644 --- a/hotspot/src/share/vm/opto/loopTransform.cpp +++ b/hotspot/src/share/vm/opto/loopTransform.cpp @@ -280,6 +280,10 @@ bool IdealLoopTree::policy_peeling( PhaseIdealLoop *phase ) const { || (body_size * body_size + phase->C->live_nodes()) > phase->C->max_node_limit() ) { return false; // too large to safely clone } + + // check for vectorized loops, any peeling done was already applied + if (_head->is_CountedLoop() && _head->as_CountedLoop()->do_unroll_only()) return false; + while( test != _head ) { // Scan till run off top of loop if( test->is_If() ) { // Test? Node *ctrl = phase->get_ctrl(test->in(1)); @@ -656,7 +660,12 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { _local_loop_unroll_limit = LoopUnrollLimit; _local_loop_unroll_factor = 4; int future_unroll_ct = cl->unrolled_count() * 2; - if (future_unroll_ct > LoopMaxUnroll) return false; + if (!cl->do_unroll_only()) { + if (future_unroll_ct > LoopMaxUnroll) return false; + } else { + // obey user constraints on vector mapped loops with additional unrolling applied + if ((future_unroll_ct / cl->slp_max_unroll()) > LoopMaxUnroll) return false; + } // Check for initial stride being a small enough constant if (abs(cl->stride_con()) > (1<<2)*future_unroll_ct) return false; @@ -759,13 +768,19 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { if (LoopMaxUnroll > _local_loop_unroll_factor) { // Once policy_slp_analysis succeeds, mark the loop with the // maximal unroll factor so that we minimize analysis passes - if ((future_unroll_ct > _local_loop_unroll_factor) || - (body_size > (uint)_local_loop_unroll_limit)) { + if (future_unroll_ct >= _local_loop_unroll_factor) { policy_unroll_slp_analysis(cl, phase, future_unroll_ct); } } } + int slp_max_unroll_factor = cl->slp_max_unroll(); + if (cl->has_passed_slp()) { + if (slp_max_unroll_factor >= future_unroll_ct) return true; + // Normal case: loop too big + return false; + } + // Check for being too big if (body_size > (uint)_local_loop_unroll_limit) { if (xors_in_loop >= 4 && body_size < (uint)LoopUnrollLimit*4) return true; @@ -773,6 +788,10 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { return false; } + if(cl->do_unroll_only()) { + NOT_PRODUCT(if (TraceSuperWordLoopUnrollAnalysis) tty->print_cr("policy_unroll passed vector loop(vlen=%d,factor = %d)\n", slp_max_unroll_factor, future_unroll_ct)); + } + // Unroll once! (Each trip will soon do double iterations) return true; } @@ -780,28 +799,24 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { void IdealLoopTree::policy_unroll_slp_analysis(CountedLoopNode *cl, PhaseIdealLoop *phase, int future_unroll_ct) { // Enable this functionality target by target as needed if (SuperWordLoopUnrollAnalysis) { - if (!cl->has_passed_slp()) { + if (!cl->was_slp_analyzed()) { SuperWord sw(phase); sw.transform_loop(this, false); // If the loop is slp canonical analyze it if (sw.early_return() == false) { - sw.unrolling_analysis(cl, _local_loop_unroll_factor); + sw.unrolling_analysis(_local_loop_unroll_factor); } } - int slp_max_unroll_factor = cl->slp_max_unroll(); - if ((slp_max_unroll_factor > 4) && - (slp_max_unroll_factor >= future_unroll_ct)) { - int new_limit = cl->node_count_before_unroll() * slp_max_unroll_factor; - if (new_limit > LoopUnrollLimit) { -#ifndef PRODUCT - if (TraceSuperWordLoopUnrollAnalysis) { - tty->print_cr("slp analysis is applying unroll limit %d, the original limit was %d\n", - new_limit, _local_loop_unroll_limit); + if (cl->has_passed_slp()) { + int slp_max_unroll_factor = cl->slp_max_unroll(); + if (slp_max_unroll_factor >= future_unroll_ct) { + int new_limit = cl->node_count_before_unroll() * slp_max_unroll_factor; + if (new_limit > LoopUnrollLimit) { + NOT_PRODUCT(if (TraceSuperWordLoopUnrollAnalysis) tty->print_cr("slp analysis unroll=%d, default limit=%d\n", new_limit, _local_loop_unroll_limit)); + _local_loop_unroll_limit = new_limit; } -#endif - _local_loop_unroll_limit = new_limit; } } } @@ -830,6 +845,9 @@ bool IdealLoopTree::policy_range_check( PhaseIdealLoop *phase ) const { if (cl->is_main_no_pre_loop()) return false; // Disallowed for now. Node *trip_counter = cl->phi(); + // check for vectorized loops, some opts are no longer needed + if (cl->do_unroll_only()) return false; + // Check loop body for tests of trip-counter plus loop-invariant vs // loop-invariant. for (uint i = 0; i < _body.size(); i++) { @@ -880,6 +898,8 @@ bool IdealLoopTree::policy_range_check( PhaseIdealLoop *phase ) const { // Return TRUE or FALSE if the loop should NEVER be RCE'd or aligned. Useful // for unrolling loops with NO array accesses. bool IdealLoopTree::policy_peel_only( PhaseIdealLoop *phase ) const { + // check for vectorized loops, any peeling done was already applied + if (_head->is_CountedLoop() && _head->as_CountedLoop()->do_unroll_only()) return false; for( uint i = 0; i < _body.size(); i++ ) if( _body[i]->is_Mem() ) diff --git a/hotspot/src/share/vm/opto/loopUnswitch.cpp b/hotspot/src/share/vm/opto/loopUnswitch.cpp index dab8fd387a8..a13b9fb5e1f 100644 --- a/hotspot/src/share/vm/opto/loopUnswitch.cpp +++ b/hotspot/src/share/vm/opto/loopUnswitch.cpp @@ -61,6 +61,12 @@ bool IdealLoopTree::policy_unswitching( PhaseIdealLoop *phase ) const { if (!_head->is_Loop()) { return false; } + + // check for vectorized loops, any unswitching was already applied + if (_head->is_CountedLoop() && _head->as_CountedLoop()->do_unroll_only()) { + return false; + } + int nodes_left = phase->C->max_node_limit() - phase->C->live_nodes(); if ((int)(2 * _body.size()) > nodes_left) { return false; // Too speculative if running low on nodes. diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp index 723fbc57be5..6d6024718e2 100644 --- a/hotspot/src/share/vm/opto/loopnode.cpp +++ b/hotspot/src/share/vm/opto/loopnode.cpp @@ -2317,7 +2317,11 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts) // Reassociate invariants and prep for split_thru_phi for (LoopTreeIterator iter(_ltree_root); !iter.done(); iter.next()) { IdealLoopTree* lpt = iter.current(); - if (!lpt->is_counted() || !lpt->is_inner()) continue; + bool is_counted = lpt->is_counted(); + if (!is_counted || !lpt->is_inner()) continue; + + // check for vectorized loops, any reassociation of invariants was already done + if (is_counted && lpt->_head->as_CountedLoop()->do_unroll_only()) continue; lpt->reassociate_invariants(this); diff --git a/hotspot/src/share/vm/opto/loopnode.hpp b/hotspot/src/share/vm/opto/loopnode.hpp index c0d70271a94..1ea1f86d768 100644 --- a/hotspot/src/share/vm/opto/loopnode.hpp +++ b/hotspot/src/share/vm/opto/loopnode.hpp @@ -64,7 +64,9 @@ protected: PartialPeelLoop=32, PartialPeelFailed=64, HasReductions=128, - PassedSlpAnalysis=256 }; + WasSlpAnalyzed=256, + PassedSlpAnalysis=512, + DoUnrollOnly=1024 }; char _unswitch_count; enum { _unswitch_max=3 }; @@ -80,7 +82,9 @@ public: int partial_peel_has_failed() const { return _loop_flags & PartialPeelFailed; } void mark_partial_peel_failed() { _loop_flags |= PartialPeelFailed; } void mark_has_reductions() { _loop_flags |= HasReductions; } + void mark_was_slp() { _loop_flags |= WasSlpAnalyzed; } void mark_passed_slp() { _loop_flags |= PassedSlpAnalysis; } + void mark_do_unroll_only() { _loop_flags |= DoUnrollOnly; } int unswitch_max() { return _unswitch_max; } int unswitch_count() { return _unswitch_count; } @@ -212,7 +216,9 @@ public: int is_main_loop () const { return (_loop_flags&PreMainPostFlagsMask) == Main; } int is_post_loop () const { return (_loop_flags&PreMainPostFlagsMask) == Post; } int is_reduction_loop() const { return (_loop_flags&HasReductions) == HasReductions; } + int was_slp_analyzed () const { return (_loop_flags&WasSlpAnalyzed) == WasSlpAnalyzed; } int has_passed_slp () const { return (_loop_flags&PassedSlpAnalysis) == PassedSlpAnalysis; } + int do_unroll_only () const { return (_loop_flags&DoUnrollOnly) == DoUnrollOnly; } int is_main_no_pre_loop() const { return _loop_flags & MainHasNoPreLoop; } void set_main_no_pre_loop() { _loop_flags |= MainHasNoPreLoop; } @@ -235,6 +241,9 @@ public: void set_nonexact_trip_count() { _loop_flags &= ~HasExactTripCount; } + void set_notpassed_slp() { + _loop_flags &= ~PassedSlpAnalysis; + } void set_profile_trip_cnt(float ptc) { _profile_trip_cnt = ptc; } float profile_trip_cnt() { return _profile_trip_cnt; } diff --git a/hotspot/src/share/vm/opto/superword.cpp b/hotspot/src/share/vm/opto/superword.cpp index d7f035f7f92..a5b5ffc2196 100644 --- a/hotspot/src/share/vm/opto/superword.cpp +++ b/hotspot/src/share/vm/opto/superword.cpp @@ -100,6 +100,10 @@ void SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) { return; } + // We only re-enter slp when we vector mapped a queried loop and we want to + // continue unrolling, in this case, slp is not subsequently done. + if (cl->do_unroll_only()) return; + // Check for pre-loop ending with CountedLoopEnd(Bool(Cmp(x,Opaque1(limit)))) CountedLoopEndNode* pre_end = get_pre_loop_end(cl); if (pre_end == NULL) return; @@ -121,12 +125,13 @@ void SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) { } //------------------------------early unrolling analysis------------------------------ -void SuperWord::unrolling_analysis(CountedLoopNode *cl, int &local_loop_unroll_factor) { +void SuperWord::unrolling_analysis(int &local_loop_unroll_factor) { bool is_slp = true; ResourceMark rm; size_t ignored_size = lpt()->_body.size(); int *ignored_loop_nodes = NEW_RESOURCE_ARRAY(int, ignored_size); Node_Stack nstack((int)ignored_size); + CountedLoopNode *cl = lpt()->_head->as_CountedLoop(); Node *cl_exit = cl->loopexit(); // First clear the entries @@ -249,13 +254,9 @@ void SuperWord::unrolling_analysis(CountedLoopNode *cl, int &local_loop_unroll_f // If a max vector exists which is not larger than _local_loop_unroll_factor // stop looking, we already have the max vector to map to. - if (cur_max_vector <= local_loop_unroll_factor) { + if (cur_max_vector < local_loop_unroll_factor) { is_slp = false; -#ifndef PRODUCT - if (TraceSuperWordLoopUnrollAnalysis) { - tty->print_cr("slp analysis fails: unroll limit equals max vector\n"); - } -#endif + NOT_PRODUCT(if (TraceSuperWordLoopUnrollAnalysis) tty->print_cr("slp analysis fails: unroll limit greater than max vector\n")); break; } @@ -268,8 +269,9 @@ void SuperWord::unrolling_analysis(CountedLoopNode *cl, int &local_loop_unroll_f } if (is_slp) { local_loop_unroll_factor = max_vector; + cl->mark_passed_slp(); } - cl->mark_passed_slp(); + cl->mark_was_slp(); cl->set_slp_max_unroll(local_loop_unroll_factor); } } @@ -1758,7 +1760,9 @@ void SuperWord::output() { } Compile* C = _phase->C; + CountedLoopNode *cl = lpt()->_head->as_CountedLoop(); uint max_vlen_in_bytes = 0; + uint max_vlen = 0; for (int i = 0; i < _block.length(); i++) { Node* n = _block.at(i); Node_List* p = my_pack(n); @@ -1841,6 +1845,7 @@ void SuperWord::output() { _igvn._worklist.push(vn); if (vlen_in_bytes > max_vlen_in_bytes) { + max_vlen = vlen; max_vlen_in_bytes = vlen_in_bytes; } #ifdef ASSERT @@ -1852,6 +1857,18 @@ void SuperWord::output() { } } C->set_max_vector_size(max_vlen_in_bytes); + if (SuperWordLoopUnrollAnalysis) { + if (cl->has_passed_slp()) { + uint slp_max_unroll_factor = cl->slp_max_unroll(); + if (slp_max_unroll_factor == max_vlen) { + NOT_PRODUCT(if (TraceSuperWordLoopUnrollAnalysis) tty->print_cr("vector loop(unroll=%d, len=%d)\n", max_vlen, max_vlen_in_bytes*BitsPerByte)); + // For atomic unrolled loops which are vector mapped, instigate more unrolling. + cl->set_notpassed_slp(); + C->set_major_progress(); + cl->mark_do_unroll_only(); + } + } + } } //------------------------------vector_opd--------------------------- diff --git a/hotspot/src/share/vm/opto/superword.hpp b/hotspot/src/share/vm/opto/superword.hpp index 0e7b71aac3d..f5c4384375b 100644 --- a/hotspot/src/share/vm/opto/superword.hpp +++ b/hotspot/src/share/vm/opto/superword.hpp @@ -241,7 +241,7 @@ class SuperWord : public ResourceObj { void transform_loop(IdealLoopTree* lpt, bool do_optimization); - void unrolling_analysis(CountedLoopNode *cl, int &local_loop_unroll_factor); + void unrolling_analysis(int &local_loop_unroll_factor); // Accessors for SWPointer PhaseIdealLoop* phase() { return _phase; } From a5d8b8bf25a2394f0fcfa963cf08f1aca69c7394 Mon Sep 17 00:00:00 2001 From: Peter Januschke Date: Tue, 7 Jul 2015 10:40:09 +0200 Subject: [PATCH 03/56] 8130653: ppc: implement MultiplyToLen intrinsic Reviewed-by: simonis --- hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp | 6 +- hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp | 370 ++++++++++++++++++ hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp | 25 ++ .../cpu/ppc/vm/macroAssembler_ppc.inline.hpp | 7 + hotspot/src/cpu/ppc/vm/ppc.ad | 2 +- hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp | 79 ++++ hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp | 5 +- 7 files changed, 489 insertions(+), 5 deletions(-) diff --git a/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp b/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp index 457b9cb59d9..4945d7f827b 100644 --- a/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp +++ b/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012, 2014 SAP AG. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012, 2015 SAP AG. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -225,7 +225,7 @@ inline BasicObjectLock* frame::interpreter_frame_monitor_begin() const { return (BasicObjectLock *) get_ijava_state(); } -// SAPJVM ASc 2012-11-21. Return register stack slot addr at which currently interpreted method is found +// Return register stack slot addr at which currently interpreted method is found. inline Method** frame::interpreter_frame_method_addr() const { return (Method**) &(get_ijava_state()->method); } diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp index 587000b963f..d84ed70f02a 100644 --- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp @@ -3433,6 +3433,376 @@ void MacroAssembler::char_arrays_equalsImm(Register str1_reg, Register str2_reg, bind(Ldone_false); } +// dest_lo += src1 + src2 +// dest_hi += carry1 + carry2 +void MacroAssembler::add2_with_carry(Register dest_hi, + Register dest_lo, + Register src1, Register src2) { + li(R0, 0); + addc(dest_lo, dest_lo, src1); + adde(dest_hi, dest_hi, R0); + addc(dest_lo, dest_lo, src2); + adde(dest_hi, dest_hi, R0); +} + +// Multiply 64 bit by 64 bit first loop. +void MacroAssembler::multiply_64_x_64_loop(Register x, Register xstart, + Register x_xstart, + Register y, Register y_idx, + Register z, + Register carry, + Register product_high, Register product, + Register idx, Register kdx, + Register tmp) { + // jlong carry, x[], y[], z[]; + // for (int idx=ystart, kdx=ystart+1+xstart; idx >= 0; idx--, kdx--) { + // huge_128 product = y[idx] * x[xstart] + carry; + // z[kdx] = (jlong)product; + // carry = (jlong)(product >>> 64); + // } + // z[xstart] = carry; + + Label L_first_loop, L_first_loop_exit; + Label L_one_x, L_one_y, L_multiply; + + addic_(xstart, xstart, -1); + blt(CCR0, L_one_x); // Special case: length of x is 1. + + // Load next two integers of x. + sldi(tmp, xstart, LogBytesPerInt); + ldx(x_xstart, x, tmp); +#ifdef VM_LITTLE_ENDIAN + rldicl(x_xstart, x_xstart, 32, 0); +#endif + + align(32, 16); + bind(L_first_loop); + + cmpdi(CCR0, idx, 1); + blt(CCR0, L_first_loop_exit); + addi(idx, idx, -2); + beq(CCR0, L_one_y); + + // Load next two integers of y. + sldi(tmp, idx, LogBytesPerInt); + ldx(y_idx, y, tmp); +#ifdef VM_LITTLE_ENDIAN + rldicl(y_idx, y_idx, 32, 0); +#endif + + + bind(L_multiply); + multiply64(product_high, product, x_xstart, y_idx); + + li(tmp, 0); + addc(product, product, carry); // Add carry to result. + adde(product_high, product_high, tmp); // Add carry of the last addition. + addi(kdx, kdx, -2); + + // Store result. +#ifdef VM_LITTLE_ENDIAN + rldicl(product, product, 32, 0); +#endif + sldi(tmp, kdx, LogBytesPerInt); + stdx(product, z, tmp); + mr_if_needed(carry, product_high); + b(L_first_loop); + + + bind(L_one_y); // Load one 32 bit portion of y as (0,value). + + lwz(y_idx, 0, y); + b(L_multiply); + + + bind( L_one_x ); // Load one 32 bit portion of x as (0,value). + + lwz(x_xstart, 0, x); + b(L_first_loop); + + bind(L_first_loop_exit); +} + +// Multiply 64 bit by 64 bit and add 128 bit. +void MacroAssembler::multiply_add_128_x_128(Register x_xstart, Register y, + Register z, Register yz_idx, + Register idx, Register carry, + Register product_high, Register product, + Register tmp, int offset) { + + // huge_128 product = (y[idx] * x_xstart) + z[kdx] + carry; + // z[kdx] = (jlong)product; + + sldi(tmp, idx, LogBytesPerInt); + if ( offset ) { + addi(tmp, tmp, offset); + } + ldx(yz_idx, y, tmp); +#ifdef VM_LITTLE_ENDIAN + rldicl(yz_idx, yz_idx, 32, 0); +#endif + + multiply64(product_high, product, x_xstart, yz_idx); + ldx(yz_idx, z, tmp); +#ifdef VM_LITTLE_ENDIAN + rldicl(yz_idx, yz_idx, 32, 0); +#endif + + add2_with_carry(product_high, product, carry, yz_idx); + + sldi(tmp, idx, LogBytesPerInt); + if ( offset ) { + addi(tmp, tmp, offset); + } +#ifdef VM_LITTLE_ENDIAN + rldicl(product, product, 32, 0); +#endif + stdx(product, z, tmp); +} + +// Multiply 128 bit by 128 bit. Unrolled inner loop. +void MacroAssembler::multiply_128_x_128_loop(Register x_xstart, + Register y, Register z, + Register yz_idx, Register idx, Register carry, + Register product_high, Register product, + Register carry2, Register tmp) { + + // jlong carry, x[], y[], z[]; + // int kdx = ystart+1; + // for (int idx=ystart-2; idx >= 0; idx -= 2) { // Third loop + // huge_128 product = (y[idx+1] * x_xstart) + z[kdx+idx+1] + carry; + // z[kdx+idx+1] = (jlong)product; + // jlong carry2 = (jlong)(product >>> 64); + // product = (y[idx] * x_xstart) + z[kdx+idx] + carry2; + // z[kdx+idx] = (jlong)product; + // carry = (jlong)(product >>> 64); + // } + // idx += 2; + // if (idx > 0) { + // product = (y[idx] * x_xstart) + z[kdx+idx] + carry; + // z[kdx+idx] = (jlong)product; + // carry = (jlong)(product >>> 64); + // } + + Label L_third_loop, L_third_loop_exit, L_post_third_loop_done; + const Register jdx = R0; + + // Scale the index. + srdi_(jdx, idx, 2); + beq(CCR0, L_third_loop_exit); + mtctr(jdx); + + align(32, 16); + bind(L_third_loop); + + addi(idx, idx, -4); + + multiply_add_128_x_128(x_xstart, y, z, yz_idx, idx, carry, product_high, product, tmp, 8); + mr_if_needed(carry2, product_high); + + multiply_add_128_x_128(x_xstart, y, z, yz_idx, idx, carry2, product_high, product, tmp, 0); + mr_if_needed(carry, product_high); + bdnz(L_third_loop); + + bind(L_third_loop_exit); // Handle any left-over operand parts. + + andi_(idx, idx, 0x3); + beq(CCR0, L_post_third_loop_done); + + Label L_check_1; + + addic_(idx, idx, -2); + blt(CCR0, L_check_1); + + multiply_add_128_x_128(x_xstart, y, z, yz_idx, idx, carry, product_high, product, tmp, 0); + mr_if_needed(carry, product_high); + + bind(L_check_1); + + addi(idx, idx, 0x2); + andi_(idx, idx, 0x1) ; + addic_(idx, idx, -1); + blt(CCR0, L_post_third_loop_done); + + sldi(tmp, idx, LogBytesPerInt); + lwzx(yz_idx, y, tmp); + multiply64(product_high, product, x_xstart, yz_idx); + lwzx(yz_idx, z, tmp); + + add2_with_carry(product_high, product, yz_idx, carry); + + sldi(tmp, idx, LogBytesPerInt); + stwx(product, z, tmp); + srdi(product, product, 32); + + sldi(product_high, product_high, 32); + orr(product, product, product_high); + mr_if_needed(carry, product); + + bind(L_post_third_loop_done); +} // multiply_128_x_128_loop + +void MacroAssembler::multiply_to_len(Register x, Register xlen, + Register y, Register ylen, + Register z, Register zlen, + Register tmp1, Register tmp2, + Register tmp3, Register tmp4, + Register tmp5, Register tmp6, + Register tmp7, Register tmp8, + Register tmp9, Register tmp10, + Register tmp11, Register tmp12, + Register tmp13) { + + ShortBranchVerifier sbv(this); + + assert_different_registers(x, xlen, y, ylen, z, zlen, + tmp1, tmp2, tmp3, tmp4, tmp5, tmp6); + assert_different_registers(x, xlen, y, ylen, z, zlen, + tmp1, tmp2, tmp3, tmp4, tmp5, tmp7); + assert_different_registers(x, xlen, y, ylen, z, zlen, + tmp1, tmp2, tmp3, tmp4, tmp5, tmp8); + + const Register idx = tmp1; + const Register kdx = tmp2; + const Register xstart = tmp3; + + const Register y_idx = tmp4; + const Register carry = tmp5; + const Register product = tmp6; + const Register product_high = tmp7; + const Register x_xstart = tmp8; + const Register tmp = tmp9; + + // First Loop. + // + // final static long LONG_MASK = 0xffffffffL; + // int xstart = xlen - 1; + // int ystart = ylen - 1; + // long carry = 0; + // for (int idx=ystart, kdx=ystart+1+xstart; idx >= 0; idx-, kdx--) { + // long product = (y[idx] & LONG_MASK) * (x[xstart] & LONG_MASK) + carry; + // z[kdx] = (int)product; + // carry = product >>> 32; + // } + // z[xstart] = (int)carry; + + mr_if_needed(idx, ylen); // idx = ylen + mr_if_needed(kdx, zlen); // kdx = xlen + ylen + li(carry, 0); // carry = 0 + + Label L_done; + + addic_(xstart, xlen, -1); + blt(CCR0, L_done); + + multiply_64_x_64_loop(x, xstart, x_xstart, y, y_idx, z, + carry, product_high, product, idx, kdx, tmp); + + Label L_second_loop; + + cmpdi(CCR0, kdx, 0); + beq(CCR0, L_second_loop); + + Label L_carry; + + addic_(kdx, kdx, -1); + beq(CCR0, L_carry); + + // Store lower 32 bits of carry. + sldi(tmp, kdx, LogBytesPerInt); + stwx(carry, z, tmp); + srdi(carry, carry, 32); + addi(kdx, kdx, -1); + + + bind(L_carry); + + // Store upper 32 bits of carry. + sldi(tmp, kdx, LogBytesPerInt); + stwx(carry, z, tmp); + + // Second and third (nested) loops. + // + // for (int i = xstart-1; i >= 0; i--) { // Second loop + // carry = 0; + // for (int jdx=ystart, k=ystart+1+i; jdx >= 0; jdx--, k--) { // Third loop + // long product = (y[jdx] & LONG_MASK) * (x[i] & LONG_MASK) + + // (z[k] & LONG_MASK) + carry; + // z[k] = (int)product; + // carry = product >>> 32; + // } + // z[i] = (int)carry; + // } + // + // i = xlen, j = tmp1, k = tmp2, carry = tmp5, x[i] = rdx + + bind(L_second_loop); + + li(carry, 0); // carry = 0; + + addic_(xstart, xstart, -1); // i = xstart-1; + blt(CCR0, L_done); + + Register zsave = tmp10; + + mr(zsave, z); + + + Label L_last_x; + + sldi(tmp, xstart, LogBytesPerInt); + add(z, z, tmp); // z = z + k - j + addi(z, z, 4); + addic_(xstart, xstart, -1); // i = xstart-1; + blt(CCR0, L_last_x); + + sldi(tmp, xstart, LogBytesPerInt); + ldx(x_xstart, x, tmp); +#ifdef VM_LITTLE_ENDIAN + rldicl(x_xstart, x_xstart, 32, 0); +#endif + + + Label L_third_loop_prologue; + + bind(L_third_loop_prologue); + + Register xsave = tmp11; + Register xlensave = tmp12; + Register ylensave = tmp13; + + mr(xsave, x); + mr(xlensave, xstart); + mr(ylensave, ylen); + + + multiply_128_x_128_loop(x_xstart, y, z, y_idx, ylen, + carry, product_high, product, x, tmp); + + mr(z, zsave); + mr(x, xsave); + mr(xlen, xlensave); // This is the decrement of the loop counter! + mr(ylen, ylensave); + + addi(tmp3, xlen, 1); + sldi(tmp, tmp3, LogBytesPerInt); + stwx(carry, z, tmp); + addic_(tmp3, tmp3, -1); + blt(CCR0, L_done); + + srdi(carry, carry, 32); + sldi(tmp, tmp3, LogBytesPerInt); + stwx(carry, z, tmp); + b(L_second_loop); + + // Next infrequent code is moved outside loops. + bind(L_last_x); + + lwz(x_xstart, 0, x); + b(L_third_loop_prologue); + + bind(L_done); +} // multiply_to_len void MacroAssembler::asm_assert(bool check_equal, const char *msg, int id) { #ifdef ASSERT diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp index 2ed004aba44..74093244a90 100644 --- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp +++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp @@ -677,6 +677,31 @@ class MacroAssembler: public Assembler { void char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register result_reg, Register tmp1_reg, Register tmp2_reg); + // Emitters for BigInteger.multiplyToLen intrinsic. + inline void multiply64(Register dest_hi, Register dest_lo, + Register x, Register y); + void add2_with_carry(Register dest_hi, Register dest_lo, + Register src1, Register src2); + void multiply_64_x_64_loop(Register x, Register xstart, Register x_xstart, + Register y, Register y_idx, Register z, + Register carry, Register product_high, Register product, + Register idx, Register kdx, Register tmp); + void multiply_add_128_x_128(Register x_xstart, Register y, Register z, + Register yz_idx, Register idx, Register carry, + Register product_high, Register product, Register tmp, + int offset); + void multiply_128_x_128_loop(Register x_xstart, + Register y, Register z, + Register yz_idx, Register idx, Register carry, + Register product_high, Register product, + Register carry2, Register tmp); + void multiply_to_len(Register x, Register xlen, + Register y, Register ylen, + Register z, Register zlen, + Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5, + Register tmp6, Register tmp7, Register tmp8, Register tmp9, Register tmp10, + Register tmp11, Register tmp12, Register tmp13); + // // Debugging // diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp index a52931d860d..9d062d799c7 100644 --- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp +++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp @@ -423,6 +423,13 @@ inline void MacroAssembler::trap_range_check_ge(Register a, int si16) { twi(traptoEqual | traptoGreaterThanUnsigned, a/*reg a*/, si16); } +// unsigned integer multiplication 64*64 -> 128 bits +inline void MacroAssembler::multiply64(Register dest_hi, Register dest_lo, + Register x, Register y) { + mulld(dest_lo, x, y); + mulhdu(dest_hi, x, y); +} + #if defined(ABI_ELFv2) inline address MacroAssembler::function_entry() { return pc(); } #else diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad index b4264973cb3..a4e5f5a454a 100644 --- a/hotspot/src/cpu/ppc/vm/ppc.ad +++ b/hotspot/src/cpu/ppc/vm/ppc.ad @@ -10930,7 +10930,7 @@ instruct partialSubtypeCheck(iRegPdst result, iRegP_N2P subklass, iRegP_N2P supe instruct cmpFastLock(flagsReg crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3) %{ match(Set crx (FastLock oop box)); effect(TEMP tmp1, TEMP tmp2, TEMP tmp3); - predicate(/*(!UseNewFastLockPPC64 || UseBiasedLocking) &&*/ !Compile::current()->use_rtm()); + predicate(!Compile::current()->use_rtm()); format %{ "FASTLOCK $oop, $box, $tmp1, $tmp2, $tmp3" %} ins_encode %{ diff --git a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp index 4ddf83ba943..190b56bd1f5 100644 --- a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp @@ -2053,6 +2053,79 @@ class StubGenerator: public StubCodeGenerator { __ blr(); } + // Stub for BigInteger::multiplyToLen() + // + // Arguments: + // + // Input: + // R3 - x address + // R4 - x length + // R5 - y address + // R6 - y length + // R7 - z address + // R8 - z length + // + address generate_multiplyToLen() { + + StubCodeMark mark(this, "StubRoutines", "multiplyToLen"); + + address start = __ function_entry(); + + const Register x = R3; + const Register xlen = R4; + const Register y = R5; + const Register ylen = R6; + const Register z = R7; + const Register zlen = R8; + + const Register tmp1 = R2; // TOC not used. + const Register tmp2 = R9; + const Register tmp3 = R10; + const Register tmp4 = R11; + const Register tmp5 = R12; + + // non-volatile regs + const Register tmp6 = R31; + const Register tmp7 = R30; + const Register tmp8 = R29; + const Register tmp9 = R28; + const Register tmp10 = R27; + const Register tmp11 = R26; + const Register tmp12 = R25; + const Register tmp13 = R24; + + BLOCK_COMMENT("Entry:"); + + // Save non-volatile regs (frameless). + int current_offs = 8; + __ std(R24, -current_offs, R1_SP); current_offs += 8; + __ std(R25, -current_offs, R1_SP); current_offs += 8; + __ std(R26, -current_offs, R1_SP); current_offs += 8; + __ std(R27, -current_offs, R1_SP); current_offs += 8; + __ std(R28, -current_offs, R1_SP); current_offs += 8; + __ std(R29, -current_offs, R1_SP); current_offs += 8; + __ std(R30, -current_offs, R1_SP); current_offs += 8; + __ std(R31, -current_offs, R1_SP); + + __ multiply_to_len(x, xlen, y, ylen, z, zlen, tmp1, tmp2, tmp3, tmp4, tmp5, + tmp6, tmp7, tmp8, tmp9, tmp10, tmp11, tmp12, tmp13); + + // Restore non-volatile regs. + current_offs = 8; + __ ld(R24, -current_offs, R1_SP); current_offs += 8; + __ ld(R25, -current_offs, R1_SP); current_offs += 8; + __ ld(R26, -current_offs, R1_SP); current_offs += 8; + __ ld(R27, -current_offs, R1_SP); current_offs += 8; + __ ld(R28, -current_offs, R1_SP); current_offs += 8; + __ ld(R29, -current_offs, R1_SP); current_offs += 8; + __ ld(R30, -current_offs, R1_SP); current_offs += 8; + __ ld(R31, -current_offs, R1_SP); + + __ blr(); // Return to caller. + + return start; + } + // Initialization void generate_initial() { // Generates all stubs and initializes the entry points @@ -2102,6 +2175,12 @@ class StubGenerator: public StubCodeGenerator { generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry, &StubRoutines::_safefetchN_fault_pc, &StubRoutines::_safefetchN_continuation_pc); + +#ifdef COMPILER2 + if (UseMultiplyToLenIntrinsic) { + StubRoutines::_multiplyToLen = generate_multiplyToLen(); + } +#endif } public: diff --git a/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp b/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp index 28d19fbe4e4..609bf10802e 100644 --- a/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp @@ -198,6 +198,10 @@ void VM_Version::initialize() { FLAG_SET_DEFAULT(UseCRC32CIntrinsics, false); } + if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) { + UseMultiplyToLenIntrinsic = true; + } + // Adjust RTM (Restricted Transactional Memory) flags. if (!has_tcheck() && UseRTMLocking) { // Can't continue because UseRTMLocking affects UseBiasedLocking flag @@ -228,7 +232,6 @@ void VM_Version::initialize() { warning("RTMAbortRatio must be in the range 0 to 100, resetting it to 50"); FLAG_SET_DEFAULT(RTMAbortRatio, 50); } - FLAG_SET_ERGO(bool, UseNewFastLockPPC64, false); // Does not implement TM. guarantee(RTMSpinLoopCount > 0, "unsupported"); #else // Only C2 does RTM locking optimization. From 2c695decc294260a0773335a6e40cf0e08b00ce3 Mon Sep 17 00:00:00 2001 From: Anthony Scarpino Date: Mon, 13 Jul 2015 13:22:21 -0700 Subject: [PATCH 04/56] 8131078: typos in ghash cpu message Reviewed-by: goetz, kvn --- hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp index 163a12acaa9..6f97e0e503a 100644 --- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp @@ -308,7 +308,7 @@ void VM_Version::initialize() { } } else if (UseGHASHIntrinsics) { if (!FLAG_IS_DEFAULT(UseGHASHIntrinsics)) - warning("GHASH intrinsics require VIS3 insructions support. Intriniscs will be disabled"); + warning("GHASH intrinsics require VIS3 instruction support. Intrinsics will be disabled"); FLAG_SET_DEFAULT(UseGHASHIntrinsics, false); } From 590ec77481191a57e56a53dac3e12e9d0542a186 Mon Sep 17 00:00:00 2001 From: Michael Haupt Date: Tue, 31 Mar 2015 21:46:44 +0200 Subject: [PATCH 05/56] 6900757: minor bug fixes to LogCompilation tool Improve internal error reporting (point to XML element causing trouble); fix comparator for sorting by name and start; make tool more robust wrt. incorrect options and files not found; make inlining decision output more clear; adopt uncommon traps history printing; properly mention compiler in generated logs; add options for printing time stamps and omitting compilation IDs; add option for comparing compilation logs; overall code cleanup and API documentation Reviewed-by: kvn, vlivanov --- hotspot/.hgignore | 1 + .../src/share/tools/LogCompilation/Makefile | 4 +- .../hotspot/tools/compiler/BasicLogEvent.java | 39 +- .../sun/hotspot/tools/compiler/CallSite.java | 159 ++- .../hotspot/tools/compiler/Compilation.java | 156 ++- .../tools/compiler/LogCleanupReader.java | 37 +- .../tools/compiler/LogCompilation.java | 402 +++++++- .../sun/hotspot/tools/compiler/LogEvent.java | 23 +- .../sun/hotspot/tools/compiler/LogParser.java | 973 ++++++++++++++---- .../tools/compiler/MakeNotEntrantEvent.java | 17 +- .../sun/hotspot/tools/compiler/Method.java | 79 +- .../sun/hotspot/tools/compiler/NMethod.java | 15 +- .../com/sun/hotspot/tools/compiler/Phase.java | 30 +- .../hotspot/tools/compiler/UncommonTrap.java | 79 ++ .../tools/compiler/UncommonTrapEvent.java | 101 +- .../src/share/vm/compiler/compileBroker.cpp | 4 +- 16 files changed, 1780 insertions(+), 339 deletions(-) create mode 100644 hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java diff --git a/hotspot/.hgignore b/hotspot/.hgignore index 45f920748bb..d9bdc622912 100644 --- a/hotspot/.hgignore +++ b/hotspot/.hgignore @@ -10,3 +10,4 @@ .igv.log ^.hgtip .DS_Store +\.class$ diff --git a/hotspot/src/share/tools/LogCompilation/Makefile b/hotspot/src/share/tools/LogCompilation/Makefile index eb85a26bc4f..f04795e44b1 100644 --- a/hotspot/src/share/tools/LogCompilation/Makefile +++ b/hotspot/src/share/tools/LogCompilation/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -62,7 +62,7 @@ all: logc.jar logc.jar: filelist manifest.mf @mkdir -p $(OUTPUT_DIR) - $(JAVAC) -source 1.5 -deprecation -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) @filelist + $(JAVAC) -deprecation -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) @filelist $(JAR) cvfm logc.jar manifest.mf -C $(OUTPUT_DIR) com .PHONY: filelist diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java index f943a2a9665..f34f0cfa495 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,14 +27,29 @@ package com.sun.hotspot.tools.compiler; import java.io.PrintStream; /** - * - * @author never + * Provide basic data structures and behaviour for {@link LogEvent}s. */ public abstract class BasicLogEvent implements LogEvent { + /** + * The event's ID. This is a number; we represent it as a string for + * convenience. + */ protected final String id; + + /** + * The event's start time. + */ protected final double start; + + /** + * The event's end time. + */ protected double end; + + /** + * The compilation during which this event was signalled. + */ protected Compilation compilation; BasicLogEvent(double start, String id) { @@ -43,33 +58,37 @@ public abstract class BasicLogEvent implements LogEvent { this.id = id; } - public double getStart() { + public final double getStart() { return start; } - public double getEnd() { + public final double getEnd() { return end; } - public void setEnd(double end) { + public final void setEnd(double end) { this.end = end; } - public double getElapsedTime() { + public final double getElapsedTime() { return ((int) ((getEnd() - getStart()) * 1000)) / 1000.0; } - public String getId() { + public final String getId() { return id; } - public Compilation getCompilation() { + public final Compilation getCompilation() { return compilation; } + /** + * Set the compilation for this event. This is not a {@code final} method + * as it is overridden in {@link UncommonTrapEvent}. + */ public void setCompilation(Compilation compilation) { this.compilation = compilation; } - abstract public void print(PrintStream stream); + abstract public void print(PrintStream stream, boolean printID); } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java index 1aa3edbc35a..650d58a9e3a 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,41 +29,119 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; +/** + * Representation of a compilation scope in a compilation log. This class is a + * hybrid: its instances can represent original scopes of methods being + * compiled, but are also used to represent call sites in given methods. + */ public class CallSite { + /** + * The index of the call in the caller. This will be 0 if this instance + * represents a compilation root. + */ private int bci; + + /** + * The method that is called at this call site. This will be {@code null} + * if this instance represents a compilation root. + */ private Method method; + + /** + * The invocation count for this call site. + */ private int count; + + /** + * The receiver type of the call represented by this instance, if known. + */ private String receiver; + + /** + * In case the {@linkplain receiver receiver type} of the call represented + * by this instance is known, this is how often the type was encountered. + */ private int receiver_count; + + /** + * The reason for a success or failure of an inlining operation at this + * call site. + */ private String reason; + + /** + * A list of all calls in this compilation scope. + */ private List calls; + + /** + * Number of nodes in the graph at the end of parsing this compilation + * scope. + */ private int endNodes; + + /** + * Number of live nodes in the graph at the end of parsing this compilation + * scope. + */ private int endLiveNodes; + + /** + * Time in seconds since VM startup at which parsing this compilation scope + * ended. + */ private double timeStamp; + + /** + * The inline ID in case the call represented by this instance is inlined, + * 0 otherwise. + */ private long inlineId; - CallSite() { - } + /** + * List of uncommon traps in this compilation scope. + */ + private List traps; + /** + * Default constructor: used to create an instance that represents the top + * scope of a compilation. + */ + CallSite() {} + + /** + * Constructor to create an instance that represents an actual method call. + */ CallSite(int bci, Method m) { this.bci = bci; this.method = m; } + /** + * Add a call site to the compilation scope represented by this instance. + */ void add(CallSite site) { if (getCalls() == null) { - setCalls(new ArrayList()); + calls = new ArrayList<>(); } getCalls().add(site); } + /** + * Return the last of the {@linkplain #getCalls() call sites} in this + * compilation scope. + */ CallSite last() { - return last(-1); + return getCalls().get(getCalls().size() - 1); } - CallSite last(int fromEnd) { - return getCalls().get(getCalls().size() + fromEnd); + /** + * Return the last-but-one of the {@linkplain #getCalls() call sites} in + * this compilation scope. + */ + CallSite lastButOne() { + return getCalls().get(getCalls().size() - 2); } public String toString() { @@ -84,7 +162,7 @@ public class CallSite { } public void print(PrintStream stream) { - print(stream, 0); + print(stream, 0, true, false); } void emit(PrintStream stream, int indent) { @@ -92,21 +170,14 @@ public class CallSite { stream.print(' '); } } - private static boolean compat = true; - public void print(PrintStream stream, int indent) { + public void print(PrintStream stream, int indent, boolean printInlining, boolean printUncommonTraps) { emit(stream, indent); String m = getMethod().getHolder() + "::" + getMethod().getName(); if (getReason() == null) { stream.print(" @ " + getBci() + " " + m + " (" + getMethod().getBytes() + " bytes)"); - } else { - if (isCompat()) { - stream.print(" @ " + getBci() + " " + m + " " + getReason()); - } else { - stream.print("- @ " + getBci() + " " + m + - " (" + getMethod().getBytes() + " bytes) " + getReason()); - } + stream.print(" @ " + getBci() + " " + m + " " + getReason()); } stream.printf(" (end time: %6.4f", getTimeStamp()); if (getEndNodes() > 0) { @@ -116,13 +187,16 @@ public class CallSite { if (getReceiver() != null) { emit(stream, indent + 4); - // stream.println("type profile " + method.holder + " -> " + receiver + " (" + - // receiver_count + "/" + count + "," + (receiver_count * 100 / count) + "%)"); stream.println("type profile " + getMethod().getHolder() + " -> " + getReceiver() + " (" + (getReceiverCount() * 100 / getCount()) + "%)"); } - if (getCalls() != null) { + if (printInlining && getCalls() != null) { for (CallSite site : getCalls()) { + site.print(stream, indent + 2, printInlining, printUncommonTraps); + } + } + if (printUncommonTraps && getTraps() != null) { + for (UncommonTrap site : getTraps()) { site.print(stream, indent + 2); } } @@ -180,16 +254,15 @@ public class CallSite { return calls; } - public void setCalls(List calls) { - this.calls = calls; + public List getTraps() { + return traps; } - public static boolean isCompat() { - return compat; - } - - public static void setCompat(boolean aCompat) { - compat = aCompat; + void add(UncommonTrap e) { + if (traps == null) { + traps = new ArrayList(); + } + traps.add(e); } void setEndNodes(int n) { @@ -216,21 +289,30 @@ public class CallSite { return timeStamp; } + /** + * Check whether this call site matches another. Every late inline call + * site has a unique inline ID. If the call site we're looking for has one, + * then use it; otherwise rely on method name and byte code index. + */ private boolean matches(CallSite other) { - // Every late inline call site has a unique inline id. If the - // call site we're looking for has one then use it other rely - // on method name and bci. if (other.inlineId != 0) { return inlineId == other.inlineId; } return method.equals(other.method) && bci == other.bci; } + /** + * Locate a late inline call site: find, in this instance's + * {@linkplain #calls call sites}, the one furthest down the given call + * stack. + * + * Multiple chains of identical call sites with the same method name / bci + * combination are possible, so we have to try them all until we find the + * late inline call site that has a matching inline ID. + * + * @return a matching call site, or {@code null} if none was found. + */ public CallSite findCallSite(ArrayDeque sites) { - // Locate a late inline call site. Multiple chains of - // identical call sites with the same method name/bci are - // possible so we have to try them all until we find the late - // inline call site that has a matching inline id. if (calls == null) { return null; } @@ -253,6 +335,11 @@ public class CallSite { return null; } + /** + * Locate a late inline call site in the tree spanned by all this instance's + * {@linkplain #calls call sites}, and return the sequence of call sites + * (scopes) leading to that late inline call site. + */ public ArrayDeque findCallSite2(CallSite site) { if (calls == null) { return null; @@ -260,7 +347,7 @@ public class CallSite { for (CallSite c : calls) { if (c.matches(site)) { - ArrayDeque stack = new ArrayDeque(); + ArrayDeque stack = new ArrayDeque<>(); stack.push(c); return stack; } else { diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java index e6617da628d..379067f3071 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,22 +27,94 @@ package com.sun.hotspot.tools.compiler; import java.io.PrintStream; import java.util.ArrayList; +/** + * One particular compilation, represented in the compilation log file as a + * {@code task} element. + */ public class Compilation implements LogEvent { + /** + * The compilation ID. + */ private int id; + + /** + * Whether this is a compilation for on-stack replacement (OSR). + */ private boolean osr; + + /** + * The method being compiled. + */ private Method method; + + /** + * The {@linkplain CallSite scope} of this compilation. This is created as + * an empty {@link CallSite} instance, to be filled with data (and + * meaning) later on. + */ private CallSite call = new CallSite(); + + /** + * In case a {@code late_inline} event occurs during the compilation, this + * field holds the information about it. + */ private CallSite lateInlineCall = new CallSite(); - private int osrBci; + + /** + * The bytecode instruction index for on-stack replacement compilations; -1 + * if this is not an OSR compilation. + */ + private int bci; + + /** + * The method under compilation's invocation count. + */ private String icount; + + /** + * The method under compilation's backedge count. + */ private String bcount; + + /** + * Additional information for special compilations (e.g., adapters). + */ private String special; + + /** + * The name of the compiler performing this compilation. + */ + private String compiler; + + /** + * Start time stamp. + */ private double start; + + /** + * End time stamp. + */ private double end; + + /** + * Trip count of the register allocator. + */ private int attempts; + + /** + * The compilation result (a native method). + */ private NMethod nmethod; - private ArrayList phases = new ArrayList(4); + + /** + * The phases through which this compilation goes. + */ + private ArrayList phases = new ArrayList<>(4); + + /** + * In case this compilation fails, the reason for that. + */ private String failureReason; Compilation(int id) { @@ -52,9 +124,17 @@ public class Compilation implements LogEvent { void reset() { call = new CallSite(); lateInlineCall = new CallSite(); - phases = new ArrayList(4); + phases = new ArrayList<>(4); } + /** + * Get a compilation phase by name, or {@code null}. + * + * @param s the name of the phase to retrieve in this compilation. + * + * @return a compilation phase, or {@code null} if no phase with the given + * name is found. + */ Phase getPhase(String s) { for (Phase p : getPhases()) { if (p.getName().equals(s)) { @@ -72,20 +152,32 @@ public class Compilation implements LogEvent { return start; } + public void setCompiler(String compiler) { + this.compiler = compiler; + } + + public String getCompiler() { + return compiler; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append(getId()); sb.append(" "); + sb.append(getCompiler()); + sb.append(" "); sb.append(getMethod()); sb.append(" "); sb.append(getIcount()); sb.append("+"); sb.append(getBcount()); sb.append("\n"); - for (CallSite site : getCall().getCalls()) { - sb.append(site); - sb.append("\n"); + if (getCall() != null && getCall().getCalls() != null) { + for (CallSite site : getCall().getCalls()) { + sb.append(site); + sb.append("\n"); + } } if (getLateInlineCall().getCalls() != null) { sb.append("late inline:\n"); @@ -101,38 +193,50 @@ public class Compilation implements LogEvent { if (getMethod() == null) { stream.println(getSpecial()); } else { - int bc = isOsr() ? getOsr_bci() : -1; - stream.print(getId() + getMethod().decodeFlags(bc) + getMethod().format(bc)); + int bc = isOsr() ? getBCI() : -1; + stream.print(getId() + getMethod().decodeFlags(bc) + " " + compiler + " " + getMethod().format(bc)); } } - public void print(PrintStream stream) { - print(stream, 0, false); + public void print(PrintStream stream, boolean printID) { + print(stream, 0, printID, true, false); } - public void print(PrintStream stream, boolean printInlining) { - print(stream, 0, printInlining); + public void print(PrintStream stream, boolean printID, boolean printInlining) { + print(stream, 0, printID, printInlining, false); } - public void print(PrintStream stream, int indent, boolean printInlining) { + public void print(PrintStream stream, boolean printID, boolean printInlining, boolean printUncommonTraps) { + print(stream, 0, printID, printInlining, printUncommonTraps); + } + + public void print(PrintStream stream, int indent, boolean printID, boolean printInlining, boolean printUncommonTraps) { if (getMethod() == null) { stream.println(getSpecial()); } else { - int bc = isOsr() ? getOsr_bci() : -1; - stream.print(getId() + getMethod().decodeFlags(bc) + getMethod().format(bc)); + if (printID) { + stream.print(getId()); + } + int bc = isOsr() ? getBCI() : -1; + stream.print(getMethod().decodeFlags(bc) + " " + compiler + " " + getMethod().format(bc)); stream.println(); if (getFailureReason() != null) { - stream.println("COMPILE FAILED " + getFailureReason()); + stream.println("COMPILE SKIPPED: " + getFailureReason() + " (not retryable)"); } if (printInlining && call.getCalls() != null) { for (CallSite site : call.getCalls()) { + site.print(stream, indent + 2, printInlining, printUncommonTraps); + } + } + if (printUncommonTraps && call.getTraps() != null) { + for (UncommonTrap site : call.getTraps()) { site.print(stream, indent + 2); } } if (printInlining && lateInlineCall.getCalls() != null) { stream.println("late inline:"); for (CallSite site : lateInlineCall.getCalls()) { - site.print(stream, indent + 2); + site.print(stream, indent + 2, printInlining, printUncommonTraps); } } } @@ -154,12 +258,12 @@ public class Compilation implements LogEvent { this.osr = osr; } - public int getOsr_bci() { - return osrBci; + public int getBCI() { + return bci; } - public void setOsr_bci(int osrBci) { - this.osrBci = osrBci; + public void setBCI(int osrBci) { + this.bci = osrBci; } public String getIcount() { @@ -230,9 +334,13 @@ public class Compilation implements LogEvent { return method; } + /** + * Set the method under compilation. If it is already set, ignore the + * argument to avoid changing the method by post-parse inlining info. + * + * @param method the method under compilation. May be ignored. + */ public void setMethod(Method method) { - // Don't change method if it is already set to avoid changing - // it by post parse inlining info. if (getMethod() == null) { this.method = method; } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java index 960bed6ab08..e7471ab04a8 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,10 +31,9 @@ import java.util.regex.*; * This class is a filter class to deal with malformed XML that used * to be produced by the JVM when generating LogCompilation. In 1.6 * and later releases it shouldn't be required. - * @author never */ - class LogCleanupReader extends Reader { + private Reader reader; private char[] buffer = new char[4096]; @@ -55,32 +54,38 @@ class LogCleanupReader extends Reader { reader = r; } - static final private Matcher pattern = Pattern.compile(".+ compile_id='[0-9]+'.*( compile_id='[0-9]+)").matcher(""); - static final private Matcher pattern2 = Pattern.compile("' (C[12]) compile_id=").matcher(""); - static final private Matcher pattern3 = Pattern.compile("'(destroy_vm)/").matcher(""); + static final private Matcher duplicateCompileID = Pattern.compile(".+ compile_id='[0-9]+'.*( compile_id='[0-9]+)").matcher(""); + static final private Matcher compilerName = Pattern.compile("' (C[12]) compile_id=").matcher(""); + static final private Matcher destroyVM = Pattern.compile("'(destroy_vm)/").matcher(""); + /** + * The log cleanup takes place in this method. If any of the three patterns + * ({@link #duplicateCompileID}, {@link #compilerName}, {@link #destroyVM}) + * match, that indicates a problem in the log. The cleanup is performed by + * correcting the input line and writing it back into the {@link #line} + * buffer. + */ private void fill() throws IOException { rawFill(); if (length != -1) { boolean changed = false; String s = new String(line, 0, length); - String orig = s; - pattern2.reset(s); - if (pattern2.find()) { - s = s.substring(0, pattern2.start(1)) + s.substring(pattern2.end(1) + 1); + compilerName.reset(s); + if (compilerName.find()) { + s = s.substring(0, compilerName.start(1)) + s.substring(compilerName.end(1) + 1); changed = true; } - pattern.reset(s); - if (pattern.lookingAt()) { - s = s.substring(0, pattern.start(1)) + s.substring(pattern.end(1) + 1); + duplicateCompileID.reset(s); + if (duplicateCompileID.lookingAt()) { + s = s.substring(0, duplicateCompileID.start(1)) + s.substring(duplicateCompileID.end(1) + 1); changed = true; } - pattern3.reset(s); - if (pattern3.find()) { - s = s.substring(0, pattern3.start(1)) + s.substring(pattern3.end(1)); + destroyVM.reset(s); + if (destroyVM.find()) { + s = s.substring(0, destroyVM.start(1)) + s.substring(destroyVM.end(1)); changed = true; } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java index 46991bc8da6..c4c35ae549c 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,60 +22,102 @@ * */ -/** - * The main command line driver of a parser for LogCompilation output. - * @author never - */ - package com.sun.hotspot.tools.compiler; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.PrintStream; import java.util.*; + import org.xml.sax.*; import org.xml.sax.helpers.*; -public class LogCompilation extends DefaultHandler implements ErrorHandler, Constants { +/** + * The LogCompilation tool parses log files generated by HotSpot using the + * {@code -XX:+LogCompilation} command line flag, and outputs the data + * collected therein in a nicely formatted way. There are various sorting + * options available, as well as options that select specific compilation + * events (such as inlining decisions) for inclusion in the output. + * + * The tool is also capable of fixing broken compilation logs as sometimes + * generated by Java 1.5 JVMs. + */ +public class LogCompilation extends DefaultHandler implements ErrorHandler { + /** + * Print usage information and terminate with a given exit code. + */ public static void usage(int exitcode) { System.out.println("Usage: LogCompilation [ -v ] [ -c ] [ -s ] [ -e | -n ] file1 ..."); + System.out.println("By default, the tool will print the logged compilations ordered by start time."); System.out.println(" -c: clean up malformed 1.5 xml"); System.out.println(" -i: print inlining decisions"); System.out.println(" -S: print compilation statistics"); - System.out.println(" -s: sort events by start time"); + System.out.println(" -U: print uncommon trap statistics"); + System.out.println(" -t: print with time stamps"); + System.out.println(" -s: sort events by start time (default)"); System.out.println(" -e: sort events by elapsed time"); System.out.println(" -n: sort events by name and start"); + System.out.println(" -C: compare logs (give files to compare on command line)"); + System.out.println(" -d: do not print compilation IDs"); System.exit(exitcode); } + /** + * Process command line arguments, parse log files and trigger desired + * functionality. + */ public static void main(String[] args) throws Exception { - Comparator defaultSort = LogParser.sortByStart; + Comparator sort = LogParser.sortByStart; boolean statistics = false; boolean printInlining = false; boolean cleanup = false; + boolean trapHistory = false; + boolean printTimeStamps = false; + boolean compare = false; + boolean printID = true; int index = 0; while (args.length > index) { - if (args[index].equals("-e")) { - defaultSort = LogParser.sortByElapsed; + String a = args[index]; + if (a.equals("-e")) { + sort = LogParser.sortByElapsed; index++; - } else if (args[index].equals("-n")) { - defaultSort = LogParser.sortByNameAndStart; + } else if (a.equals("-n")) { + sort = LogParser.sortByNameAndStart; index++; - } else if (args[index].equals("-s")) { - defaultSort = LogParser.sortByStart; + } else if (a.equals("-s")) { + sort = LogParser.sortByStart; index++; - } else if (args[index].equals("-c")) { + } else if (a.equals("-t")) { + printTimeStamps = true; + index++; + } else if (a.equals("-c")) { cleanup = true; index++; - } else if (args[index].equals("-S")) { + } else if (a.equals("-S")) { statistics = true; index++; - } else if (args[index].equals("-h")) { + } else if (a.equals("-U")) { + trapHistory = true; + index++; + } else if (a.equals("-h")) { usage(0); - } else if (args[index].equals("-i")) { + } else if (a.equals("-i")) { printInlining = true; index++; + } else if (a.equals("-C")) { + compare = true; + index++; + } else if (a.equals("-d")) { + printID = false; + index++; } else { + if (a.charAt(0) == '-') { + System.out.println("Unknown option '" + a + "', assuming file name."); + } break; } } @@ -84,19 +126,40 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons usage(1); } + if (compare) { + compareLogs(index, args); + return; + } + while (index < args.length) { - ArrayList events = LogParser.parse(args[index], cleanup); + ArrayList events = null; + try { + events = LogParser.parse(args[index], cleanup); + } catch (FileNotFoundException fnfe) { + System.out.println("File not found: " + args[index]); + System.exit(1); + } + + Collections.sort(events, sort); if (statistics) { printStatistics(events, System.out); + } else if (trapHistory) { + printTrapHistory(events, System.out); } else { - Collections.sort(events, defaultSort); for (LogEvent c : events) { - if (printInlining && c instanceof Compilation) { - Compilation comp = (Compilation)c; - comp.print(System.out, true); + if (c instanceof NMethod) { + // skip these + continue; + } + if (printTimeStamps) { + System.out.print(c.getStart() + ": "); + } + if (c instanceof Compilation) { + Compilation comp = (Compilation) c; + comp.print(System.out, printID, printInlining); } else { - c.print(System.out); + c.print(System.out, printID); } } } @@ -104,17 +167,25 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons } } + /** + * Print extensive statistics from parsed log files. + */ public static void printStatistics(ArrayList events, PrintStream out) { + // track code cache size long cacheSize = 0; long maxCacheSize = 0; + // track number of nmethods int nmethodsCreated = 0; int nmethodsLive = 0; + // track how many compilations were attempted multiple times + // (indexed by attempts, mapping to number of compilations) int[] attempts = new int[32]; - double regallocTime = 0; int maxattempts = 0; - LinkedHashMap phaseTime = new LinkedHashMap(7); - LinkedHashMap phaseNodes = new LinkedHashMap(7); + // track time spent in compiler phases + LinkedHashMap phaseTime = new LinkedHashMap<>(7); + // track nodes created per phase + LinkedHashMap phaseNodes = new LinkedHashMap<>(7); double elapsed = 0; for (LogEvent e : events) { @@ -137,18 +208,17 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons v2 = Integer.valueOf(0); } phaseNodes.put(phase.getName(), Integer.valueOf(v2.intValue() + phase.getNodes())); - /* Print phase name, elapsed time, nodes at the start of the phase, - nodes created in the phase, live nodes at the start of the phase, - live nodes added in the phase. - */ - out.printf("\t%s %6.4f %d %d %d %d\n", phase.getName(), phase.getElapsedTime(), phase.getStartNodes(), phase.getNodes(), phase.getStartLiveNodes(), phase.getLiveNodes()); + // Print phase name, elapsed time, nodes at the start of + // the phase, nodes created in the phase, live nodes at the + // start of the phase, live nodes added in the phase. + out.printf("\t%s %6.4f %d %d %d %d\n", phase.getName(), phase.getElapsedTime(), phase.getStartNodes(), phase.getNodes(), phase.getStartLiveNodes(), phase.getAddedLiveNodes()); } } else if (e instanceof MakeNotEntrantEvent) { MakeNotEntrantEvent mne = (MakeNotEntrantEvent) e; NMethod nm = mne.getNMethod(); if (mne.isZombie()) { if (nm == null) { - System.err.println(mne.getId()); + System.err.println("zombie make not entrant event without nmethod: " + mne.getId()); } cacheSize -= nm.getSize(); nmethodsLive--; @@ -161,8 +231,7 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons maxCacheSize = Math.max(cacheSize, maxCacheSize); } } - out.printf("NMethods: %d created %d live %d bytes (%d peak) in the code cache\n", - nmethodsCreated, nmethodsLive, cacheSize, maxCacheSize); + out.printf("NMethods: %d created %d live %d bytes (%d peak) in the code cache\n", nmethodsCreated, nmethodsLive, cacheSize, maxCacheSize); out.println("Phase times:"); for (String name : phaseTime.keySet()) { Double v = phaseTime.get(name); @@ -178,4 +247,265 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons } } } + + /** + * Container class for a pair of a method and a bytecode instruction index + * used by a compiler. This is used in + * {@linkplain #compareLogs() comparing logs}. + */ + static class MethodBCIPair { + public MethodBCIPair(Method m, int b, String c) { + method = m; + bci = b; + compiler = c; + } + + Method method; + int bci; + String compiler; + + public boolean equals(Object other) { + if (!(other instanceof MethodBCIPair)) { + return false; + } + MethodBCIPair otherp = (MethodBCIPair)other; + return (otherp.bci == bci && + otherp.method.equals(method) && + otherp.compiler.equals(compiler)); + } + + public int hashCode() { + return method.hashCode() + bci; + } + + public String toString() { + if (bci != -1) { + return method + "@" + bci + " (" + compiler + ")"; + } else { + return method + " (" + compiler + ")"; + } + } + } + + /** + * Compare a number of compilation log files. Each of the logs is parsed, + * and all compilations found therein are written to a sorted file (prefix + * {@code sorted-}. A summary is written to a new file {@code summary.txt}. + * + * @param index the index in the command line arguments at which to start + * looking for files to compare. + * @param args the command line arguments with which {@link LogCompilation} + * was originally invoked. + * + * @throws Exception in case any exceptions are thrown in the called + * methods. + */ + @SuppressWarnings("unchecked") + static void compareLogs(int index, String[] args) throws Exception { + HashMap methods = new HashMap<>(); + ArrayList> logs = new ArrayList<>(); + PrintStream[] outs = new PrintStream[args.length - index]; + PrintStream summary = new PrintStream(new FileOutputStream("summary.txt")); + int o = 0; + // Process all logs given on the command line: collect compilation + // data; in particular, method/bci pairs. + while (index < args.length) { + String basename = new File(args[index]).getName(); + String outname = "sorted-" + basename; + System.out.println("Sorting " + basename + " to " + outname); + outs[o] = new PrintStream(new FileOutputStream(outname)); + o++; + System.out.println("Parsing " + args[index]); + ArrayList events = LogParser.parse(args[index], false); + HashMap compiles = new HashMap<>(); + logs.add(compiles); + for (LogEvent c : events) { + if (c instanceof Compilation) { + Compilation comp = (Compilation) c; + MethodBCIPair key = new MethodBCIPair(comp.getMethod(), comp.getBCI(), + comp.getCompiler()); + MethodBCIPair e = methods.get(key); + if (e == null) { + methods.put(key, key); + } else { + key = e; + } + Object other = compiles.get(key); + if (other == null) { + compiles.put(key, comp); + } else { + if (!(other instanceof List)) { + List l = new LinkedList<>(); + l.add(other); + l.add(comp); + compiles.put(key, l); + } else { + List l = (List) other; + l.add(comp); + } + } + } + } + index++; + } + + // Process the collected method/bci pairs and write the output. + for (MethodBCIPair pair : methods.keySet()) { + summary.print(pair + " "); + int base = -1; + String first = null; + boolean mismatch = false; + boolean different = false; + String[] output = new String[outs.length]; + o = 0; + for (HashMap set : logs) { + Object e = set.get(pair); + String thisone = null; + Compilation lastc = null; + int n; + if (e == null) { + n = 0; + } else if (e instanceof Compilation) { + n = 1; + lastc = (Compilation) e; + } else { + // Compare the last compilation that was done for this method + n = ((List) e).size(); + lastc = (Compilation) ((List) e).get(n - 1); + } + if (lastc != null) { + n = 1; + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + lastc.print(ps, false); + ps.close(); + thisone = new String(baos.toByteArray()); + } + if (base == -1) { + base = n; + } else if (base != n) { + mismatch = true; + } + output[o++] = thisone; + if (thisone != null) { + if (first == null) { + first = thisone; + } else { + if (!first.equals(thisone)) { + different = true; + } + } + } + if (different) { + summary.print(n + "d "); + } else { + summary.print(n + " "); + } + } + if (mismatch) { + summary.print("mismatch"); + } + summary.println(); + if (different) { + for (int i = 0; i < outs.length; i++) { + if (output[i] != null) { + outs[i].println(output[i]); + } + } + } + } + for (int i = 0; i < outs.length; i++) { + outs[i].close(); + } + if (summary != System.out) { + summary.close(); + } + } + + /** + * Print the history of uncommon trap events. + */ + public static void printTrapHistory(ArrayList events, PrintStream out) { + // map method names to a list of log events + LinkedHashMap> traps = new LinkedHashMap<>(); + // map compilation IDs to compilations + HashMap comps = new HashMap<>(); + + // First, iterate over all logged events, collecting data about + // uncommon trap events. + for (LogEvent e : events) { + if (e instanceof NMethod) { + // skip these + continue; + } + if (e instanceof Compilation) { + Compilation c = (Compilation) e; + String name = c.getMethod().getFullName(); + ArrayList elist = traps.get(name); + if (elist != null && comps.get(c.getId()) == null) { + comps.put(c.getId(), c); + // If there were previous events for the method + // then keep track of later compiles too. + elist.add(c); + } + continue; + } + if (e instanceof BasicLogEvent) { + BasicLogEvent ble = (BasicLogEvent) e; + Compilation c = ble.getCompilation(); + if (c == null) { + if (!(ble instanceof NMethod)) { + throw new InternalError("only nmethods should have a null compilation; here's a " + ble.getClass()); + } + continue; + } + String name = c.getMethod().getFullName(); + ArrayList elist = traps.get(name); + if (elist == null) { + elist = new ArrayList(); + traps.put(name, elist); + } + int bleId = Integer.parseInt(ble.getId()); + if (comps.get(bleId) == null) { + comps.put(bleId, c); + // Add the associated compile to the list. It + // will likely go at the end but we need to search + // backwards for the proper insertion point. + double start = c.getStart(); + int ipoint = 0; + while (ipoint < elist.size() && elist.get(ipoint).getStart() < start) { + ipoint++; + } + if (ipoint == elist.size()) { + elist.add(c); + } else { + elist.add(ipoint, c); + } + } + elist.add(ble); + } + } + + // Second, iterate over collected traps and output information. + for (String c: traps.keySet()) { + ArrayList elist = traps.get(c); + String name = ((Compilation) elist.get(0)).getMethod().getFullName(); + System.out.println(name); + double start = 0; + for (LogEvent e: elist) { + if (start > e.getStart() && e.getStart() != 0) { + throw new InternalError("wrong sorting order for traps"); + } + start = e.getStart(); + out.print(e.getStart() + ": "); + if (e instanceof Compilation) { + ((Compilation) e).print(out, true, true, true); + } else { + e.print(out, true); + } + } + out.println(); + } + } + } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java index 366115b9bbf..3530961b2f5 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,14 +25,31 @@ package com.sun.hotspot.tools.compiler; import java.io.PrintStream; -import java.util.*; +/** + * The interface of an event from a HotSpot compilation log. Events can have a + * duration, e.g., a compiler {@link Phase} is an event, and so is an entire + * {@link Compilation}. + */ public interface LogEvent { + + /** + * The event's start time. + */ public double getStart(); + /** + * The event's duration in milliseconds. + */ public double getElapsedTime(); + /** + * The compilation during which this event was signalled. + */ public Compilation getCompilation(); - public void print(PrintStream stream); + /** + * Print the event to the given stream. + */ + public void print(PrintStream stream, boolean printID); } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java index 36bee04fc42..c275d2fcf46 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java @@ -33,30 +33,269 @@ import java.io.PrintStream; import java.io.Reader; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; +import java.util.Deque; import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.Stack; +import java.util.regex.Pattern; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; + import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; +import org.xml.sax.Locator; import org.xml.sax.helpers.DefaultHandler; -public class LogParser extends DefaultHandler implements ErrorHandler, Constants { +/** + * A SAX parser for HotSpot compilation logs. The bulk of the parsing and event + * maintenance work is done in the {@link #startElement(String,String,String,Attributes)} + * and {@link #endElement(String,String,String)} methods. + */ +public class LogParser extends DefaultHandler implements ErrorHandler { + + static final Pattern spacePattern = Pattern.compile(" "); + + /** + * Map internal array type descriptors to Java names. + */ + static final HashMap type2printableMap; + + /** + * Map Java primitive type names to internal type descriptors. + */ + static final HashMap type2vmtypeMap; - static final HashMap typeMap; static { - typeMap = new HashMap(); - typeMap.put("[I", "int[]"); - typeMap.put("[C", "char[]"); - typeMap.put("[Z", "boolean[]"); - typeMap.put("[L", "Object[]"); - typeMap.put("[B", "byte[]"); + type2printableMap = new HashMap<>(); + type2printableMap.put("[I", "int[]"); + type2printableMap.put("[C", "char[]"); + type2printableMap.put("[Z", "boolean[]"); + type2printableMap.put("[L", "Object[]"); + type2printableMap.put("[B", "byte[]"); + + type2vmtypeMap = new HashMap<>(); + type2vmtypeMap.put("void", "V"); + type2vmtypeMap.put("boolean", "Z"); + type2vmtypeMap.put("byte", "B"); + type2vmtypeMap.put("char", "C"); + type2vmtypeMap.put("short", "S"); + type2vmtypeMap.put("int", "I"); + type2vmtypeMap.put("long", "J"); + type2vmtypeMap.put("float", "F"); + type2vmtypeMap.put("double", "D"); } + static String[] bytecodes = new String[] { + "nop", + "aconst_null", + "iconst_m1", + "iconst_0", + "iconst_1", + "iconst_2", + "iconst_3", + "iconst_4", + "iconst_5", + "lconst_0", + "lconst_1", + "fconst_0", + "fconst_1", + "fconst_2", + "dconst_0", + "dconst_1", + "bipush", + "sipush", + "ldc", + "ldc_w", + "ldc2_w", + "iload", + "lload", + "fload", + "dload", + "aload", + "iload_0", + "iload_1", + "iload_2", + "iload_3", + "lload_0", + "lload_1", + "lload_2", + "lload_3", + "fload_0", + "fload_1", + "fload_2", + "fload_3", + "dload_0", + "dload_1", + "dload_2", + "dload_3", + "aload_0", + "aload_1", + "aload_2", + "aload_3", + "iaload", + "laload", + "faload", + "daload", + "aaload", + "baload", + "caload", + "saload", + "istore", + "lstore", + "fstore", + "dstore", + "astore", + "istore_0", + "istore_1", + "istore_2", + "istore_3", + "lstore_0", + "lstore_1", + "lstore_2", + "lstore_3", + "fstore_0", + "fstore_1", + "fstore_2", + "fstore_3", + "dstore_0", + "dstore_1", + "dstore_2", + "dstore_3", + "astore_0", + "astore_1", + "astore_2", + "astore_3", + "iastore", + "lastore", + "fastore", + "dastore", + "aastore", + "bastore", + "castore", + "sastore", + "pop", + "pop2", + "dup", + "dup_x1", + "dup_x2", + "dup2", + "dup2_x1", + "dup2_x2", + "swap", + "iadd", + "ladd", + "fadd", + "dadd", + "isub", + "lsub", + "fsub", + "dsub", + "imul", + "lmul", + "fmul", + "dmul", + "idiv", + "ldiv", + "fdiv", + "ddiv", + "irem", + "lrem", + "frem", + "drem", + "ineg", + "lneg", + "fneg", + "dneg", + "ishl", + "lshl", + "ishr", + "lshr", + "iushr", + "lushr", + "iand", + "land", + "ior", + "lor", + "ixor", + "lxor", + "iinc", + "i2l", + "i2f", + "i2d", + "l2i", + "l2f", + "l2d", + "f2i", + "f2l", + "f2d", + "d2i", + "d2l", + "d2f", + "i2b", + "i2c", + "i2s", + "lcmp", + "fcmpl", + "fcmpg", + "dcmpl", + "dcmpg", + "ifeq", + "ifne", + "iflt", + "ifge", + "ifgt", + "ifle", + "if_icmpeq", + "if_icmpne", + "if_icmplt", + "if_icmpge", + "if_icmpgt", + "if_icmple", + "if_acmpeq", + "if_acmpne", + "goto", + "jsr", + "ret", + "tableswitch", + "lookupswitch", + "ireturn", + "lreturn", + "freturn", + "dreturn", + "areturn", + "return", + "getstatic", + "putstatic", + "getfield", + "putfield", + "invokevirtual", + "invokespecial", + "invokestatic", + "invokeinterface", + "invokedynamic", + "new", + "newarray", + "anewarray", + "arraylength", + "athrow", + "checkcast", + "instanceof", + "monitorenter", + "monitorexit", + "wide", + "multianewarray", + "ifnull", + "ifnonnull", + "goto_w", + "jsr_w", + "breakpoint" + }; + + /** + * Sort log events by start time. + */ static Comparator sortByStart = new Comparator() { public int compare(LogEvent a, LogEvent b) { @@ -80,25 +319,29 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants return 7; } }; + + /** + * Sort log events first by the name of the compiled method, then by start + * time. In case one of the events has no associated compilation (or the + * associated compilation has no method name), the event with a compilation + * and/or name is considered the larger one. + */ static Comparator sortByNameAndStart = new Comparator() { public int compare(LogEvent a, LogEvent b) { Compilation c1 = a.getCompilation(); Compilation c2 = b.getCompilation(); - if (c1 != null && c2 != null) { + if (c1 != null && c1.getMethod() != null && c2 != null && c2.getMethod() != null) { int result = c1.getMethod().toString().compareTo(c2.getMethod().toString()); if (result != 0) { return result; } - } - double difference = (a.getStart() - b.getStart()); - if (difference < 0) { + } else if ((c1 == null || c1.getMethod() == null) && c2 != null && c2.getMethod() != null) { return -1; - } - if (difference > 0) { + } else if ((c2 == null || c2.getMethod() == null) && c1 != null && c1.getMethod() != null) { return 1; } - return 0; + return Double.compare(a.getStart(), b.getStart()); } public boolean equals(Object other) { @@ -110,6 +353,10 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants return 7; } }; + + /** + * Sort log events by duration. + */ static Comparator sortByElapsed = new Comparator() { public int compare(LogEvent a, LogEvent b) { @@ -134,6 +381,10 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } }; + /** + * Shrink-wrapped representation of a JVMState (tailored to meet this + * tool's needs). It only records a method and bytecode instruction index. + */ class Jvms { Jvms(Method method, int bci) { this.method = method; @@ -146,12 +397,33 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } } + /** + * Representation of a lock elimination. Locks, corresponding to + * synchronized blocks and method calls, may be eliminated if the object in + * question is guaranteed to be used thread-locally. + */ class LockElimination extends BasicLogEvent { - ArrayList jvms = new ArrayList(1); + /** + * Track all locations from which this lock was eliminated. + */ + ArrayList jvms = new ArrayList<>(1); + + /** + * The kind of lock (coarsened, nested, non-escaping, unknown). + */ final String kind; + + /** + * The lock class (unlock, lock, unknown). + */ final String classId; + + /** + * The precise type of lock. + */ final String tagName; + LockElimination(String tagName, double start, String id, String kind, String classId) { super(start, id); this.kind = kind; @@ -160,8 +432,11 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } @Override - public void print(PrintStream stream) { - stream.printf("%s %s %s %s %.3f ", getId(), tagName, kind, classId, getStart()); + public void print(PrintStream stream, boolean printID) { + if (printID) { + stream.printf("%s ", getId()); + } + stream.printf("%s %s %s %.3f ", tagName, kind, classId, getStart()); stream.print(jvms.toString()); stream.print("\n"); } @@ -172,25 +447,154 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } - private ArrayList events = new ArrayList(); + /** + * A list of log events. This is populated with the events found in the + * compilation log file during parsing. + */ + private ArrayList events = new ArrayList<>(); - private HashMap types = new HashMap(); - private HashMap methods = new HashMap(); - private LinkedHashMap nmethods = new LinkedHashMap(); - private HashMap compiles = new HashMap(); + /** + * Map compilation log IDs to type names. + */ + private HashMap types = new HashMap<>(); + + /** + * Map compilation log IDs to methods. + */ + private HashMap methods = new HashMap<>(); + + /** + * Map compilation IDs ({@see #makeId()}) to newly created nmethods. + */ + private LinkedHashMap nmethods = new LinkedHashMap<>(); + + /** + * Map compilation task IDs {@see #makeId()}) to {@link Compilation} + * objects. + */ + private HashMap compiles = new HashMap<>(); + + /** + * Track compilation failure reasons. + */ private String failureReason; - private int bci; - private Stack scopes = new Stack(); + + /** + * The current bytecode instruction index. + */ + private int current_bci; + + /** + * The current bytecode instruction. + */ + private int current_bytecode; + + /** + * A sequence of {@link CallSite}s representing a call stack. A scope + * typically holds several {@link CallSite}s that represent calls + * originating from that scope. + * + * New scopes are typically pushed when parse log events are encountered + * ({@see #startElement()}) and popped when parsing of a given Java method + * is done ({@see #endElement()}). Parsing events can be nested. Several + * other events add information to scopes ({@see #startElement()}). + */ + private Deque scopes = new ArrayDeque<>(); + + /** + * The current compilation. + */ private Compilation compile; + + /** + * The {@linkplain CallSite compilation scope} currently in focus. + */ private CallSite site; + + /** + * The {@linkplain CallSite method handle call site} currently under + * observation. + */ private CallSite methodHandleSite; - private Stack phaseStack = new Stack(); + + /** + * Keep track of potentially nested compiler {@linkplain Phase phases}. + */ + private Deque phaseStack = new ArrayDeque<>(); + + /** + * The {@linkplain LockElimination lock elimination event} currently being + * processed. + */ private LockElimination currentLockElimination; + + /** + * The {@linkplain UncommonTrapEvent uncommon trap event} currently being + * processed. + */ private UncommonTrapEvent currentTrap; - private Stack lateInlineScope; + + /** + * During the processing of a late inline event, this stack holds the + * {@link CallSite}s that represent the inlining event's call stack. + */ + private Deque lateInlineScope; + + /** + * Denote whether a late inlining event is currently being processed. + */ private boolean lateInlining; + /** + * A document locator to provide better error messages: this allows the + * tool to display in which line of the log file the problem occurred. + */ + private Locator locator; + /** + * Callback for the SAX framework to set the document locator. + */ + @Override + public void setDocumentLocator(Locator locator) { + this.locator = locator; + } + + /** + * Report an internal error explicitly raised, i.e., not derived from an + * exception. + * + * @param msg The error message to report. + */ + private void reportInternalError(String msg) { + reportInternalError(msg, null); + } + + /** + * Report an internal error derived from an exception. + * + * @param msg The beginning of the error message to report. The message + * from the exception will be appended to this. + * @param e The exception that led to the internal error. + */ + private void reportInternalError(String msg, Exception e) { + if (locator != null) { + msg += " at " + locator.getLineNumber() + ":" + locator.getColumnNumber(); + if (e != null) { + msg += " - " + e.getMessage(); + } + } + if (e != null) { + throw new Error(msg, e); + } else { + throw new Error(msg); + } + } + + /** + * Parse a long hexadecimal address into a {@code long} value. As Java only + * supports positive {@code long} values, extra error handling and parsing + * logic is provided. + */ long parseLong(String l) { try { return Long.decode(l).longValue(); @@ -207,16 +611,29 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants System.out.println(v1); System.out.println(v2); System.out.println(Long.toHexString(v1 + v2)); - throw new InternalError("bad conversion"); + reportInternalError("bad conversion"); } return v1 + v2; } } + /** + * Entry point for log file parsing with a file name. + * + * @param file The name of the log file to parse. + * @param cleanup Whether to perform bad XML cleanup during parsing (this + * is relevant for some log files generated by the 1.5 JVM). + * @return a list of {@link LogEvent} instances describing the events found + * in the log file. + */ public static ArrayList parse(String file, boolean cleanup) throws Exception { return parse(new FileReader(file), cleanup); } + /** + * Entry point for log file parsing with a file reader. + * {@see #parse(String,boolean)} + */ public static ArrayList parse(Reader reader, boolean cleanup) throws Exception { // Create the XML input factory SAXParserFactory factory = SAXParserFactory.newInstance(); @@ -238,31 +655,58 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants // Carry on with what we've got... } - // Associate compilations with their NMethods - for (NMethod nm : log.nmethods.values()) { - Compilation c = log.compiles.get(nm.getId()); - nm.setCompilation(c); - // Native wrappers for methods don't have a compilation - if (c != null) { - c.setNMethod(nm); + // Associate compilations with their NMethods and other kinds of events + for (LogEvent e : log.events) { + if (e instanceof BasicLogEvent) { + BasicLogEvent ble = (BasicLogEvent) e; + Compilation c = log.compiles.get(ble.getId()); + if (c == null) { + if (!(ble instanceof NMethod)) { + throw new InternalError("only nmethods should have a null compilation, here's a " + ble.getClass()); + } + continue; + } + ble.setCompilation(c); + if (ble instanceof NMethod) { + c.setNMethod((NMethod) ble); + } } } - // Initially we want the LogEvent log sorted by timestamp - Collections.sort(log.events, sortByStart); - return log.events; } + /** + * Retrieve a given attribute's value from a collection of XML tag + * attributes. Report an error if the requested attribute is not found. + * + * @param attr A collection of XML tag attributes. + * @param name The name of the attribute the value of which is to be found. + * @return The value of the requested attribute, or {@code null} if it was + * not found. + */ String search(Attributes attr, String name) { String result = attr.getValue(name); if (result != null) { return result; } else { - throw new InternalError("can't find " + name); + reportInternalError("can't find " + name); + return null; } } + /** + * Retrieve a given attribute's value from a collection of XML tag + * attributes. Return a default value if the requested attribute is not + * found. + * + * @param attr A collection of XML tag attributes. + * @param name The name of the attribute the value of which is to be found. + * @param defaultValue The default value to return if the attribute is not + * found. + * @return The value of the requested attribute, or the default value if it + * was not found. + */ String search(Attributes attr, String name, String defaultValue) { String result = attr.getValue(name); if (result != null) { @@ -270,33 +714,70 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } return defaultValue; } - int indent = 0; + /** + * Map a type ID from the compilation log to an actual type name. In case + * the type represents an internal array type descriptor, return a + * Java-level name. If the type ID cannot be mapped to a name, raise an + * error. + */ String type(String id) { String result = types.get(id); if (result == null) { - throw new InternalError(id); + reportInternalError(id); } - String remapped = typeMap.get(result); + String remapped = type2printableMap.get(result); if (remapped != null) { return remapped; } return result; } + /** + * Register a mapping from log file type ID to type name. + */ void type(String id, String name) { assert type(id) == null; types.put(id, name); } + /** + * Map a log file type ID to an internal type declarator. + */ + String sigtype(String id) { + String result = types.get(id); + String remapped = type2vmtypeMap.get(result); + if (remapped != null) { + return remapped; + } + if (result == null) { + reportInternalError(id); + } + if (result.charAt(0) == '[') { + return result; + } + return "L" + result + ";"; + } + + /** + * Retrieve a method based on the log file ID it was registered under. + * Raise an error if the ID does not map to a method. + */ Method method(String id) { Method result = methods.get(id); if (result == null) { - throw new InternalError(id); + reportInternalError(id); } return result; } + /** + * From a compilation ID and kind, assemble a compilation ID for inclusion + * in the output. + * + * @param atts A collection of XML attributes from which the required + * attributes are retrieved. + */ public String makeId(Attributes atts) { String id = atts.getValue("compile_id"); String kind = atts.getValue("kind"); @@ -306,11 +787,60 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants return id; } + /** + * Process the start of a compilation log XML element.
    + *
  • phase: record the beginning of a compilation phase, pushing + * it on the {@linkplain #phaseStack phase stack} and collecting + * information about the compiler graph.
    • + *
  • phase_done: record the end of a compilation phase, popping it + * off the {@linkplain #phaseStack phase stack} and collecting information + * about the compiler graph (number of nodes and live nodes).
    • + *
  • task: register the start of a new compilation.
    • + *
  • type: register a type.
    • + *
  • bc: note the current bytecode index and instruction name, + * updating {@link #current_bci} and {@link #current_bytecode}.
    • + *
  • klass: register a type (class).
    • + *
  • method: register a Java method.
    • + *
  • call: process a call, populating {@link #site} with the + * appropriate data.
    • + *
  • regalloc: record the register allocator's trip count in the + * {@linkplain #compile current compilation}.
    • + *
  • inline_fail: record the reason for a failed inline + * operation.
    • + *
  • inline_success: record a successful inlining operation, + * noting the success reason in the {@linkplain #site call site}.
    • + *
  • failure: note a compilation failure, storing the reason + * description in {@link #failureReason}.
    • + *
  • task_done: register the end of a compilation, recording time + * stamp and success information.
    • + *
  • make_not_entrant: deal with making a native method + * non-callable (e.g., during an OSR compilation, if there are still + * activations) or a zombie (when the method can be deleted).
    • + *
  • uncommon_trap: process an uncommon trap, setting the + * {@link #currentTrap} field.
    • + *
  • eliminate_lock: record the start of a lock elimination, + * setting the {@link #currentLockElimination} event.
    • + *
  • late_inline: start processing a late inline decision: + * initialize the {@linkplain #lateInlineScope inline scope stack}, create + * an {@linkplain #site initial scope} with a bogus bytecode index and the + * right inline ID, and push the scope with the inline ID attached. Note + * that most of late inlining processing happens in + * {@link #endElement()}.
    • + *
  • jvms: record a {@linkplain Jvms JVMState}. Depending on the + * context in which this event is encountered, this can mean adding + * information to the currently being processed trap, lock elimination, or + * inlining operation.
    • + *
  • inline_id: set the inline ID in the + * {@linkplain #site current call site}.
    • + *
  • nmethod: record the creation of a new {@link NMethod} and + * store it in the {@link #nmethods} map.
    • + *
  • parse: begin parsing a Java method's bytecode and + * transforming it into an initial compiler IR graph.
    • + *
  • parse_done: finish parsing a Java method's bytecode.
    • + *
+ */ @Override - public void startElement(String uri, - String localName, - String qname, - Attributes atts) { + public void startElement(String uri, String localName, String qname, Attributes atts) { if (qname.equals("phase")) { Phase p = new Phase(search(atts, "name"), Double.parseDouble(search(atts, "stamp")), @@ -322,45 +852,62 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants String phaseName = search(atts, "name", null); if (phaseName != null && !p.getId().equals(phaseName)) { System.out.println("phase: " + p.getId()); - throw new InternalError("phase name mismatch"); + reportInternalError("phase name mismatch"); } p.setEnd(Double.parseDouble(search(atts, "stamp"))); p.setEndNodes(Integer.parseInt(search(atts, "nodes", "0"))); p.setEndLiveNodes(Integer.parseInt(search(atts, "live", "0"))); compile.getPhases().add(p); } else if (qname.equals("task")) { + String id = makeId(atts); + + // Create the new Compilation instance and populate it with readily + // available data. compile = new Compilation(Integer.parseInt(search(atts, "compile_id", "-1"))); compile.setStart(Double.parseDouble(search(atts, "stamp"))); compile.setICount(search(atts, "count", "0")); compile.setBCount(search(atts, "backedge_count", "0")); - - String method = atts.getValue("method"); - int space = method.indexOf(' '); - method = method.substring(0, space) + "::" + - method.substring(space + 1, method.indexOf(' ', space + 1) + 1); + compile.setBCI(Integer.parseInt(search(atts, "osr_bci", "-1"))); String compiler = atts.getValue("compiler"); if (compiler == null) { compiler = ""; } + compile.setCompiler(compiler); + + // Extract the name of the compiled method. + String[] parts = spacePattern.split(atts.getValue("method")); + String methodName = parts[0] + "::" + parts[1]; + + // Continue collecting compilation meta-data. String kind = atts.getValue("compile_kind"); if (kind == null) { kind = "normal"; } if (kind.equals("osr")) { compile.setOsr(true); - compile.setOsr_bci(Integer.parseInt(search(atts, "osr_bci"))); } else if (kind.equals("c2i")) { - compile.setSpecial("--- adapter " + method); + compile.setSpecial("--- adapter " + methodName); } else { - compile.setSpecial(compile.getId() + " " + method + " (0 bytes)"); + compile.setSpecial(compile.getId() + " " + methodName + " (0 bytes)"); } + + // Build a dummy method to stuff in the Compilation at the + // beginning. + Method m = new Method(); + m.setHolder(parts[0]); + m.setName(parts[1]); + m.setSignature(parts[2]); + m.setFlags("0"); + m.setBytes("unknown"); + compile.setMethod(m); events.add(compile); - compiles.put(makeId(atts), compile); + compiles.put(id, compile); site = compile.getCall(); } else if (qname.equals("type")) { type(search(atts, "id"), search(atts, "name")); } else if (qname.equals("bc")) { - bci = Integer.parseInt(search(atts, "bci")); + current_bci = Integer.parseInt(search(atts, "bci")); + current_bytecode = Integer.parseInt(search(atts, "code")); } else if (qname.equals("klass")) { type(search(atts, "id"), search(atts, "name")); } else if (qname.equals("method")) { @@ -369,7 +916,19 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants m.setHolder(type(search(atts, "holder"))); m.setName(search(atts, "name")); m.setReturnType(type(search(atts, "return"))); - m.setArguments(search(atts, "arguments", "void")); + String arguments = atts.getValue("arguments");; + if (arguments == null) { + m.setSignature("()" + sigtype(atts.getValue("return"))); + } else { + String[] args = spacePattern.split(arguments); + StringBuilder sb = new StringBuilder("("); + for (int i = 0; i < args.length; i++) { + sb.append(sigtype(args[i])); + } + sb.append(")"); + sb.append(sigtype(atts.getValue("return"))); + m.setSignature(sb.toString()); + } if (search(atts, "unloaded", "0").equals("0")) { m.setBytes(search(atts, "bytes")); @@ -385,15 +944,17 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants if (lateInlining && scopes.size() == 0) { // re-attempting already seen call site (late inlining for MH invokes) if (m != site.getMethod()) { - if (bci != site.getBci()) { - System.out.println(m + " bci: " + bci); - System.out.println(site.getMethod() + " bci: " + site.getBci()); - throw new InternalError("bci mismatch after late inlining"); + if (current_bci != site.getBci()) { + System.err.println(m + " bci: " + current_bci); + System.err.println(site.getMethod() + " bci: " + site.getBci()); + reportInternalError("bci mismatch after late inlining"); } site.setMethod(m); } } else { - site = new CallSite(bci, m); + // We're dealing with a new call site; the called method is + // likely to be parsed next. + site = new CallSite(current_bci, m); } site.setCount(Integer.parseInt(search(atts, "count", "0"))); String receiver = atts.getValue("receiver"); @@ -403,7 +964,8 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } int methodHandle = Integer.parseInt(search(atts, "method_handle_intrinsic", "0")); if (lateInlining && scopes.size() == 0) { - // The call was added before this round of late inlining + // The call was already added before this round of late + // inlining. Ignore. } else if (methodHandle == 0) { scopes.peek().add(site); } else { @@ -421,18 +983,16 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants methodHandleSite = null; } if (lateInlining && scopes.size() == 0) { - site.setReason(search(atts, "reason")); + site.setReason("fail: " + search(atts, "reason")); lateInlining = false; } else { - scopes.peek().last().setReason(search(atts, "reason")); + scopes.peek().last().setReason("fail: " + search(atts, "reason")); } } else if (qname.equals("inline_success")) { if (methodHandleSite != null) { - throw new InternalError("method handle site should have been replaced"); - } - if (lateInlining && scopes.size() == 0) { - site.setReason(null); + reportInternalError("method handle site should have been replaced"); } + site.setReason("succeed: " + search(atts, "reason")); } else if (qname.equals("failure")) { failureReason = search(atts, "reason"); } else if (qname.equals("task_done")) { @@ -444,7 +1004,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } else if (qname.equals("make_not_entrant")) { String id = makeId(atts); NMethod nm = nmethods.get(id); - if (nm == null) throw new InternalError(); + if (nm == null) reportInternalError("nm == null"); LogEvent e = new MakeNotEntrantEvent(Double.parseDouble(search(atts, "stamp")), id, atts.getValue("zombie") != null, nm); events.add(e); @@ -459,8 +1019,22 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants Integer.parseInt(search(atts, "count", "0"))); events.add(currentTrap); } else { - // uncommon trap inserted during parsing. - // ignore for now + if (atts.getValue("method") != null) { + // These are messages from ciTypeFlow that don't + // actually correspond to generated code. + return; + } + try { + if (scopes.size() == 0) { + reportInternalError("scope underflow"); + } + scopes.peek().add(new UncommonTrap(Integer.parseInt(search(atts, "bci")), + search(atts, "reason"), + search(atts, "action"), + bytecodes[current_bytecode])); + } catch (Error e) { + e.printStackTrace(); + } } } else if (qname.startsWith("eliminate_lock")) { String id = atts.getValue("compile_id"); @@ -474,24 +1048,27 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } else if (qname.equals("late_inline")) { long inlineId = 0; try { - Long.parseLong(search(atts, "inline_id")); + inlineId = Long.parseLong(search(atts, "inline_id")); } catch (InternalError ex) { // Log files from older hotspots may lack inline_id, // and zero is an acceptable substitute that allows processing to continue. } - lateInlineScope = new Stack(); - site = new CallSite(-999, method(search(atts, "method"))); + lateInlineScope = new ArrayDeque<>(); + Method m = method(search(atts, "method")); + site = new CallSite(-999, m); site.setInlineId(inlineId); lateInlineScope.push(site); } else if (qname.equals("jvms")) { // if (currentTrap != null) { - currentTrap.addJVMS(atts.getValue("method"), Integer.parseInt(atts.getValue("bci"))); + String[] parts = spacePattern.split(atts.getValue("method")); + currentTrap.addMethodAndBCI(parts[0].replace('/', '.') + '.' + parts[1] + parts[2], Integer.parseInt(atts.getValue("bci"))); } else if (currentLockElimination != null) { currentLockElimination.addJVMS(method(atts.getValue("method")), Integer.parseInt(atts.getValue("bci"))); } else if (lateInlineScope != null) { - bci = Integer.parseInt(search(atts, "bci")); - site = new CallSite(bci, method(search(atts, "method"))); + current_bci = Integer.parseInt(search(atts, "bci")); + Method m = method(search(atts, "method")); + site = new CallSite(current_bci, m); lateInlineScope.push(site); } else { // Ignore , @@ -499,7 +1076,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } } else if (qname.equals("inline_id")) { if (methodHandleSite != null) { - throw new InternalError("method handle site should have been replaced"); + reportInternalError("method handle site should have been replaced"); } long id = Long.parseLong(search(atts, "id")); site.setInlineId(id); @@ -513,33 +1090,53 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants events.add(nm); } else if (qname.equals("parse")) { if (failureReason != null && scopes.size() == 0 && !lateInlining) { + // A compilation just failed, and we're back at a top + // compilation scope. failureReason = null; compile.reset(); site = compile.getCall(); } + // Error checking. if (methodHandleSite != null) { - throw new InternalError("method handle site should have been replaced"); + reportInternalError("method handle site should have been replaced"); } - Method m = method(search(atts, "method")); + Method m = method(search(atts, "method")); // this is the method being parsed if (lateInlining && scopes.size() == 0) { if (site.getMethod() != m) { - System.out.println(site.getMethod()); - System.out.println(m); - throw new InternalError("Unexpected method mismatch during late inlining"); + reportInternalError("Unexpected method mismatch during late inlining (method at call site: " + + site.getMethod() + ", method being parsed: " + m + ")"); } } + if (scopes.size() == 0 && !lateInlining) { + // The method being parsed is actually the method being + // compiled; i.e., we're dealing with a compilation top scope, + // which we must consequently push to the scopes stack. compile.setMethod(m); scopes.push(site); } else { + // The method being parsed is *not* the current compilation's + // top scope; i.e., we're dealing with an actual call site + // in the top scope or somewhere further down a call stack. if (site.getMethod() == m) { + // We're dealing with monomorphic inlining that didn't have + // to be narrowed down, because the receiver was known + // beforehand. scopes.push(site); - } else if (scopes.peek().getCalls().size() > 2 && m == scopes.peek().last(-2).getMethod()) { - scopes.push(scopes.peek().last(-2)); + } else if (scopes.peek().getCalls().size() > 2 && m == scopes.peek().lastButOne().getMethod()) { + // We're dealing with an at least bimorphic call site, and + // the compiler has now decided to parse the last-but-one + // method. The last one may already have been parsed for + // inlining. + scopes.push(scopes.peek().lastButOne()); } else { - // C1 prints multiple method tags during inlining when it narrows method being inlinied. - // Example: + // The method has been narrowed down to the one we're now + // going to parse, which is inlined here. It's monomorphic + // inlining, but was not immediately clear as such. + // + // C1 prints multiple method tags during inlining when it + // narrows the method being inlined. Example: // ... // // @@ -552,100 +1149,132 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants } } } else if (qname.equals("parse_done")) { - CallSite call = scopes.pop(); + // Attach collected information about IR nodes to the current + // parsing scope before it's popped off the stack in endElement() + // (see where the parse tag is handled). + CallSite call = scopes.peek(); call.setEndNodes(Integer.parseInt(search(atts, "nodes", "0"))); call.setEndLiveNodes(Integer.parseInt(search(atts, "live", "0"))); call.setTimeStamp(Double.parseDouble(search(atts, "stamp"))); - scopes.push(call); } } + /** + * Process the end of a compilation log XML element.
    + *
  • parse: finish transforming a Java method's bytecode + * instructions to an initial compiler IR graph.
    • + *
  • uncommon_trap: record the end of processing an uncommon trap, + * resetting {@link #currentTrap}.
    • + *
  • eliminate_lock: record the end of a lock elimination, + * resetting {@link #currentLockElimination}.
    • + *
  • late_inline: the closing tag for late_inline does not denote + * the end of a late inlining operation, but the end of the descriptive log + * data given at its beginning. That is, we're now in the position to + * assemble details about the inlining chain (bytecode instruction index in + * caller, called method). The {@link #lateInlining} flag is set to + * {@code true} here. (It will be reset when parsing the inlined methods is + * done; this happens for the successful case in this method as well, when + * {@code parse} elements are processed; and for inlining failures, in + * {@link #startElement()}, when {@code inline_fail} elements are + * processed.)
    • + *
  • task: perform cleanup at the end of a compilation. Note that + * the explicit {@code task_done} event is handled in + * {@link #startElement()}.
    • + *
+ */ @Override - public void endElement(String uri, - String localName, - String qname) { - if (qname.equals("parse")) { - indent -= 2; - scopes.pop(); - if (scopes.size() == 0) { - lateInlining = false; - } - } else if (qname.equals("uncommon_trap")) { - currentTrap = null; - } else if (qname.startsWith("eliminate_lock")) { - currentLockElimination = null; - } else if (qname.equals("late_inline")) { - // Populate late inlining info. - if (scopes.size() != 0) { - throw new InternalError("scopes should be empty for late inline"); - } - // late inline scopes are specified in reverse order: - // compiled method should be on top of stack. - CallSite caller = lateInlineScope.pop(); - Method m = compile.getMethod(); - if (m != caller.getMethod()) { - System.err.println(m); - System.err.println(caller.getMethod() + " bci: " + bci); - throw new InternalError("call site and late_inline info don't match"); - } - - // late_inline contains caller+bci info, convert it - // to bci+callee info used by LogCompilation. - CallSite lateInlineSite = compile.getLateInlineCall(); - ArrayDeque thisCallScopes = new ArrayDeque(); - do { - bci = caller.getBci(); - // Next inlined call. - caller = lateInlineScope.pop(); - CallSite callee = new CallSite(bci, caller.getMethod()); - callee.setInlineId(caller.getInlineId()); - thisCallScopes.addLast(callee); - lateInlineSite.add(callee); - lateInlineSite = callee; - } while (!lateInlineScope.empty()); - - site = compile.getCall().findCallSite(thisCallScopes); - if (site == null) { - System.out.println("call scopes:"); - for (CallSite c : thisCallScopes) { - System.out.println(c.getMethod() + " " + c.getBci() + " " + c.getInlineId()); + public void endElement(String uri, String localName, String qname) { + try { + if (qname.equals("parse")) { + // Finish dealing with the current call scope. If no more are + // left, no late inlining can be going on. + scopes.pop(); + if (scopes.size() == 0) { + lateInlining = false; } - CallSite c = thisCallScopes.getLast(); - if (c.getInlineId() != 0) { - System.out.println("Looking for call site in entire tree:"); - ArrayDeque stack = compile.getCall().findCallSite2(c); - for (CallSite c2 : stack) { - System.out.println(c2.getMethod() + " " + c2.getBci() + " " + c2.getInlineId()); + } else if (qname.equals("uncommon_trap")) { + currentTrap = null; + } else if (qname.startsWith("eliminate_lock")) { + currentLockElimination = null; + } else if (qname.equals("late_inline")) { + // Populate late inlining info. + if (scopes.size() != 0) { + reportInternalError("scopes should be empty for late inline"); + } + // late inline scopes are specified in reverse order: + // compiled method should be on top of stack. + CallSite caller = lateInlineScope.pop(); + Method m = compile.getMethod(); + if (!m.equals(caller.getMethod())) { + reportInternalError(String.format("call site and late_inline info don't match:\n method %s\n caller method %s, bci %d", m, caller.getMethod(), current_bci)); + } + + // Walk down the inlining chain and assemble bci+callee info. + // This needs to be converted from caller+bci info contained in + // the late_inline data. + CallSite lateInlineSite = compile.getLateInlineCall(); + ArrayDeque thisCallScopes = new ArrayDeque<>(); + do { + current_bci = caller.getBci(); + // Next inlined call. + caller = lateInlineScope.pop(); + CallSite callee = new CallSite(current_bci, caller.getMethod()); + callee.setInlineId(caller.getInlineId()); + thisCallScopes.addLast(callee); + lateInlineSite.add(callee); + lateInlineSite = callee; + } while (!lateInlineScope.isEmpty()); + + site = compile.getCall().findCallSite(thisCallScopes); + if (site == null) { + // Call site could not be found - report the problem in detail. + System.err.println("call scopes:"); + for (CallSite c : thisCallScopes) { + System.err.println(c.getMethod() + " " + c.getBci() + " " + c.getInlineId()); + } + CallSite c = thisCallScopes.getLast(); + if (c.getInlineId() != 0) { + System.err.println("Looking for call site in entire tree:"); + ArrayDeque stack = compile.getCall().findCallSite2(c); + for (CallSite c2 : stack) { + System.err.println(c2.getMethod() + " " + c2.getBci() + " " + c2.getInlineId()); + } + } + System.err.println(caller.getMethod() + " bci: " + current_bci); + reportInternalError("couldn't find call site"); + } + lateInlining = true; + + if (caller.getBci() != -999) { + System.out.println(caller.getMethod()); + reportInternalError("broken late_inline info"); + } + if (site.getMethod() != caller.getMethod()) { + if (site.getInlineId() == caller.getInlineId()) { + site.setMethod(caller.getMethod()); + } else { + System.out.println(site.getMethod()); + System.out.println(caller.getMethod()); + reportInternalError("call site and late_inline info don't match"); } } - System.out.println(caller.getMethod() + " bci: " + bci); - throw new InternalError("couldn't find call site"); + // late_inline is followed by parse with scopes.size() == 0, + // 'site' will be pushed to scopes. + lateInlineScope = null; + } else if (qname.equals("task")) { + types.clear(); + methods.clear(); + site = null; } - lateInlining = true; - - if (caller.getBci() != -999) { - System.out.println(caller.getMethod()); - throw new InternalError("broken late_inline info"); - } - if (site.getMethod() != caller.getMethod()) { - if (site.getInlineId() == caller.getInlineId()) { - site.setMethod(caller.getMethod()); - } else { - System.out.println(site.getMethod()); - System.out.println(caller.getMethod()); - throw new InternalError("call site and late_inline info don't match"); - } - } - // late_inline is followed by parse with scopes.size() == 0, - // 'site' will be pushed to scopes. - lateInlineScope = null; - } else if (qname.equals("task")) { - types.clear(); - methods.clear(); - site = null; + } catch (Exception e) { + reportInternalError("exception while processing end element", e); } } + // + // Handlers for problems that occur in XML parsing itself. + // + @Override public void warning(org.xml.sax.SAXParseException e) { System.err.println(e.getMessage() + " at line " + e.getLineNumber() + ", column " + e.getColumnNumber()); diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java index 9bc089673f9..5d73ebaa4ce 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,14 +21,25 @@ * questions. * */ - package com.sun.hotspot.tools.compiler; import java.io.PrintStream; +/** + * In a compilation log, represent the event of making a given compiled method + * not-entrant, e.g., during an OSR compilation. + */ class MakeNotEntrantEvent extends BasicLogEvent { + + /** + * Denote whether the method is marked as a zombie, i.e., no further + * activations exist. + */ private final boolean zombie; + /** + * The method in question. + */ private NMethod nmethod; MakeNotEntrantEvent(double s, String i, boolean z, NMethod nm) { @@ -41,7 +52,7 @@ class MakeNotEntrantEvent extends BasicLogEvent { return nmethod; } - public void print(PrintStream stream) { + public void print(PrintStream stream, boolean printID) { if (isZombie()) { stream.printf("%s make_zombie\n", getId()); } else { diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java index ffce1dee973..dc4ac79b131 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,16 +26,58 @@ package com.sun.hotspot.tools.compiler; import java.util.Arrays; -public class Method implements Constants { +import static com.sun.hotspot.tools.compiler.Constants.*; +/** + * Representation of a Java method in a compilation log. + */ +public class Method { + + /** + * The name of the class holding the method. + */ private String holder; + + /** + * The method's name. + */ private String name; + + /** + * The return type of the method, as a fully qualified (source-level) class + * or primitive type name. + */ private String returnType; - private String arguments; + + /** + * The method's signature, in internal form. + */ + private String signature; + + /** + * The length of the method's byte code. + */ private String bytes; + + /** + * The number of times this method was invoked in the interpreter. + */ private String iicount; + + /** + * The method's flags, in the form of a {@code String} representing the + * {@code int} encoding them. + */ private String flags; + /** + * Decode the {@link flags} numerical string to a format for console + * output. The result does not honour all possible flags but includes + * information about OSR compilation. + * + * @param osr_bci the byte code index at which an OSR compilation takes + * place, or -1 if the compilation is not an OSR one. + */ String decodeFlags(int osr_bci) { int f = Integer.parseInt(getFlags()); char[] c = new char[4]; @@ -49,6 +91,12 @@ public class Method implements Constants { return new String(c); } + /** + * Format this method for console output. + * + * @param osr_bci the byte code index at which OSR takes place, or -1 if no + * OSR compilation is going on. + */ String format(int osr_bci) { if (osr_bci >= 0) { return getHolder() + "::" + getName() + " @ " + osr_bci + " (" + getBytes() + " bytes)"; @@ -62,6 +110,10 @@ public class Method implements Constants { return getHolder() + "::" + getName() + " (" + getBytes() + " bytes)"; } + public String getFullName() { + return getHolder().replace('/', '.') + "." + getName() + signature; + } + public String getHolder() { return holder; } @@ -86,12 +138,16 @@ public class Method implements Constants { this.returnType = returnType; } - public String getArguments() { - return arguments; + public String getSignature() { + return signature; } - public void setArguments(String arguments) { - this.arguments = arguments; + public void setSignature(String signature) { + this.signature = signature.replace('/', '.'); + } + + public String getArguments() { + return signature.substring(0, signature.indexOf(')') + 1); } public String getBytes() { @@ -121,10 +177,13 @@ public class Method implements Constants { @Override public boolean equals(Object o) { if (o instanceof Method) { - Method other = (Method)o; - return holder.equals(other.holder) && name.equals(other.name) && - arguments.equals(other.arguments) && returnType.equals(other.returnType); + Method other = (Method) o; + return holder.equals(other.holder) && name.equals(other.name) && signature.equals(other.signature); } return false; } + + public int hashCode() { + return holder.hashCode() ^ name.hashCode(); + } } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java index 4cd98bb0e1b..9d07a771bf6 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,9 +26,20 @@ package com.sun.hotspot.tools.compiler; import java.io.PrintStream; +/** + * A compilation log event that is signalled whenever a new nmethod (a native + * method, a compilation result) is created. + */ public class NMethod extends BasicLogEvent { + /** + * The nmethod's starting address in memory. + */ private long address; + + /** + * The nmethod's size in bytes. + */ private long size; NMethod(double s, String i, long a, long sz) { @@ -37,7 +48,7 @@ public class NMethod extends BasicLogEvent { size = sz; } - public void print(PrintStream out) { + public void print(PrintStream out, boolean printID) { // XXX Currently we do nothing // throw new InternalError(); } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java index af160abb81a..854528be69a 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,11 +26,30 @@ package com.sun.hotspot.tools.compiler; import java.io.PrintStream; +/** + * Representation of a compilation phase as a log event. + */ public class Phase extends BasicLogEvent { + /** + * The number of nodes in the compilation at the beginning of this phase. + */ private final int startNodes; + + /** + * The number of nodes in the compilation at the end of this phase. + */ private int endNodes; + + /** + * The number of live nodes in the compilation at the beginning of this + * phase. + */ private final int startLiveNodes; + + /** + * The number of live nodes in the compilation at the end of this phase. + */ private int endLiveNodes; Phase(String n, double s, int nodes, int live) { @@ -58,8 +77,11 @@ public class Phase extends BasicLogEvent { public int getEndNodes() { return endNodes; } - /* Number of live nodes added by the phase */ - int getLiveNodes() { + + /** + * The number of live nodes added by this phase. + */ + int getAddedLiveNodes() { return getEndLiveNodes() - getStartLiveNodes(); } @@ -76,7 +98,7 @@ public class Phase extends BasicLogEvent { } @Override - public void print(PrintStream stream) { + public void print(PrintStream stream, boolean printID) { throw new UnsupportedOperationException("Not supported yet."); } } diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java new file mode 100644 index 00000000000..c4401c59a87 --- /dev/null +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ +package com.sun.hotspot.tools.compiler; + +import java.io.PrintStream; + +/** + * An instance of this class represents an uncommon trap associated with a + * given bytecode instruction. An uncommon trap is described in terms of its + * reason and action to be taken. An instance of this class is always relative + * to a specific method and only contains the relevant bytecode instruction + * index. + */ +class UncommonTrap { + + private int bci; + private String reason; + private String action; + private String bytecode; + + public UncommonTrap(int b, String r, String a, String bc) { + bci = b; + reason = r; + action = a; + bytecode = bc; + } + + public int getBCI() { + return bci; + } + + public String getReason() { + return reason; + } + + public String getAction() { + return action; + } + + public String getBytecode() { + return bytecode; + } + + void emit(PrintStream stream, int indent) { + for (int i = 0; i < indent; i++) { + stream.print(' '); + } + } + + public void print(PrintStream stream, int indent) { + emit(stream, indent); + stream.println(this); + } + + public String toString() { + return "@ " + bci + " " + getBytecode() + " uncommon trap " + getReason() + " " + getAction(); + } +} diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java index 231e1e4ffaf..fd3ef92afcd 100644 --- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java +++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java @@ -21,17 +21,33 @@ * questions. * */ - package com.sun.hotspot.tools.compiler; import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; +/** + * Represents an uncommon trap encountered during a compilation. + */ class UncommonTrapEvent extends BasicLogEvent { private final String reason; private final String action; + + /** + * Denote how many times this trap has been encountered. + */ private int count; - private String jvms = ""; + + /** + * The name of the bytecode instruction at which the trap occurred. + */ + private String bytecode; + + private List jvmsMethods = new ArrayList<>(); + + private List jvmsBCIs = new ArrayList<>(); UncommonTrapEvent(double s, String i, String r, String a, int c) { super(s, i); @@ -40,20 +56,26 @@ class UncommonTrapEvent extends BasicLogEvent { count = c; } - - public void addJVMS(String method, int bci) { - setJvms(getJvms() + " @" + bci + " " + method + "\n"); - } - public void updateCount(UncommonTrapEvent trap) { setCount(Math.max(getCount(), trap.getCount())); } - public void print(PrintStream stream) { - stream.printf("%s uncommon trap %.3f %s %s\n", getId(), getStart(), getReason(), getAction()); - stream.print(getJvms()); + public void print(PrintStream stream, boolean printID) { + if (printID) { + stream.print(getId() + " "); + } + stream.printf("uncommon trap %s %s %s\n", bytecode, getReason(), getAction()); + int indent = 2; + for (int j = 0; j < jvmsMethods.size(); j++) { + for (int i = 0; i < indent; i++) { + stream.print(' '); + } + stream.println("@ " + jvmsBCIs.get(j) + " " + jvmsMethods.get(j)); + indent += 2; + } } + public String getReason() { return reason; } @@ -70,15 +92,56 @@ class UncommonTrapEvent extends BasicLogEvent { this.count = count; } - public String getJvms() { - return jvms; - } - - public void setJvms(String jvms) { - this.jvms = jvms; - } - + /** + * Set the compilation for this event. This involves identifying the call + * site to which this uncommon trap event belongs. In addition to setting + * the {@link #compilation} link, this method will consequently also set + * the {@link #bytecode} field. + */ public void setCompilation(Compilation compilation) { - this.compilation = compilation; + super.setCompilation(compilation); + // Attempt to associate a bytecode with with this trap + CallSite site = compilation.getCall(); + int i = 0; + try { + List traps = site.getTraps(); + while (i + 1 < jvmsMethods.size()) { + if (!jvmsMethods.get(i).equals(site.getMethod().getFullName())) { + throw new InternalError(jvmsMethods.get(i) + " != " + site.getMethod().getFullName()); + } + CallSite result = null; + for (CallSite call : site.getCalls()) { + if (call.getBci() == jvmsBCIs.get(i) && + call.getMethod().getFullName().equals(jvmsMethods.get(i + 1)) && + call.getReceiver() == null) { + result = call; + i++; + break; + } + } + if (result == null) { + throw new InternalError("couldn't find call site"); + } + site = result; + traps = site.getTraps(); + } + for (UncommonTrap trap : traps) { + if (trap.getBCI() == jvmsBCIs.get(i) && + trap.getReason().equals(getReason()) && + trap.getAction().equals(getAction())) { + bytecode = trap.getBytecode(); + return; + } + } + throw new InternalError("couldn't find bytecode"); + } catch (Exception e) { + bytecode = ""; + } } + + public void addMethodAndBCI(String method, int bci) { + jvmsMethods.add(0, method); + jvmsBCIs.add(0, bci); + } + } diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp index 763ea5e1db0..0efeefb2f37 100644 --- a/hotspot/src/share/vm/compiler/compileBroker.cpp +++ b/hotspot/src/share/vm/compiler/compileBroker.cpp @@ -501,8 +501,8 @@ void CompileTask::log_task(xmlStream* log) { methodHandle method(thread, this->method()); ResourceMark rm(thread); - // - log->print(" compile_id='%d'", _compile_id); + // + log->print(" compiler='%s' compile_id='%d'", _comp_level <= CompLevel_full_profile ? "C1" : "C2", _compile_id); if (_osr_bci != CompileBroker::standard_entry_bci) { log->print(" compile_kind='osr'"); // same as nmethod::compile_kind } // else compile_kind='c2c' From c797c78253a8f3fca6fc665fe474b79332a65d4e Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Thu, 9 Jul 2015 12:56:38 +0200 Subject: [PATCH 06/56] 8032763: Remove use of sun.misc.Ref from hprof parser in testlibrary Reviewed-by: jbachorik, alanb --- .../share/classes/jdk/test/lib/hprof/model/Snapshot.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java index 635c0baa9a0..6150543b36b 100644 --- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java +++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java @@ -276,10 +276,8 @@ public class Snapshot implements AutoCloseable { fakeClasses.clear(); weakReferenceClass = findClass("java.lang.ref.Reference"); - if (weakReferenceClass == null) { // JDK 1.1.x - weakReferenceClass = findClass("sun.misc.Ref"); - referentFieldIndex = 0; - } else { + referentFieldIndex = 0; + if (weakReferenceClass != null) { JavaField[] fields = weakReferenceClass.getFieldsForInstance(); for (int i = 0; i < fields.length; i++) { if ("referent".equals(fields[i].getName())) { From 00da567d15c279c03e15be633387a2b945abb230 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Thu, 9 Jul 2015 08:36:37 -0400 Subject: [PATCH 07/56] 8130183: InnerClasses: VM permits wrong inner_class_info_index value of zero Throw ClassFormatError if InnerClasses attribute's inner_class_info_index is 0 Reviewed-by: acorn, lfoltan --- .../share/vm/classfile/classFileParser.cpp | 3 +- .../classFileParserBug/EnclosingMethod.java | 45 ++++++++++++++ .../classFileParserBug/badEnclMthd.jcod | 60 +++++++++++++++++++ 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 hotspot/test/runtime/classFileParserBug/EnclosingMethod.java create mode 100644 hotspot/test/runtime/classFileParserBug/badEnclMthd.jcod diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp index 1d76a95622b..5191c5cca66 100644 --- a/hotspot/src/share/vm/classfile/classFileParser.cpp +++ b/hotspot/src/share/vm/classfile/classFileParser.cpp @@ -2692,8 +2692,7 @@ u2 ClassFileParser::parse_classfile_inner_classes_attribute(u1* inner_classes_at // Inner class index u2 inner_class_info_index = cfs->get_u2_fast(); check_property( - inner_class_info_index == 0 || - valid_klass_reference_at(inner_class_info_index), + valid_klass_reference_at(inner_class_info_index), "inner_class_info_index %u has bad constant type in class file %s", inner_class_info_index, CHECK_0); // Outer class index diff --git a/hotspot/test/runtime/classFileParserBug/EnclosingMethod.java b/hotspot/test/runtime/classFileParserBug/EnclosingMethod.java new file mode 100644 index 00000000000..fbdffcc62ed --- /dev/null +++ b/hotspot/test/runtime/classFileParserBug/EnclosingMethod.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/* + * @test + * @bug 8130183 + * @summary For InnerClasses attribute, VM permits inner_class_info_index value of zero + * @compile badEnclMthd.jcod + * @run main/othervm -Xverify:all EnclosingMethod + */ + +// Test that an EnclosingMethod attribute with the value of 0 causes a ClassFormatError. +public class EnclosingMethod { + public static void main(String args[]) throws Throwable { + + System.out.println("Regression test for bug 8130183"); + try { + Class newClass = Class.forName("badEnclMthd"); + throw new RuntimeException("Expected ClassFormatError exception not thrown"); + } catch (java.lang.ClassFormatError e) { + System.out.println("Test EnclosingMethod passed"); + } + } +} diff --git a/hotspot/test/runtime/classFileParserBug/badEnclMthd.jcod b/hotspot/test/runtime/classFileParserBug/badEnclMthd.jcod new file mode 100644 index 00000000000..b09bcbf3615 --- /dev/null +++ b/hotspot/test/runtime/classFileParserBug/badEnclMthd.jcod @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +// Source: badEnclMthd +class badEnclMthd { + 0xCAFEBABE; + 0; // minor version + 50; // major version + [] { // Constant Pool + ; // first element is empty + Utf8 "badEnclMthd"; // #1 + class #1; // #2 + Utf8 "java/lang/Object"; // #3 + class #3; // #4 + Utf8 "InnerClasses"; // #5 + Utf8 "badEnclMthd"; // #6 + class #6; // #7 + Utf8 "badEnclMthd"; // #8 + class #8; // #9 + } // Constant Pool + 0x0001; // access public + #2;// this_cpx + #4;// super_cpx + [] { // interfaces + } // interfaces + [] { // fields + } // fields + [] { // methods + } // methods + [] { // attributes + Attr(#5) { // InnerClasses + [] { // InnerClasses + #0 #2 #6 1; // Bad inner_class_info_index of 0 !!! + #9 #0 #8 1; + } + } // end InnerClasses + ; + } // attributes +} // end class badEnclMthd From 9d7677a83fe7553e7307f4c6fa443f02f5e7f0d9 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Thu, 9 Jul 2015 15:39:05 -0400 Subject: [PATCH 08/56] 8130669: VM prohibits methods with return values Ignore methods with return values instead of throwing ClassFormatError exceptions Reviewed-by: acorn, iklam --- .../share/vm/classfile/classFileParser.cpp | 4 +- hotspot/src/share/vm/classfile/verifier.cpp | 2 +- .../classFileParserBug/BadInitMethod.java | 54 +++++++++++++++++++ .../runtime/classFileParserBug/badInit.jasm | 47 ++++++++++++++++ .../classFileParserBug/ignoredClinit.jasm | 39 ++++++++++++++ 5 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 hotspot/test/runtime/classFileParserBug/BadInitMethod.java create mode 100644 hotspot/test/runtime/classFileParserBug/badInit.jasm create mode 100644 hotspot/test/runtime/classFileParserBug/ignoredClinit.jasm diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp index 5191c5cca66..e60c3a61d90 100644 --- a/hotspot/src/share/vm/classfile/classFileParser.cpp +++ b/hotspot/src/share/vm/classfile/classFileParser.cpp @@ -5087,8 +5087,8 @@ int ClassFileParser::verify_legal_method_signature(Symbol* name, Symbol* signatu // The first non-signature thing better be a ')' if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { length--; - if (name->utf8_length() > 0 && name->byte_at(0) == '<') { - // All internal methods must return void + if (name == vmSymbols::object_initializer_name()) { + // All "" methods must return void if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { return args_size; } diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp index cdfe83edd9b..6069422643d 100644 --- a/hotspot/src/share/vm/classfile/verifier.cpp +++ b/hotspot/src/share/vm/classfile/verifier.cpp @@ -2846,7 +2846,7 @@ void ClassVerifier::verify_invoke_instructions( if (sig_stream.type() != T_VOID) { if (method_name == vmSymbols::object_initializer_name()) { // method must have a void return type - /* Unreachable? Class file parser verifies that methods with '<' have + /* Unreachable? Class file parser verifies that methods have * void return */ verify_error(ErrorContext::bad_code(bci), "Return type must be void in method"); diff --git a/hotspot/test/runtime/classFileParserBug/BadInitMethod.java b/hotspot/test/runtime/classFileParserBug/BadInitMethod.java new file mode 100644 index 00000000000..3ac58a61f71 --- /dev/null +++ b/hotspot/test/runtime/classFileParserBug/BadInitMethod.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/* + * @test + * @bug 8130669 + * @summary VM prohibits methods with return values + * @compile ignoredClinit.jasm + * @compile badInit.jasm + * @run main/othervm -Xverify:all BadInitMethod + */ + +// Test that a non-void method does not cause an exception to be +// thrown. But that a non-void method causes a ClassFormatError +// exception. +public class BadInitMethod { + public static void main(String args[]) throws Throwable { + + System.out.println("Regression test for bug 8130669"); + try { + Class newClass = Class.forName("ignoredClinit"); + } catch (java.lang.Throwable e) { + throw new RuntimeException("Unexpected exception: " + e.getMessage()); + } + + try { + Class newClass = Class.forName("badInit"); + throw new RuntimeException("Expected ClassFormatError exception not thrown"); + } catch (java.lang.ClassFormatError e) { + System.out.println("Test BadInitMethod passed"); + } + } +} diff --git a/hotspot/test/runtime/classFileParserBug/badInit.jasm b/hotspot/test/runtime/classFileParserBug/badInit.jasm new file mode 100644 index 00000000000..9311ab5e195 --- /dev/null +++ b/hotspot/test/runtime/classFileParserBug/badInit.jasm @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +super public class badInit + version 52:0 +{ + + +// This method has a non-void signature. It should cause a +// ClassFormatError exception. +Method "":"(I)I" + stack 1 locals 2 +{ + aload_0; + invokespecial Method java/lang/Object."":"()V"; + iconst_4; + ireturn; +} + +public static Method main:"([Ljava/lang/String;)V" + stack 0 locals 1 +{ + return; +} + +} // end Class badInit diff --git a/hotspot/test/runtime/classFileParserBug/ignoredClinit.jasm b/hotspot/test/runtime/classFileParserBug/ignoredClinit.jasm new file mode 100644 index 00000000000..466b895b042 --- /dev/null +++ b/hotspot/test/runtime/classFileParserBug/ignoredClinit.jasm @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +// This class contains a method with signature: ()I. The JVM should +// not complain about this because methods named that have arguments +// and/or are not void should be ignored by the JVM. + +public class ignoredClinit version 51:0 +{ + + public static Method "":"()I" + stack 1 locals 1 + { + iconst_0; + ireturn; + } + +} // end Class ignoredClinit From d8e8d8f1fa00a052c73eb5a353f01cd4e57cb17a Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Fri, 10 Jul 2015 14:48:13 +0200 Subject: [PATCH 09/56] 8076471: Remove hprof agent tests in JDK Reviewed-by: alanb --- jdk/test/ProblemList.txt | 17 - jdk/test/TEST.groups | 4 +- jdk/test/demo/jvmti/Context.java | 188 ----------- jdk/test/demo/jvmti/DemoRun.java | 219 ------------- jdk/test/demo/jvmti/HeapUser.java | 72 ---- jdk/test/demo/jvmti/Hello.java | 35 -- .../CompiledMethodLoadTest.java | 51 --- jdk/test/demo/jvmti/gctest/BigHello.java | 47 --- jdk/test/demo/jvmti/gctest/Gctest.java | 51 --- .../jvmti/heapTracker/HeapTrackerTest.java | 52 --- .../demo/jvmti/heapViewer/HeapViewerTest.java | 52 --- jdk/test/demo/jvmti/hprof/CpuOldTest.java | 51 --- jdk/test/demo/jvmti/hprof/CpuSamplesTest.java | 51 --- .../jvmti/hprof/CpuTimesDefineClassTest.java | 53 --- jdk/test/demo/jvmti/hprof/CpuTimesTest.java | 51 --- jdk/test/demo/jvmti/hprof/DefineClass.java | 70 ---- jdk/test/demo/jvmti/hprof/HeapAllTest.java | 51 --- .../jvmti/hprof/HeapBinaryFormatTest.java | 64 ---- jdk/test/demo/jvmti/hprof/HeapDumpTest.java | 51 --- jdk/test/demo/jvmti/hprof/HeapSitesTest.java | 51 --- jdk/test/demo/jvmti/hprof/HelloWorld.java | 119 ------- jdk/test/demo/jvmti/hprof/MonitorTest.java | 56 ---- jdk/test/demo/jvmti/hprof/OptionsTest.java | 62 ---- .../demo/jvmti/hprof/StackMapTableTest.java | 63 ---- .../demo/jvmti/hprof/UseAllBytecodes.java | 309 ------------------ jdk/test/demo/jvmti/minst/MinstExample.java | 39 --- jdk/test/demo/jvmti/minst/MinstTest.java | 52 --- .../FailsWhenJvmtiVersionDiffers.java | 57 ---- jdk/test/demo/jvmti/waiters/WaitersTest.java | 52 --- 29 files changed, 1 insertion(+), 2089 deletions(-) delete mode 100644 jdk/test/demo/jvmti/Context.java delete mode 100644 jdk/test/demo/jvmti/DemoRun.java delete mode 100644 jdk/test/demo/jvmti/HeapUser.java delete mode 100644 jdk/test/demo/jvmti/Hello.java delete mode 100644 jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java delete mode 100644 jdk/test/demo/jvmti/gctest/BigHello.java delete mode 100644 jdk/test/demo/jvmti/gctest/Gctest.java delete mode 100644 jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java delete mode 100644 jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/CpuOldTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/CpuSamplesTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/CpuTimesTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/DefineClass.java delete mode 100644 jdk/test/demo/jvmti/hprof/HeapAllTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/HeapDumpTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/HeapSitesTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/HelloWorld.java delete mode 100644 jdk/test/demo/jvmti/hprof/MonitorTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/OptionsTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/StackMapTableTest.java delete mode 100644 jdk/test/demo/jvmti/hprof/UseAllBytecodes.java delete mode 100644 jdk/test/demo/jvmti/minst/MinstExample.java delete mode 100644 jdk/test/demo/jvmti/minst/MinstTest.java delete mode 100644 jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java delete mode 100644 jdk/test/demo/jvmti/waiters/WaitersTest.java diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 22078493fab..dce94ecfeff 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -154,17 +154,6 @@ javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java generi ############################################################################ -# jdk_math - -############################################################################ - -# jdk_other - -# 6988950 -demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java generic-all - -############################################################################ - # jdk_net # 7148829 @@ -387,10 +376,4 @@ sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java generic-all # 8064572 8060736 8062938 sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all -# 8079273 -demo/jvmti/hprof/CpuOldTest.java generic-all -demo/jvmti/hprof/CpuTimesTest.java generic-all -demo/jvmti/hprof/OptionsTest.java generic-all -demo/jvmti/hprof/StackMapTableTest.java generic-all - ############################################################################ diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups index f9e6753b340..9a985dd0e4c 100644 --- a/jdk/test/TEST.groups +++ b/jdk/test/TEST.groups @@ -223,8 +223,7 @@ svc_tools = \ sun/tools \ -sun/tools/java \ -sun/tools/jrunscript \ - sun/jvmstat \ - demo/jvmti + sun/jvmstat jdk_tools = \ :core_tools \ @@ -435,7 +434,6 @@ jdk = \ needs_jdk = \ :jdk_jdi \ com/sun/tools \ - demo \ sun/security/tools/jarsigner \ sun/security/tools/policytool \ sun/rmi/rmic \ diff --git a/jdk/test/demo/jvmti/Context.java b/jdk/test/demo/jvmti/Context.java deleted file mode 100644 index 2bb822ffbaa..00000000000 --- a/jdk/test/demo/jvmti/Context.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* - * - * Sample target application for jvmti demos - * - * java Context [threadCount [iterationCount [sleepContention]]] - * Default: java Context 5 10 0 - * - * threadCount Number of threads - * iterationCount Total turns taken for all threads - * sleepContention Time for main thread to sleep while holding lock - * (creates monitor contention on all other threads) - * - */ - -/* Used to sync up turns and keep track of who's turn it is */ -final class TurnChecker { - int thread_index; - TurnChecker(int thread_index) { - this.thread_index = thread_index; - } -} - -/* Creates a bunch of threads that sequentially take turns */ -public final class Context extends Thread { - /* Used to track threads */ - private static long startTime; - private static TurnChecker turn = new TurnChecker(-1); - private static int total_turns_taken; - - /* Used for each Context thread */ - private final int thread_count; - private final int thread_index; - private final int thread_turns; - - /* Main program */ - public static void main(String[] argv) throws InterruptedException { - int default_thread_count = 5; - int default_thread_turns = 10; - int default_contention_sleep = 0; - int expected_turns_taken; - long sleepTime = 10L; - - /* Override defaults */ - if ( argv.length >= 1 ) { - default_thread_count = Integer.parseInt(argv[0]); - } - if ( argv.length >= 2 ) { - expected_turns_taken = Integer.parseInt(argv[1]); - default_thread_turns = expected_turns_taken/default_thread_count; - } - expected_turns_taken = default_thread_count*default_thread_turns; - if ( argv.length >= 3 ) { - default_contention_sleep = Integer.parseInt(argv[2]); - } - - System.out.println("Context started with " - + default_thread_count + " threads and " - + default_thread_turns + " turns per thread"); - - /* Get all threads running (they will block until we set turn) */ - for (int i = 0; i < default_thread_count; i++) { - new Context(default_thread_count, i, default_thread_turns).start(); - } - - /* Sleep to make sure thread_index 0 make it to the wait call */ - System.out.println("Context sleeping, so threads will start wait"); - Thread.yield(); - Thread.sleep(sleepTime); - - /* Save start time */ - startTime = System.currentTimeMillis(); - - /* This triggers the starting of taking turns */ - synchronized (turn) { - turn.thread_index = 0; - turn.notifyAll(); - } - System.out.println("Context sleeping, so threads can run"); - Thread.yield(); - Thread.sleep(sleepTime); - - /* Wait for threads to finish (after everyone has had their turns) */ - while ( true ) { - boolean done; - done = false; - synchronized (turn) { - if ( total_turns_taken == expected_turns_taken ) { - done = true; - } - /* Create some monitor contention by sleeping with lock */ - if ( default_contention_sleep > 0 ) { - System.out.println("Context sleeping, to create contention"); - Thread.yield(); - Thread.sleep((long)default_contention_sleep); - } - } - if ( done ) - break; - System.out.println("Context sleeping, so threads will complete"); - Thread.sleep(sleepTime); - } - - long endTime = System.currentTimeMillis(); - long totalTime = endTime - startTime; - - System.out.println("Total time (milliseconds): " + totalTime); - System.out.println("Milliseconds per thread: " + - ((double)totalTime / (default_thread_count))); - - System.out.println("Context completed"); - System.exit(0); - } - - /* Thread object to run */ - Context(int thread_count, int thread_index, int thread_turns) { - this.thread_count = thread_count; - this.thread_index = thread_index; - this.thread_turns = thread_turns; - } - - /* Main for thread */ - public void run() { - int next_thread_index = (thread_index + 1) % thread_count; - int turns_taken = 0; - - try { - - /* Loop until we make sure we get all our turns */ - for (int i = 0; i < thread_turns * thread_count; i++) { - synchronized (turn) { - /* Keep waiting for our turn */ - while (turn.thread_index != thread_index) - turn.wait(); - /* MY TURN! Each thread gets thread_turns */ - total_turns_taken++; - turns_taken++; - System.out.println("Turn #" + total_turns_taken - + " taken by thread " + thread_index - + ", " + turns_taken - + " turns taken by this thread"); - /* Give next thread a turn */ - turn.thread_index = next_thread_index; - turn.notifyAll(); - } - /* If we've had all our turns, break out of this loop */ - if (thread_turns == turns_taken) { - System.out.println("Loop end: thread got " + turns_taken - + " turns, expected " + thread_turns); - break; - } - } - } catch (InterruptedException intEx) { - System.out.println("Got an InterruptedException:" + intEx); - /* skip */ - } - - /* Make sure we got all our turns */ - if ( thread_turns != turns_taken ) { - System.out.println("ERROR: thread got " + turns_taken - + " turns, expected " + thread_turns); - System.exit(1); - } - } -} diff --git a/jdk/test/demo/jvmti/DemoRun.java b/jdk/test/demo/jvmti/DemoRun.java deleted file mode 100644 index ea1296a7b8a..00000000000 --- a/jdk/test/demo/jvmti/DemoRun.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* DemoRun: - * - * Support classes for java jvmti demo tests - * - */ - -import java.io.InputStream; -import java.io.IOException; -import java.io.File; -import java.io.BufferedInputStream; -import java.io.PrintStream; - -/* - * Helper class to direct process output to a StringBuffer - */ -class MyInputStream implements Runnable { - private String name; - private BufferedInputStream in; - private StringBuffer buffer; - - /* Create MyInputStream that saves all output to a StringBuffer */ - MyInputStream(String name, InputStream in) { - this.name = name; - this.in = new BufferedInputStream(in); - buffer = new StringBuffer(4096); - Thread thr = new Thread(this); - thr.setDaemon(true); - thr.start(); - } - - /* Dump the buffer */ - void dump(PrintStream x) { - String str = buffer.toString(); - x.println(""); - x.println(str); - x.println(""); - } - - /* Check to see if a pattern is inside the output. */ - boolean contains(String pattern) { - String str = buffer.toString(); - return str.contains(pattern); - } - - /* Runs as a separate thread capturing all output in a StringBuffer */ - public void run() { - try { - byte b[] = new byte[100]; - for (;;) { - int n = in.read(b); - String str; - if (n < 0) { - break; - } - str = new String(b, 0, n); - buffer.append(str); - System.out.print(str); - } - } catch (IOException ioe) { /* skip */ } - } -} - -/* - * Main JVMTI Demo Run class. - */ -public class DemoRun { - - private String demo_name; - private String demo_options; - private MyInputStream output; - private MyInputStream error; - - /* Create a Demo run process */ - public DemoRun(String name, String options) - { - demo_name = name; - demo_options = options; - } - - /* - * Execute a process with an -agentpath or -agentlib command option - */ - public void runit(String class_name) - { - runit(class_name, null); - } - - /* - * Execute a process with an -agentpath or -agentlib command option - * plus any set of other java options. - */ - public void runit(String class_name, String vm_options[]) - { - String sdk_home = System.getProperty("java.home"); - String cdir = System.getProperty("test.classes", "."); - String os_arch = System.getProperty("os.arch"); - String os_name = System.getProperty("os.name"); - String libprefix = os_name.contains("Windows")?"":"lib"; - String libsuffix = os_name.contains("Windows")?".dll": - os_name.contains("OS X")?".dylib":".so"; - boolean hprof = demo_name.equals("hprof"); - String java = sdk_home - + File.separator + "bin" - + File.separator + "java"; - /* Array of strings to be passed in for exec: - * 1. java - * 2. -Dtest.classes=. - * 3. -Xcheck:jni (Just because it finds bugs) - * 4. -Xverify:all (Make sure verification is on full blast) - * 5. -agent - * vm_options - * 6+i. classname - */ - int nvm_options = 0; - if ( vm_options != null ) nvm_options = vm_options.length; - String cmd[] = new String[1 + 7 + nvm_options]; - String cmdLine; - int exitStatus; - int i,j; - - i = 0; - cmdLine = ""; - cmdLine += (cmd[i++] = java); - cmdLine += " "; - cmdLine += (cmd[i++] = "-cp"); - cmdLine += " "; - cmdLine += (cmd[i++] = cdir); - cmdLine += " "; - cmdLine += (cmd[i++] = "-Dtest.classes=" + cdir); - cmdLine += " "; - cmdLine += (cmd[i++] = "-Xcheck:jni"); - cmdLine += " "; - cmdLine += (cmd[i++] = "-Xverify:all"); - if ( hprof ) { - /* Load hprof with -agentlib since it's part of jre */ - cmdLine += " "; - cmdLine += (cmd[i++] = "-agentlib:" + demo_name - + (demo_options.equals("")?"":("="+demo_options))); - } else { - String libname = sdk_home - + File.separator + "demo" - + File.separator + "jvmti" - + File.separator + demo_name - + File.separator + "lib" - + File.separator + libprefix + demo_name + libsuffix; - cmdLine += " "; - cmdLine += (cmd[i++] = "-agentpath:" + libname - + (demo_options.equals("")?"":("="+demo_options))); - } - /* Add any special VM options */ - for ( j = 0; j < nvm_options; j++ ) { - cmdLine += " "; - cmdLine += (cmd[i++] = vm_options[j]); - } - /* Add classname */ - cmdLine += " "; - cmdLine += (cmd[i++] = class_name); - - /* Begin process */ - Process p; - - System.out.println("Starting: " + cmdLine); - try { - p = Runtime.getRuntime().exec(cmd); - } catch ( IOException e ) { - throw new RuntimeException("Test failed - exec got IO exception"); - } - - /* Save process output in StringBuffers */ - output = new MyInputStream("Input Stream", p.getInputStream()); - error = new MyInputStream("Error Stream", p.getErrorStream()); - - /* Wait for process to complete, and if exit code is non-zero we fail */ - try { - exitStatus = p.waitFor(); - if ( exitStatus != 0) { - System.out.println("Exit code is " + exitStatus); - error.dump(System.out); - output.dump(System.out); - throw new RuntimeException("Test failed - " + - "exit return code non-zero " + - "(exitStatus==" + exitStatus + ")"); - } - } catch ( InterruptedException e ) { - throw new RuntimeException("Test failed - process interrupted"); - } - System.out.println("Completed: " + cmdLine); - } - - /* Does the pattern appear in the output of this process */ - public boolean output_contains(String pattern) - { - return output.contains(pattern) || error.contains(pattern); - } -} diff --git a/jdk/test/demo/jvmti/HeapUser.java b/jdk/test/demo/jvmti/HeapUser.java deleted file mode 100644 index ea99979dd69..00000000000 --- a/jdk/test/demo/jvmti/HeapUser.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* - * - * Sample target application - * - */ - -class Animal { - int category; - int age; -} - -class Pet extends Animal { - String owner; - String name; - String vet; - String records; - String address; - Pet(String name) { this.name = name; } -} - -class Dog extends Pet { - int breed; - int barks; - Dog(String name) { super(name); } -} - -class Cat extends Pet { - int breed; - int claws; - Cat(String name) { super(name); } -} - -public class HeapUser { - private static Dog dogs[]; - private static Cat cats[]; - public static void main(String args[]) { - System.out.println("HeapUser start, 101 dogs, 1000 cats"); - dogs = new Dog[101]; - for(int i=0; i<101; i++) { - dogs[i] = new Dog("fido " + i); - } - cats = new Cat[1000]; - for(int i=0; i<1000; i++) { - cats[i] = new Cat("feefee " + i); - } - System.out.println("HeapUser end"); - } -} diff --git a/jdk/test/demo/jvmti/Hello.java b/jdk/test/demo/jvmti/Hello.java deleted file mode 100644 index 3161d28b7b9..00000000000 --- a/jdk/test/demo/jvmti/Hello.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* - * - * Sample target application for jvmti demos - * - */ - -public class Hello { - public static void main(String args[]) { - System.out.println("Hello"); - } -} diff --git a/jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java b/jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java deleted file mode 100644 index c2cb13b174a..00000000000 --- a/jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 6580131 - * @summary Test jvmti demo compiledMethodLoad - * - * @compile ../DemoRun.java ../Hello.java - * @build CompiledMethodLoadTest - * @run main CompiledMethodLoadTest Hello - */ - -public class CompiledMethodLoadTest { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI compiledMethodLoad agent (no options) */ - demo = new DemoRun("compiledMethodLoad", "" /* options to compiledMethodLoad */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/gctest/BigHello.java b/jdk/test/demo/jvmti/gctest/BigHello.java deleted file mode 100644 index b08643a5849..00000000000 --- a/jdk/test/demo/jvmti/gctest/BigHello.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* - * - * Sample target application for gctest demo - * - */ - -public class BigHello { - private final static int NLOOPS = 20000; - private static Object garbage[]; - public static void main(String args[]) { - long count = 0; - System.out.println("Big Hello start"); - for(int i=1; i<=NLOOPS; i++) { - count += i; - garbage = new Object[i]; - garbage[0] = new Object(); - } - System.out.println("Allocated " + count + - " array elements, and " + NLOOPS + - " arrays and Objects."); - System.out.println("Big Hello end"); - } -} diff --git a/jdk/test/demo/jvmti/gctest/Gctest.java b/jdk/test/demo/jvmti/gctest/Gctest.java deleted file mode 100644 index 2683cf2bc89..00000000000 --- a/jdk/test/demo/jvmti/gctest/Gctest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5027764 - * @summary Test jvmti demo gctest - * - * @compile ../DemoRun.java - * @build BigHello Gctest - * @run main Gctest BigHello - */ - -public class Gctest { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI gctest agent (no options) */ - demo = new DemoRun("gctest", "" /* options to gctest */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java b/jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java deleted file mode 100644 index 68c2eb75ff8..00000000000 --- a/jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5050116 6299047 - * @summary Test jvmti demo heapTracker - * - * @compile ../DemoRun.java - * @compile ../HeapUser.java - * @build HeapTrackerTest - * @run main HeapTrackerTest HeapUser - */ - -public class HeapTrackerTest { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI heapTracker agent (no options) */ - demo = new DemoRun("heapTracker", "" /* options to heapTracker */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java b/jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java deleted file mode 100644 index a49416a3293..00000000000 --- a/jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5033539 - * @summary Test jvmti demo heapViewer - * - * @compile ../DemoRun.java - * @compile ../HeapUser.java - * @build HeapViewerTest - * @run main HeapViewerTest HeapUser - */ - -public class HeapViewerTest { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI heapViewer agent (no options) */ - demo = new DemoRun("heapViewer", "" /* options to heapViewer */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/CpuOldTest.java b/jdk/test/demo/jvmti/hprof/CpuOldTest.java deleted file mode 100644 index 0017b21ad9c..00000000000 --- a/jdk/test/demo/jvmti/hprof/CpuOldTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 6299047 - * @summary Test jvmti hprof - * - * @compile -g HelloWorld.java ../DemoRun.java - * @build CpuOldTest - * @run main CpuOldTest HelloWorld - */ - -public class CpuOldTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with cpu=old */ - hprof = new DemoRun("hprof", "cpu=old,file=cpuold.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java deleted file mode 100644 index 986af43e3d5..00000000000 --- a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 - * @summary Test jvmti hprof - * - * @compile -g:lines HelloWorld.java ../DemoRun.java - * @build CpuSamplesTest - * @run main CpuSamplesTest HelloWorld - */ - -public class CpuSamplesTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with cpu=samples */ - hprof = new DemoRun("hprof", "cpu=samples,file=cpusamples.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java deleted file mode 100644 index 3cf96bb2321..00000000000 --- a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5097131 6299047 - * @summary Test jvmti hprof - * - * @compile -g HelloWorld.java DefineClass.java ../DemoRun.java - * @build CpuTimesDefineClassTest - * @run main CpuTimesDefineClassTest DefineClass - * - * - */ - -public class CpuTimesDefineClassTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with cpu=times */ - hprof = new DemoRun("hprof", "cpu=times,file=cputimedefineclass.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java deleted file mode 100644 index 4d67900f11b..00000000000 --- a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 6299047 - * @summary Test jvmti hprof - * - * @compile -g HelloWorld.java ../DemoRun.java - * @build CpuTimesTest - * @run main CpuTimesTest HelloWorld - */ - -public class CpuTimesTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with cpu=times */ - hprof = new DemoRun("hprof", "cpu=times,file=cputimes.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/DefineClass.java b/jdk/test/demo/jvmti/hprof/DefineClass.java deleted file mode 100644 index de4b2f910cb..00000000000 --- a/jdk/test/demo/jvmti/hprof/DefineClass.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* Testcase that does a defineClass with a NULL name on HelloWorld.class */ - -import java.io.*; - -public class DefineClass extends ClassLoader { - public static void main(String args[]) { - DefineClass t = new DefineClass(); - t.run(args); - } - public void run(String args[]) { - Class n; - byte b[] = new byte[10000]; - int len = 0; - String cdir; - String cfile; - - /* Class is found here: */ - cdir = System.getProperty("test.classes", "."); - cfile = cdir + java.io.File.separator + "HelloWorld.class"; - - try { - /* Construct byte array with complete class image in it. */ - FileInputStream fis = new FileInputStream(cfile); - int nbytes; - do { - nbytes = fis.read(b, len, b.length-len); - if ( nbytes > 0 ) { - len += nbytes; - } - } while ( nbytes > 0 ); - } catch ( Throwable x ) { - System.err.println("Cannot find " + cfile); - x.printStackTrace(); - } - - /* Define the class with null for the name */ - n = defineClass(null, b, 0, len); - - /* Try to create an instance of it */ - try { - n.newInstance(); - } catch ( Throwable x ) { - x.printStackTrace(); - } - } -} diff --git a/jdk/test/demo/jvmti/hprof/HeapAllTest.java b/jdk/test/demo/jvmti/hprof/HeapAllTest.java deleted file mode 100644 index d543f73fea0..00000000000 --- a/jdk/test/demo/jvmti/hprof/HeapAllTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 6299047 - * @summary Test jvmti hprof - * - * @compile -g HelloWorld.java ../DemoRun.java - * @build HeapAllTest - * @run main HeapAllTest HelloWorld - */ - -public class HeapAllTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with heap=all */ - hprof = new DemoRun("hprof", "heap=all,file=heapall.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java deleted file mode 100644 index 0bc01351aeb..00000000000 --- a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 4965057 6313381 - * @summary Test jvmti hprof format=b - * - * @compile -g:source HelloWorld.java ../DemoRun.java - * @build HeapBinaryFormatTest - * @run main HeapBinaryFormatTest HelloWorld - */ - -public class HeapBinaryFormatTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent to get binary format dump */ - hprof = new DemoRun("hprof", "heap=dump,format=b,logflags=4,file=heapbinaryformat.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Try a variation */ - String vm_opts[] = new String[1]; - vm_opts[0] = "-Xmx2100m"; - /* Crashes on small Linux machines: (like fyi) - How can I tell how much real memory is on a machine? - hprof.runit(args[0], vm_opts); - */ - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java deleted file mode 100644 index 1129e93f51b..00000000000 --- a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 6299047 - * @summary Test jvmti hprof - * - * @compile -g:source HelloWorld.java ../DemoRun.java - * @build HeapDumpTest - * @run main HeapDumpTest HelloWorld - */ - -public class HeapDumpTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with heap=dump */ - hprof = new DemoRun("hprof", "heap=dump,file=heapdump.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java deleted file mode 100644 index 855bfad93de..00000000000 --- a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 6299047 - * @summary Test jvmti hprof - * - * @compile -g:vars HelloWorld.java ../DemoRun.java - * @build HeapSitesTest - * @run main HeapSitesTest HelloWorld - */ - -public class HeapSitesTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with heap=sites */ - hprof = new DemoRun("hprof", "heap=sites,file=heapsites.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/HelloWorld.java b/jdk/test/demo/jvmti/hprof/HelloWorld.java deleted file mode 100644 index 3145a0b097d..00000000000 --- a/jdk/test/demo/jvmti/hprof/HelloWorld.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* HelloWorld: - * - * Sample target application for HPROF tests - * - */ - -/* Just some classes that create a variety of references */ - -class AAAA { - public int AAAA_i; - public static int AAAA_si; - public Object AAAA_j; - public static Object AAAA_sj; - public long AAAA_k; - public static long AAAA_sk; -} - -interface IIII { - Object o = new Object(); -} - -class BBBB extends AAAA implements IIII { - public byte BBBB_ii; - public static byte BBBB_sii; - public Object BBBB_jj; - public static Object BBBB_sjj; - public short BBBB_kk; - public static short BBBB_skk; -} - -class REFS { - private static String s1 = new String("REFS_string1"); - private String is2 = new String("REFS_string2"); - private static String s3 = new String("REFS_string3"); - private static String s4 = new String("REFS_string4"); - private String is5 = new String("REFS_string5"); - - private AAAA aaaa; - private BBBB bbbb; - - public void test() { - aaaa = new AAAA(); - bbbb = new BBBB(); - - aaaa.AAAA_i = 1; - AAAA.AAAA_si = 2; - aaaa.AAAA_j = s1; - AAAA.AAAA_sj = is2; - aaaa.AAAA_k = 5; - AAAA.AAAA_sk = 6; - - bbbb.BBBB_ii = 11; - BBBB.BBBB_sii = 22; - bbbb.BBBB_jj = s3; - BBBB.BBBB_sjj = s4; - bbbb.BBBB_kk = 55; - BBBB.BBBB_skk = 66; - - bbbb.AAAA_i = 111; - bbbb.AAAA_j = is5; - bbbb.AAAA_k = 555; - } -} - -/* Fairly simple hello world program that does some exercises first. */ - -public class HelloWorld { - public static void main(String args[]) { - - /* References exercise. */ - REFS r = new REFS(); - r.test(); - - /* Use a generic type exercise. */ - java.util.List l = new java.util.ArrayList(); - String.format("%s", ""); - - /* Create a class that has lots of different bytecodes exercise. */ - /* (Don't run it!) */ - UseAllBytecodes x = new UseAllBytecodes(1,2); - - /* Just some code with branches exercise. */ - try { - if ( args.length == 0 ) { - System.out.println("No arguments passed in (doesn't matter)"); - } else { - System.out.println("Arguments passed in (doesn't matter)"); - } - } catch ( Throwable e ) { - System.out.println("ERROR: System.out.println() did a throw"); - } finally { - System.out.println("Hello, world!"); - } - } -} diff --git a/jdk/test/demo/jvmti/hprof/MonitorTest.java b/jdk/test/demo/jvmti/hprof/MonitorTest.java deleted file mode 100644 index 2e8261f118f..00000000000 --- a/jdk/test/demo/jvmti/hprof/MonitorTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5012882 - * @summary Test jvmti hprof - * - * @compile -g ../Context.java ../DemoRun.java - * @build MonitorTest - * @run main MonitorTest Context 25 200 1000 - */ - -/* To create monitor contention, increase the default configuration. - * Hprof seems to have historically not output anything unless certain - * limits have been reached on the total contention time. - */ - -public class MonitorTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - - /* Run JVMTI hprof agent with monitor=y */ - hprof = new DemoRun("hprof", "monitor=y,file=monitor.txt"); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/OptionsTest.java b/jdk/test/demo/jvmti/hprof/OptionsTest.java deleted file mode 100644 index ebd09228b7b..00000000000 --- a/jdk/test/demo/jvmti/hprof/OptionsTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5083441 6299047 - * @summary Test jvmti hprof - * - * @compile -g:lines HelloWorld.java ../DemoRun.java - * @build OptionsTest - * @run main OptionsTest HelloWorld - */ - -import java.util.*; - -public class OptionsTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - List options = new LinkedList(); - - options.add("cpu=samples,depth=0,file=options0.txt"); - options.add("cpu=times,depth=0,file=options1.txt"); - options.add("cpu=old,depth=0,file=options2.txt"); - options.add("depth=0,file=options3.txt"); - - for(String option: options) { - /* Run JVMTI hprof agent with various options */ - hprof = new DemoRun("hprof", option); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed with " + option - + " - ERROR seen in output"); - } - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/StackMapTableTest.java b/jdk/test/demo/jvmti/hprof/StackMapTableTest.java deleted file mode 100644 index cf8cef6bd2b..00000000000 --- a/jdk/test/demo/jvmti/hprof/StackMapTableTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 6266289 6299047 6855180 6855551 - * @summary Test jvmti hprof and java_crw_demo with StackMapTable attributes - * - * @compile ../DemoRun.java - * @compile -g:lines HelloWorld.java - * @build StackMapTableTest - * @run main StackMapTableTest HelloWorld - */ - -import java.util.*; - -public class StackMapTableTest { - - public static void main(String args[]) throws Exception { - DemoRun hprof; - List options = new LinkedList(); - - options.add("cpu=samples,file=stackmaptable0.txt"); - options.add("cpu=times,file=stackmaptable1.txt"); - options.add("heap=sites,file=stackmaptable2.txt"); - options.add("file=stackmaptable3.txt"); - - for(String option: options) { - /* Run JVMTI hprof agent with various options */ - hprof = new DemoRun("hprof", option); - hprof.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (hprof.output_contains("ERROR")) { - throw new RuntimeException("Test failed with " + option - + " - ERROR seen in output"); - } - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/hprof/UseAllBytecodes.java b/jdk/test/demo/jvmti/hprof/UseAllBytecodes.java deleted file mode 100644 index 3493cfbf308..00000000000 --- a/jdk/test/demo/jvmti/hprof/UseAllBytecodes.java +++ /dev/null @@ -1,309 +0,0 @@ -/* - * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -/* - A simple Java class definition that helps self-test the runtime - interpreter. Used for getfield/putfield, invoke* opcodes and - their _quick variants. - - See src/share/java/runtime/selftest.c for details of the test - environment. -*/ - -/* Used to be sun/misc/SelfTest.java */ - -interface UseAllBytecodesInterface -{ - public void test_an_interface(int p1); -} - -public class UseAllBytecodes implements UseAllBytecodesInterface -{ - public int i1, i2; - public float f1, f2; - public double d1, d2; - public long l1, l2; - - public static int si1, si2; - public static float sf1, sf2; - public static double sd1, sd2; - public static long sl1, sl2; - - public UseAllBytecodesInterface interfaceObject; - - public int multi[][][]; - - public UseAllBytecodes() - { - /* This constructor is not intended to ever be run. It is here - to force CONSTANT_Methodref constants into the CP */ - set_i1(11); - set_i2(22); - set_f1(1.1f); - set_f2(2.2f); - set_d1(1.0); - set_d2(2.0); - set_l1(3); - set_l2(4); - - set_si1(33); - set_si2(44); - set_sf1(3.3f); - set_sf2(4.4f); - set_sd1(3.0); - set_sd2(4.0); - set_sl1(5); - set_sl2(6); - - test_areturn(); - test_athrow1(); - test_athrow2(); - test_athrow3(); - test_athrow4(); - - /* This puts a CONSTANT_InterfaceMethodref into the CP */ - interfaceObject.test_an_interface(1234); - - /* This creates an array and puts it into the CP */ - multi = new int[2][3][4]; - } - - public UseAllBytecodes(int p1) - { - i1 = p1; - i2 = 12345678; /* This puts a CONSTANT_Integer into the CP */ - d1 = (double) p1; - d2 = 1.2e234; /* This puts a CONSTANT_Double into the CP */ - } - - public UseAllBytecodes(int p1, int p2) - { - i1 = p1; - i2 = p2; - } - - /* These methods should return something other than their - arguments, so the self test can easily determine that - the correct value was returned. */ - public int set_i1(int p1) - { - i1 = p1; - return i1 + 1; - } - - public int set_i2(int p2) - { - i2 = p2; - return i2 + 1; - } - - public float set_f1(float p1) - { - f1 = p1; - return f1 + 1.0e34f; - } - - public float set_f2(float p2) - { - f2 = p2; - return f2 + 1.0e34f; - } - - public double set_d1(double p1) - { - d1 = p1; - return d1 + 1.0e234; - } - - public double set_d2(double p2) - { - d2 = p2; - return d2 + 1.0e234; - } - - public long set_l1(long p1) - { - l1 = p1; - return l1 + 1; - } - - public long set_l2(long p2) - { - l2 = p2; - return l2 + 1; - } - - public static void set_si1(int p1) - { - si1 = p1; - } - - public static void set_si2(int p2) - { - si2 = p2; - } - - public static void set_sf1(float p1) - { - sf1 = p1; - } - - public static void set_sf2(float p2) - { - sf2 = p2; - } - - public static void set_sd1(double p1) - { - sd1 = p1; - } - - public static void set_sd2(double p2) - { - sd2 = p2; - } - - public static void set_sl1(long p1) - { - sl1 = p1; - } - - public static void set_sl2(long p2) - { - sl2 = p2; - } - - public UseAllBytecodes test_areturn() - { - return this; - } - - /* This method does the same thing as set_i1. - It is here to test the invokeinterface opcode. */ - public void test_an_interface(int p1) - { - i1 = p1; - } - - /* The following 10 methods test various permutations of - try-and-catch. */ - public static void test_athrow1() throws NullPointerException - { - try - { - si1 = -1; - throw new NullPointerException(); - } - catch (Exception e) - { - si1 = 1; - } - } - - public static void test_athrow2() - { - int i = 1; - try - { - si1 = -1; - test_athrow1(); - } - catch (Exception e) - { - // This should *not* catch the exception; - // should be caught in test_athrow1. - si1 = i + 1; - } - } - - public static void test_athrow3() - { - int i = 1; - try - { - // Ultimately throws NullPointerException - si1 = -1; - si2 = -1; - test_athrow5(); - } - catch (NullPointerException np) - { - si1 = i + 1; - } - catch (NoSuchMethodException e) - { - si2 = i + 1; - } - si1++; // total is 3 - } - - public static void test_athrow4() - { - int i = 2; - try - { - // Ultimately throws NoSuchMethodException - si1 = -1; - si2 = -1; - test_athrow7(); - } - catch (NullPointerException e) - { - si1 = i + 1; - } - catch (NoSuchMethodException nsm) - { - si2 = i + 1; - } - si2++; // total is 4 - } - - public static void test_throw_nosuchmethod() throws NoSuchMethodException - { - throw new NoSuchMethodException(); - } - - public static void test_throw_nullpointer() throws NullPointerException - { - throw new NullPointerException(); - } - - public static void test_athrow5() throws NullPointerException, NoSuchMethodException - { - test_athrow6(); - } - - public static void test_athrow6() throws NullPointerException, NoSuchMethodException - { - test_throw_nullpointer(); - } - - public static void test_athrow7() throws NullPointerException, NoSuchMethodException - { - test_athrow8(); - } - - public static void test_athrow8() throws NullPointerException, NoSuchMethodException - { - test_throw_nosuchmethod(); - } -} diff --git a/jdk/test/demo/jvmti/minst/MinstExample.java b/jdk/test/demo/jvmti/minst/MinstExample.java deleted file mode 100644 index e16decb9ac8..00000000000 --- a/jdk/test/demo/jvmti/minst/MinstExample.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* MinstExample: - * - */ - -public class MinstExample { - private static int called = 0; - private static void foobar() { - called++; - } - public static void main(String[] args) { - System.out.println("MinstExample started"); - for(int i=0; i<200; i++) foobar(); - System.out.println("MinstExample ended"); - } -} diff --git a/jdk/test/demo/jvmti/minst/MinstTest.java b/jdk/test/demo/jvmti/minst/MinstTest.java deleted file mode 100644 index b40afdf1004..00000000000 --- a/jdk/test/demo/jvmti/minst/MinstTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 6377205 - * @summary Test jvmti demo minst - * - * @compile ../DemoRun.java - * @compile MinstExample.java - * @build MinstTest - * @run main MinstTest MinstExample - */ - -public class MinstTest { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI minst agent (no options) */ - demo = new DemoRun("minst", "exclude=java/*,exclude=javax/*,exclude=com/*,exclude=jdk/*,exclude=sun/*" /* options to minst */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java b/jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java deleted file mode 100644 index d169b938fb0..00000000000 --- a/jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5039613 - * @summary Test jvmti demo versionCheck - * - * @compile ../DemoRun.java ../Hello.java - * @build FailsWhenJvmtiVersionDiffers - * @run main FailsWhenJvmtiVersionDiffers Hello - */ - -public class FailsWhenJvmtiVersionDiffers { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI versionCheck agent (no options) */ - demo = new DemoRun("versionCheck", "" /* options to versionCheck */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - System.out.println( - "NOTE: The jmvti.h file doesn't match the JVMTI in the VM.\n" - +" This may or may not be a serious issue.\n" - +" Check the jtr file for details.\n" - +" Call your local serviceability representative for help." - ); - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} diff --git a/jdk/test/demo/jvmti/waiters/WaitersTest.java b/jdk/test/demo/jvmti/waiters/WaitersTest.java deleted file mode 100644 index 323615414a7..00000000000 --- a/jdk/test/demo/jvmti/waiters/WaitersTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - * @bug 5027764 - * @summary Test jvmti demo waiters - * - * @compile ../DemoRun.java - * @compile ../Context.java - * @build WaitersTest - * @run main WaitersTest Context - */ - -public class WaitersTest { - - public static void main(String args[]) throws Exception { - DemoRun demo; - - /* Run demo that uses JVMTI waiters agent (no options) */ - demo = new DemoRun("waiters", "" /* options to waiters */ ); - demo.runit(args[0]); - - /* Make sure patterns in output look ok */ - if (demo.output_contains("ERROR")) { - throw new RuntimeException("Test failed - ERROR seen in output"); - } - - /* Must be a pass. */ - System.out.println("Test passed - cleanly terminated"); - } -} From 8486cb76508df4563de0aa5ccd697e85dcfb5ac9 Mon Sep 17 00:00:00 2001 From: Dmitry Dmitriev Date: Sat, 11 Jul 2015 12:36:46 +0300 Subject: [PATCH 10/56] 8130332: StarvationMonitorInterval, PreInflateSpin, VerifyGenericSignatures and CountInterpCalls VM Options can be deprecated or removed in JDK 9 Deprecate StarvationMonitorInterval and PreInflateSpin, remove VerifyGenericSignatures and CountInterpCalls Reviewed-by: coleenp, gziemski --- hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp | 3 --- hotspot/src/cpu/ppc/vm/globals_ppc.hpp | 2 -- hotspot/src/cpu/sparc/vm/globals_sparc.hpp | 3 --- hotspot/src/cpu/x86/vm/globals_x86.hpp | 3 --- hotspot/src/cpu/zero/vm/globals_zero.hpp | 2 -- hotspot/src/os/windows/vm/os_windows.cpp | 9 --------- hotspot/src/share/vm/runtime/arguments.cpp | 2 ++ hotspot/src/share/vm/runtime/globals.hpp | 9 --------- 8 files changed, 2 insertions(+), 31 deletions(-) diff --git a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp index ac4db7ad3da..8207dc9fa4e 100644 --- a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp +++ b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp @@ -34,7 +34,6 @@ define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, true); -define_pd_global(bool, CountInterpCalls, true); define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks @@ -61,8 +60,6 @@ define_pd_global(intx, StackRedPages, 1); define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5)); -define_pd_global(intx, PreInflateSpin, 10); - define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); diff --git a/hotspot/src/cpu/ppc/vm/globals_ppc.hpp b/hotspot/src/cpu/ppc/vm/globals_ppc.hpp index ba35a310e7f..238f50ee3d4 100644 --- a/hotspot/src/cpu/ppc/vm/globals_ppc.hpp +++ b/hotspot/src/cpu/ppc/vm/globals_ppc.hpp @@ -47,8 +47,6 @@ define_pd_global(intx, OptoLoopAlignment, 16); define_pd_global(intx, InlineFrequencyCount, 100); define_pd_global(intx, InlineSmallCode, 1500); -define_pd_global(intx, PreInflateSpin, 10); - // Flags for template interpreter. define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); diff --git a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp index 7c0b2a5378f..9446fdbc2c7 100644 --- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp +++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp @@ -39,7 +39,6 @@ define_pd_global(bool, DontYieldALot, true); // yield no more than 100 times per second define_pd_global(bool, ConvertSleepToYield, false); // do not convert sleep(0) to yield. Helps GUI define_pd_global(bool, ShareVtableStubs, false); // improves performance markedly for mtrt and compress -define_pd_global(bool, CountInterpCalls, false); // not implemented in the interpreter define_pd_global(bool, NeedsDeoptSuspend, true); // register window machines need this define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks @@ -67,8 +66,6 @@ define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+1)); define_pd_global(intx, StackYellowPages, 2); define_pd_global(intx, StackRedPages, 1); -define_pd_global(intx, PreInflateSpin, 40); // Determined by running design center - define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); diff --git a/hotspot/src/cpu/x86/vm/globals_x86.hpp b/hotspot/src/cpu/x86/vm/globals_x86.hpp index cda0f03afde..1777d54af7e 100644 --- a/hotspot/src/cpu/x86/vm/globals_x86.hpp +++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp @@ -33,7 +33,6 @@ define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, true); -define_pd_global(bool, CountInterpCalls, true); define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks @@ -66,8 +65,6 @@ define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY( define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5)); #endif // AMD64 -define_pd_global(intx, PreInflateSpin, 10); - define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); diff --git a/hotspot/src/cpu/zero/vm/globals_zero.hpp b/hotspot/src/cpu/zero/vm/globals_zero.hpp index 15f15b8fbb2..511554d1cf3 100644 --- a/hotspot/src/cpu/zero/vm/globals_zero.hpp +++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp @@ -34,7 +34,6 @@ define_pd_global(bool, ConvertSleepToYield, true); define_pd_global(bool, ShareVtableStubs, true); -define_pd_global(bool, CountInterpCalls, true); define_pd_global(bool, NeedsDeoptSuspend, false); define_pd_global(bool, ImplicitNullChecks, true); @@ -45,7 +44,6 @@ define_pd_global(intx, CodeEntryAlignment, 32); define_pd_global(intx, OptoLoopAlignment, 16); define_pd_global(intx, InlineFrequencyCount, 100); define_pd_global(intx, InlineSmallCode, 1000 ); -define_pd_global(intx, PreInflateSpin, 10); define_pd_global(intx, StackYellowPages, 2); define_pd_global(intx, StackRedPages, 1); diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp index 6bb9afa73c3..e9cbf1e773f 100644 --- a/hotspot/src/os/windows/vm/os_windows.cpp +++ b/hotspot/src/os/windows/vm/os_windows.cpp @@ -3740,15 +3740,6 @@ void os::win32::initialize_system_info() { "stack size not a multiple of page size"); initialize_performance_counter(); - - // Win95/Win98 scheduler bug work-around. The Win95/98 scheduler is - // known to deadlock the system, if the VM issues to thread operations with - // a too high frequency, e.g., such as changing the priorities. - // The 6000 seems to work well - no deadlocks has been notices on the test - // programs that we have seen experience this problem. - if (!os::win32::is_nt()) { - StarvationMonitorInterval = 6000; - } } diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp index 85554869dda..84683e73278 100644 --- a/hotspot/src/share/vm/runtime/arguments.cpp +++ b/hotspot/src/share/vm/runtime/arguments.cpp @@ -277,6 +277,8 @@ static ObsoleteFlag obsolete_jvm_flags[] = { { "ParallelGCRetainPLAB", JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "ThreadSafetyMargin", JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "LazyBootClassLoader", JDK_Version::jdk(9), JDK_Version::jdk(10) }, + { "StarvationMonitorInterval", JDK_Version::jdk(9), JDK_Version::jdk(10) }, + { "PreInflateSpin", JDK_Version::jdk(9), JDK_Version::jdk(10) }, { NULL, JDK_Version(0), JDK_Version(0) } }; diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index 4052991a9f9..e17d99af220 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -3282,9 +3282,6 @@ public: develop(intx, ProfilerNodeSize, 1024, \ "Size in K to allocate for the Profile Nodes of each thread") \ \ - product_pd(intx, PreInflateSpin, \ - "Number of times to spin wait before inflation") \ - \ /* gc parameters */ \ product(size_t, InitialHeapSize, 0, \ "Initial heap size (in bytes); zero means use ergonomics") \ @@ -3725,9 +3722,6 @@ public: develop(intx, LongCompileThreshold, 50, \ "Used with +TraceLongCompiles") \ \ - product(intx, StarvationMonitorInterval, 200, \ - "Pause between each check (in milliseconds)") \ - \ /* recompilation */ \ product_pd(intx, CompileThreshold, \ "number of interpreted method invocations before (re-)compiling") \ @@ -4080,9 +4074,6 @@ public: develop(bool, TraceDefaultMethods, false, \ "Trace the default method processing steps") \ \ - develop(bool, VerifyGenericSignatures, false, \ - "Abort VM on erroneous or inconsistent generic signatures") \ - \ diagnostic(bool, WhiteBoxAPI, false, \ "Enable internal testing APIs") \ \ From ef59ce733276ac84c96610c0f15e9c0d8f0c752e Mon Sep 17 00:00:00 2001 From: David Holmes Date: Sun, 12 Jul 2015 22:54:54 -0400 Subject: [PATCH 11/56] 8130728: Disable WorkAroundNPTLTimedWaitHang by default Reviewed-by: dcubed --- hotspot/src/share/vm/runtime/globals.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index 3afc32a0b30..4052991a9f9 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -1291,7 +1291,7 @@ public: experimental(intx, hashCode, 5, \ "(Unstable) select hashCode generation algorithm") \ \ - experimental(intx, WorkAroundNPTLTimedWaitHang, 1, \ + experimental(intx, WorkAroundNPTLTimedWaitHang, 0, \ "(Unstable, Linux-specific) " \ "avoid NPTL-FUTEX hang pthread_cond_timedwait") \ \ From bff48ef15d3c68dc0b3cc0d46bdd0c27eb6c11e0 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Mon, 13 Jul 2015 14:05:17 +0100 Subject: [PATCH 12/56] 8130344: assert(handle != __null) failed: JNI handle should not be null' in jni_GetLongArrayElements Check JNI NewArray for NULL value Reviewed-by: lfoltan, alanb, dholmes --- .../jdk/internal/jimage/ImageNativeSubstrate.java | 7 ++++++- jdk/src/java.base/share/native/libjava/Image.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java index 34dc378f89f..776e5005e36 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java +++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java @@ -112,7 +112,12 @@ final class ImageNativeSubstrate implements ImageSubstrate { @Override public byte[] getStringBytes(int offset) { - return getStringBytes(id, offset); + byte[] ret = getStringBytes(id, offset); + if (ret == null) { + throw new OutOfMemoryError("Error accessing array at offset " + + offset); + } + return ret; } @Override diff --git a/jdk/src/java.base/share/native/libjava/Image.c b/jdk/src/java.base/share/native/libjava/Image.c index d82ca20560a..97270a85111 100644 --- a/jdk/src/java.base/share/native/libjava/Image.c +++ b/jdk/src/java.base/share/native/libjava/Image.c @@ -104,6 +104,9 @@ Java_jdk_internal_jimage_ImageNativeSubstrate_getStringBytes(JNIEnv *env, size = strlen(data); // Allocate byte array. byteArray = (*env)->NewByteArray(env, (jsize) size); + if (byteArray == NULL) { + return NULL; + } // Get array base address. rawBytes = (*env)->GetByteArrayElements(env, byteArray, NULL); // Copy bytes from image string table. @@ -122,6 +125,9 @@ Java_jdk_internal_jimage_ImageNativeSubstrate_getAttributes(JNIEnv *env, jlong* ret; attributes = (*env)->NewLongArray(env, JVM_ImageGetAttributesCount(env)); + if (attributes == NULL) { + return NULL; + } // Get base address for jlong array. rawAttributes = (*env)->GetLongArrayElements(env, attributes, NULL); ret = JVM_ImageGetAttributes(env, rawAttributes, id, offset); @@ -143,6 +149,9 @@ Java_jdk_internal_jimage_ImageNativeSubstrate_findAttributes(JNIEnv *env, count = JVM_ImageGetAttributesCount(env); attributes = (*env)->NewLongArray(env, JVM_ImageGetAttributesCount(env)); + if (attributes == NULL) { + return NULL; + } // Get base address for jlong array. rawAttributes = (*env)->GetLongArrayElements(env, attributes, NULL); size = (*env)->GetArrayLength(env, utf8); @@ -165,6 +174,9 @@ Java_jdk_internal_jimage_ImageNativeSubstrate_attributeOffsets(JNIEnv *env, length = JVM_ImageAttributeOffsetsLength(env, id); offsets = (*env)->NewIntArray(env, length); + if (offsets == NULL) { + return NULL; + } // Get base address of result. rawOffsets = (*env)->GetIntArrayElements(env, offsets, NULL); ret = JVM_ImageAttributeOffsets(env, rawOffsets, length, id); From 21b0285502703f176aeef6865145afdd77085d08 Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Mon, 13 Jul 2015 15:35:57 +0200 Subject: [PATCH 13/56] 8131035: [TESTBUG] sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java needs to enable UsePerfData Reviewed-by: jbachorik, dholmes --- .../management/HotspotRuntimeMBean/GetTotalSafepointTime.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java b/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java index 5d75160d188..9502285a405 100644 --- a/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java +++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java @@ -26,7 +26,7 @@ * @bug 4858522 * @modules java.management/sun.management * @summary Basic unit test of HotspotRuntimeMBean.getTotalSafepointTime() - * @author Steve Bohne + * @run main/othervm -XX:+UsePerfData GetTotalSafepointTime */ /* From 34bcc977bc616ec93ea9de085277b0710d81ee67 Mon Sep 17 00:00:00 2001 From: Eric Caspole Date: Mon, 13 Jul 2015 11:49:23 -0400 Subject: [PATCH 14/56] 8129961: SIGSEGV when copying to survivor space Remove "include_young" parameter from GenCollectedHeap::no_allocs_since_save_marks() since all existing uses pass true to always rescan young gen. Reviewed-by: jmasa, kbarrett --- hotspot/src/share/vm/gc/cms/parNewGeneration.cpp | 2 +- hotspot/src/share/vm/gc/serial/defNewGeneration.cpp | 8 ++++---- hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp | 8 +++----- hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp index c0173c7c515..13e53345de3 100644 --- a/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp +++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp @@ -848,7 +848,7 @@ void EvacuateFollowersClosureGeneral::do_void() { _gch->oop_since_save_marks_iterate(GenCollectedHeap::YoungGen, _scan_cur_or_nonheap, _scan_older); - } while (!_gch->no_allocs_since_save_marks(true /* include_young */)); + } while (!_gch->no_allocs_since_save_marks()); } diff --git a/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp index 34f831dd7cb..7791b8b713c 100644 --- a/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp +++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp @@ -96,7 +96,7 @@ EvacuateFollowersClosure(GenCollectedHeap* gch, void DefNewGeneration::EvacuateFollowersClosure::do_void() { do { _gch->oop_since_save_marks_iterate(GenCollectedHeap::YoungGen, _scan_cur_or_nonheap, _scan_older); - } while (!_gch->no_allocs_since_save_marks(GenCollectedHeap::YoungGen)); + } while (!_gch->no_allocs_since_save_marks()); } DefNewGeneration::FastEvacuateFollowersClosure:: @@ -112,7 +112,7 @@ FastEvacuateFollowersClosure(GenCollectedHeap* gch, void DefNewGeneration::FastEvacuateFollowersClosure::do_void() { do { _gch->oop_since_save_marks_iterate(GenCollectedHeap::YoungGen, _scan_cur_or_nonheap, _scan_older); - } while (!_gch->no_allocs_since_save_marks(GenCollectedHeap::YoungGen)); + } while (!_gch->no_allocs_since_save_marks()); guarantee(_gen->promo_failure_scan_is_complete(), "Failed to finish scan"); } @@ -597,7 +597,7 @@ void DefNewGeneration::collect(bool full, gch->rem_set()->prepare_for_younger_refs_iterate(false); - assert(gch->no_allocs_since_save_marks(GenCollectedHeap::YoungGen), + assert(gch->no_allocs_since_save_marks(), "save marks have not been newly set."); // Not very pretty. @@ -617,7 +617,7 @@ void DefNewGeneration::collect(bool full, &fsc_with_no_gc_barrier, &fsc_with_gc_barrier); - assert(gch->no_allocs_since_save_marks(GenCollectedHeap::YoungGen), + assert(gch->no_allocs_since_save_marks(), "save marks have not been newly set."); { diff --git a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp index b0453717b35..3ff03baa218 100644 --- a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp +++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp @@ -741,11 +741,9 @@ ALL_SINCE_SAVE_MARKS_CLOSURES(GCH_SINCE_SAVE_MARKS_ITERATE_DEFN) #undef GCH_SINCE_SAVE_MARKS_ITERATE_DEFN -bool GenCollectedHeap::no_allocs_since_save_marks(bool include_young) { - if (include_young && !_young_gen->no_allocs_since_save_marks()) { - return false; - } - return _old_gen->no_allocs_since_save_marks(); +bool GenCollectedHeap::no_allocs_since_save_marks() { + return _young_gen->no_allocs_since_save_marks() && + _old_gen->no_allocs_since_save_marks(); } bool GenCollectedHeap::supports_inline_contig_alloc() const { diff --git a/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp b/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp index 99b012e572e..29505080755 100644 --- a/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp +++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp @@ -436,7 +436,7 @@ public: // Returns "true" iff no allocations have occurred since the last // call to "save_marks". - bool no_allocs_since_save_marks(bool include_young); + bool no_allocs_since_save_marks(); // Returns true if an incremental collection is likely to fail. // We optionally consult the young gen, if asked to do so; From 055105c7076abee321a37258c2dcc3f125e199af Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Tue, 14 Jul 2015 11:40:49 +0200 Subject: [PATCH 15/56] 8130057: serviceability/sa/TestStackTrace.java should be quarantined Reviewed-by: egahlin, jbachorik --- hotspot/test/serviceability/sa/TestStackTrace.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/test/serviceability/sa/TestStackTrace.java b/hotspot/test/serviceability/sa/TestStackTrace.java index e8f8ebbe15c..be9702f4a39 100644 --- a/hotspot/test/serviceability/sa/TestStackTrace.java +++ b/hotspot/test/serviceability/sa/TestStackTrace.java @@ -34,6 +34,7 @@ import jdk.test.lib.apps.LingeredApp; * @test * @library /../../test/lib/share/classes * @library /testlibrary + * @ignore 8129971 * @build jdk.test.lib.* * @build jdk.test.lib.apps.* * @run main TestStackTrace From f1d95bc678e5be13f760686c0855482f826e0ff8 Mon Sep 17 00:00:00 2001 From: Gerard Ziemski Date: Tue, 14 Jul 2015 11:08:41 -0500 Subject: [PATCH 16/56] 8079156: [TESTBUG] 32 bit Java 9-fastdebug hit assertion in client mode with StackShadowPages flag value from 32 to 50 We increase CodeBufer instr size to account for stack banging code generation. Reviewed-by: coleenp, dholmes, kvn --- hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp index baafe57d97d..397d643f639 100644 --- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp +++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp @@ -2456,7 +2456,8 @@ void SharedRuntime::generate_deopt_blob() { // allocate space for the code ResourceMark rm; // setup code generation tools - CodeBuffer buffer("deopt_blob", 1024, 1024); + // note: the buffer code size must account for StackShadowPages=50 + CodeBuffer buffer("deopt_blob", 1536, 1024); MacroAssembler* masm = new MacroAssembler(&buffer); int frame_size_in_words; OopMap* map = NULL; From 0db4f21ce22a5700d6d2a29efc1289c8231266bb Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Tue, 14 Jul 2015 09:33:20 -0700 Subject: [PATCH 17/56] 8130448: thread dump improvements, comment additions, new diagnostics inspired by 8077392 Reviewed-by: dholmes, coleenp --- hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp | 10 ++++ hotspot/src/share/vm/oops/markOop.cpp | 28 +++++---- .../src/share/vm/runtime/objectMonitor.cpp | 34 ++++------- .../src/share/vm/runtime/objectMonitor.hpp | 21 +++---- hotspot/src/share/vm/runtime/synchronizer.cpp | 28 ++++++--- hotspot/src/share/vm/runtime/thread.cpp | 25 +++++--- hotspot/src/share/vm/runtime/vframe.cpp | 60 ++++++++++++++----- hotspot/src/share/vm/runtime/vframe.hpp | 5 +- 8 files changed, 136 insertions(+), 75 deletions(-) diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp index 530a89601da..17428ba0650 100644 --- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp @@ -1781,6 +1781,7 @@ void MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmpReg cmpxchgptr(scrReg, Address(boxReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner))); } else if ((EmitSync & 128) == 0) { // avoid ST-before-CAS + // register juggle because we need tmpReg for cmpxchgptr below movptr(scrReg, boxReg); movptr(boxReg, tmpReg); // consider: LEA box, [tmp-2] @@ -1814,7 +1815,10 @@ void MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmpReg } cmpxchgptr(scrReg, Address(boxReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner))); movptr(Address(scrReg, 0), 3); // box->_displaced_header = 3 + // If we weren't able to swing _owner from NULL to the BasicLock + // then take the slow path. jccb (Assembler::notZero, DONE_LABEL); + // update _owner from BasicLock to thread get_thread (scrReg); // beware: clobbers ICCs movptr(Address(boxReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)), scrReg); xorptr(boxReg, boxReg); // set icc.ZFlag = 1 to indicate success @@ -2083,6 +2087,9 @@ void MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register tmpR xorptr(boxReg, boxReg); // box is really EAX if (os::is_MP()) { lock(); } cmpxchgptr(rsp, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner))); + // There's no successor so we tried to regrab the lock with the + // placeholder value. If that didn't work, then another thread + // grabbed the lock so we're done (and exit was a success). jccb (Assembler::notEqual, LSuccess); // Since we're low on registers we installed rsp as a placeholding in _owner. // Now install Self over rsp. This is safe as we're transitioning from @@ -2190,6 +2197,9 @@ void MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register tmpR movptr(boxReg, (int32_t)NULL_WORD); if (os::is_MP()) { lock(); } cmpxchgptr(r15_thread, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner))); + // There's no successor so we tried to regrab the lock. + // If that didn't work, then another thread grabbed the + // lock so we're done (and exit was a success). jccb (Assembler::notEqual, LSuccess); // Intentional fall-through into slow-path diff --git a/hotspot/src/share/vm/oops/markOop.cpp b/hotspot/src/share/vm/oops/markOop.cpp index 9bca60167c9..e7ce60eef7d 100644 --- a/hotspot/src/share/vm/oops/markOop.cpp +++ b/hotspot/src/share/vm/oops/markOop.cpp @@ -32,26 +32,32 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC void markOopDesc::print_on(outputStream* st) const { if (is_marked()) { st->print(" marked(" INTPTR_FORMAT ")", value()); + } else if (has_monitor()) { + // have to check has_monitor() before is_locked() + st->print(" monitor(" INTPTR_FORMAT ")=", value()); + ObjectMonitor* mon = monitor(); + if (mon == NULL) { + st->print("NULL (this should never be seen!)"); + } else { + st->print("{count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT + ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", + mon->count(), mon->waiters(), mon->recursions(), + p2i(mon->owner())); + } } else if (is_locked()) { st->print(" locked(" INTPTR_FORMAT ")->", value()); if (is_neutral()) { st->print("is_neutral"); - if (has_no_hash()) st->print(" no_hash"); - else st->print(" hash=" INTPTR_FORMAT, hash()); + if (has_no_hash()) { + st->print(" no_hash"); + } else { + st->print(" hash=" INTPTR_FORMAT, hash()); + } st->print(" age=%d", age()); } else if (has_bias_pattern()) { st->print("is_biased"); JavaThread* jt = biased_locker(); st->print(" biased_locker=" INTPTR_FORMAT, p2i(jt)); - } else if (has_monitor()) { - ObjectMonitor* mon = monitor(); - if (mon == NULL) - st->print("monitor=NULL"); - else { - BasicLock * bl = (BasicLock *) mon->owner(); - st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", - mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); - } } else { st->print("??"); } diff --git a/hotspot/src/share/vm/runtime/objectMonitor.cpp b/hotspot/src/share/vm/runtime/objectMonitor.cpp index f2efefefdd6..78ed79fab38 100644 --- a/hotspot/src/share/vm/runtime/objectMonitor.cpp +++ b/hotspot/src/share/vm/runtime/objectMonitor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -103,8 +103,10 @@ // The knob* variables are effectively final. Once set they should // never be modified hence. Consider using __read_mostly with GCC. +int ObjectMonitor::Knob_ExitRelease = 0; int ObjectMonitor::Knob_Verbose = 0; int ObjectMonitor::Knob_VerifyInUse = 0; +int ObjectMonitor::Knob_VerifyMatch = 0; int ObjectMonitor::Knob_SpinLimit = 5000; // derived by an external tool - static int Knob_LogSpins = 0; // enable jvmstat tally for spins static int Knob_HandOff = 0; @@ -251,24 +253,6 @@ static volatile int InitDone = 0; // ----------------------------------------------------------------------------- // Enter support -bool ObjectMonitor::try_enter(Thread* THREAD) { - if (THREAD != _owner) { - if (THREAD->is_lock_owned ((address)_owner)) { - assert(_recursions == 0, "internal state error"); - _owner = THREAD; - _recursions = 1; - return true; - } - if (Atomic::cmpxchg_ptr (THREAD, &_owner, NULL) != NULL) { - return false; - } - return true; - } else { - _recursions++; - return true; - } -} - void NOINLINE ObjectMonitor::enter(TRAPS) { // The following code is ordered to check the most common cases first // and to reduce RTS->RTO cache line upgrades on SPARC and IA32 processors. @@ -2272,7 +2256,7 @@ void ObjectWaiter::wait_reenter_end(ObjectMonitor * const mon) { } inline void ObjectMonitor::AddWaiter(ObjectWaiter* node) { - assert(node != NULL, "should not dequeue NULL node"); + assert(node != NULL, "should not add NULL node"); assert(node->_prev == NULL, "node already in list"); assert(node->_next == NULL, "node already in list"); // put node at end of queue (circular doubly linked list) @@ -2407,8 +2391,8 @@ static int kvGetInt(char * kvList, const char * Key, int Default) { char * v = kvGet(kvList, Key); int rslt = v ? ::strtol(v, NULL, 0) : Default; if (Knob_ReportSettings && v != NULL) { - ::printf (" SyncKnob: %s %d(%d)\n", Key, rslt, Default) ; - ::fflush(stdout); + tty->print_cr("INFO: SyncKnob: %s %d(%d)", Key, rslt, Default) ; + tty->flush(); } return rslt; } @@ -2442,8 +2426,10 @@ void ObjectMonitor::DeferredInitialize() { #define SETKNOB(x) { Knob_##x = kvGetInt(knobs, #x, Knob_##x); } SETKNOB(ReportSettings); + SETKNOB(ExitRelease); SETKNOB(Verbose); SETKNOB(VerifyInUse); + SETKNOB(VerifyMatch); SETKNOB(FixedSpin); SETKNOB(SpinLimit); SETKNOB(SpinBase); @@ -2477,7 +2463,9 @@ void ObjectMonitor::DeferredInitialize() { if (os::is_MP()) { BackOffMask = (1 << Knob_SpinBackOff) - 1; - if (Knob_ReportSettings) ::printf("BackOffMask=%X\n", BackOffMask); + if (Knob_ReportSettings) { + tty->print_cr("INFO: BackOffMask=0x%X", BackOffMask); + } // CONSIDER: BackOffMask = ROUNDUP_NEXT_POWER2 (ncpus-1) } else { Knob_SpinLimit = 0; diff --git a/hotspot/src/share/vm/runtime/objectMonitor.hpp b/hotspot/src/share/vm/runtime/objectMonitor.hpp index f792a250264..eec08380810 100644 --- a/hotspot/src/share/vm/runtime/objectMonitor.hpp +++ b/hotspot/src/share/vm/runtime/objectMonitor.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -196,8 +196,10 @@ class ObjectMonitor { static PerfCounter * _sync_Deflations; static PerfLongVariable * _sync_MonExtant; + static int Knob_ExitRelease; static int Knob_Verbose; static int Knob_VerifyInUse; + static int Knob_VerifyMatch; static int Knob_SpinLimit; void* operator new (size_t size) throw() { @@ -317,7 +319,6 @@ class ObjectMonitor { void print(); #endif - bool try_enter(TRAPS); void enter(TRAPS); void exit(bool not_suspended, TRAPS); void wait(jlong millis, bool interruptable, TRAPS); @@ -354,14 +355,14 @@ class ObjectMonitor { #undef TEVENT #define TEVENT(nom) { if (SyncVerbose) FEVENT(nom); } -#define FEVENT(nom) \ - { \ - static volatile int ctr = 0; \ - int v = ++ctr; \ - if ((v & (v - 1)) == 0) { \ - ::printf(#nom " : %d\n", v); \ - ::fflush(stdout); \ - } \ +#define FEVENT(nom) \ + { \ + static volatile int ctr = 0; \ + int v = ++ctr; \ + if ((v & (v - 1)) == 0) { \ + tty->print_cr("INFO: " #nom " : %d", v); \ + tty->flush(); \ + } \ } #undef TEVENT diff --git a/hotspot/src/share/vm/runtime/synchronizer.cpp b/hotspot/src/share/vm/runtime/synchronizer.cpp index 3068d9c0328..611992d7ad9 100644 --- a/hotspot/src/share/vm/runtime/synchronizer.cpp +++ b/hotspot/src/share/vm/runtime/synchronizer.cpp @@ -40,6 +40,7 @@ #include "runtime/stubRoutines.hpp" #include "runtime/synchronizer.hpp" #include "runtime/thread.inline.hpp" +#include "runtime/vframe.hpp" #include "utilities/dtrace.hpp" #include "utilities/events.hpp" #include "utilities/preserveException.hpp" @@ -927,8 +928,9 @@ static void InduceScavenge(Thread * Self, const char * Whence) { if (ForceMonitorScavenge == 0 && Atomic::xchg (1, &ForceMonitorScavenge) == 0) { if (ObjectMonitor::Knob_Verbose) { - ::printf ("Monitor scavenge - Induced STW @%s (%d)\n", Whence, ForceMonitorScavenge) ; - ::fflush(stdout); + tty->print_cr("INFO: Monitor scavenge - Induced STW @%s (%d)", + Whence, ForceMonitorScavenge) ; + tty->flush(); } // Induce a 'null' safepoint to scavenge monitors // Must VM_Operation instance be heap allocated as the op will be enqueue and posted @@ -937,8 +939,9 @@ static void InduceScavenge(Thread * Self, const char * Whence) { VMThread::execute(new VM_ForceAsyncSafepoint()); if (ObjectMonitor::Knob_Verbose) { - ::printf ("Monitor scavenge - STW posted @%s (%d)\n", Whence, ForceMonitorScavenge) ; - ::fflush(stdout); + tty->print_cr("INFO: Monitor scavenge - STW posted @%s (%d)", + Whence, ForceMonitorScavenge) ; + tty->flush(); } } } @@ -1603,10 +1606,11 @@ void ObjectSynchronizer::deflate_idle_monitors() { // Consider: audit gFreeList to ensure that gMonitorFreeCount and list agree. if (ObjectMonitor::Knob_Verbose) { - ::printf("Deflate: InCirc=%d InUse=%d Scavenged=%d ForceMonitorScavenge=%d : pop=%d free=%d\n", - nInCirculation, nInuse, nScavenged, ForceMonitorScavenge, - gMonitorPopulation, gMonitorFreeCount); - ::fflush(stdout); + tty->print_cr("INFO: Deflate: InCirc=%d InUse=%d Scavenged=%d " + "ForceMonitorScavenge=%d : pop=%d free=%d", + nInCirculation, nInuse, nScavenged, ForceMonitorScavenge, + gMonitorPopulation, gMonitorFreeCount); + tty->flush(); } ForceMonitorScavenge = 0; // Reset @@ -1643,6 +1647,14 @@ class ReleaseJavaMonitorsClosure: public MonitorClosure { ReleaseJavaMonitorsClosure(Thread* thread) : THREAD(thread) {} void do_monitor(ObjectMonitor* mid) { if (mid->owner() == THREAD) { + if (ObjectMonitor::Knob_VerifyMatch != 0) { + Handle obj((oop) mid->object()); + tty->print("INFO: unexpected locked object:"); + javaVFrame::print_locked_object_class_name(tty, obj, "locked"); + fatal(err_msg("exiting JavaThread=" INTPTR_FORMAT + " unexpectedly owns ObjectMonitor=" INTPTR_FORMAT, + THREAD, mid)); + } (void)mid->complete_exit(CHECK); } } diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp index c82638b4a53..e3cabf3eb11 100644 --- a/hotspot/src/share/vm/runtime/thread.cpp +++ b/hotspot/src/share/vm/runtime/thread.cpp @@ -1802,14 +1802,25 @@ void JavaThread::exit(bool destroy_vm, ExitType exit_type) { assert(!this->has_pending_exception(), "ensure_join should have cleared"); // 6282335 JNI DetachCurrentThread spec states that all Java monitors - // held by this thread must be released. A detach operation must only - // get here if there are no Java frames on the stack. Therefore, any - // owned monitors at this point MUST be JNI-acquired monitors which are - // pre-inflated and in the monitor cache. + // held by this thread must be released. The spec does not distinguish + // between JNI-acquired and regular Java monitors. We can only see + // regular Java monitors here if monitor enter-exit matching is broken. // - // ensure_join() ignores IllegalThreadStateExceptions, and so does this. - if (exit_type == jni_detach && JNIDetachReleasesMonitors) { - assert(!this->has_last_Java_frame(), "detaching with Java frames?"); + // Optionally release any monitors for regular JavaThread exits. This + // is provided as a work around for any bugs in monitor enter-exit + // matching. This can be expensive so it is not enabled by default. + // ObjectMonitor::Knob_ExitRelease is a superset of the + // JNIDetachReleasesMonitors option. + // + // ensure_join() ignores IllegalThreadStateExceptions, and so does + // ObjectSynchronizer::release_monitors_owned_by_thread(). + if ((exit_type == jni_detach && JNIDetachReleasesMonitors) || + ObjectMonitor::Knob_ExitRelease) { + // Sanity check even though JNI DetachCurrentThread() would have + // returned JNI_ERR if there was a Java frame. JavaThread exit + // should be done executing Java code by the time we get here. + assert(!this->has_last_Java_frame(), + "should not have a Java frame when detaching or exiting"); ObjectSynchronizer::release_monitors_owned_by_thread(this); assert(!this->has_pending_exception(), "release_monitors should have cleared"); } diff --git a/hotspot/src/share/vm/runtime/vframe.cpp b/hotspot/src/share/vm/runtime/vframe.cpp index 2a60896c607..ca37dd04203 100644 --- a/hotspot/src/share/vm/runtime/vframe.cpp +++ b/hotspot/src/share/vm/runtime/vframe.cpp @@ -144,7 +144,7 @@ GrowableArray* javaVFrame::locked_monitors() { return result; } -static void print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state) { +void javaVFrame::print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state) { if (obj.not_null()) { st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj()); if (obj->klass() == SystemDictionary::Class_klass()) { @@ -160,17 +160,29 @@ static void print_locked_object_class_name(outputStream* st, Handle obj, const c void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) { ResourceMark rm; - // If this is the first frame, and java.lang.Object.wait(...) then print out the receiver. + // If this is the first frame and it is java.lang.Object.wait(...) + // then print out the receiver. Locals are not always available, + // e.g., compiled native frames have no scope so there are no locals. if (frame_count == 0) { if (method()->name() == vmSymbols::wait_name() && method()->method_holder()->name() == vmSymbols::java_lang_Object()) { + const char *wait_state = "waiting on"; // assume we are waiting + // If earlier in the output we reported java.lang.Thread.State == + // "WAITING (on object monitor)" and now we report "waiting on", then + // we are still waiting for notification or timeout. Otherwise if + // we earlier reported java.lang.Thread.State == "BLOCKED (on object + // monitor)", then we are actually waiting to re-lock the monitor. + // At this level we can't distinguish the two cases to report + // "waited on" rather than "waiting on" for the second case. StackValueCollection* locs = locals(); if (!locs->is_empty()) { StackValue* sv = locs->at(0); if (sv->type() == T_OBJECT) { Handle o = locs->at(0)->get_obj(); - print_locked_object_class_name(st, o, "waiting on"); + print_locked_object_class_name(st, o, wait_state); } + } else { + st->print_cr("\t- %s ", wait_state); } } else if (thread()->current_park_blocker() != NULL) { oop obj = thread()->current_park_blocker(); @@ -179,8 +191,8 @@ void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) { } } - - // Print out all monitors that we have locked or are trying to lock + // Print out all monitors that we have locked, or are trying to lock, + // including re-locking after being notified or timing out in a wait(). GrowableArray* mons = monitors(); if (!mons->is_empty()) { bool found_first_monitor = false; @@ -202,14 +214,14 @@ void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) { if (monitor->owner() != NULL) { // the monitor is associated with an object, i.e., it is locked - // First, assume we have the monitor locked. If we haven't found an - // owned monitor before and this is the first frame, then we need to - // see if we have completed the lock or we are blocked trying to - // acquire it - we can only be blocked if the monitor is inflated - markOop mark = NULL; const char *lock_state = "locked"; // assume we have the monitor locked if (!found_first_monitor && frame_count == 0) { + // If this is the first frame and we haven't found an owned + // monitor before, then we need to see if we have completed + // the lock or if we are blocked trying to acquire it. Only + // an inflated monitor that is first on the monitor list in + // the first frame can block us on a monitor enter. mark = monitor->owner()->mark(); if (mark->has_monitor() && ( // we have marked ourself as pending on this monitor @@ -219,13 +231,33 @@ void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) { )) { lock_state = "waiting to lock"; } else { - mark = NULL; // Disable printing below + // We own the monitor which is not as interesting so + // disable the extra printing below. + mark = NULL; + } + } else if (frame_count != 0) { + // This is not the first frame so we either own this monitor + // or we owned the monitor before and called wait(). Because + // wait() could have been called on any monitor in a lower + // numbered frame on the stack, we have to check all the + // monitors on the list for this frame. + mark = monitor->owner()->mark(); + if (mark->has_monitor() && + ( // we have marked ourself as pending on this monitor + mark->monitor() == thread()->current_pending_monitor() || + // we are not the owner of this monitor + !mark->monitor()->is_entered(thread()) + )) { + lock_state = "waiting to re-lock in wait()"; + } else { + // We own the monitor which is not as interesting so + // disable the extra printing below. + mark = NULL; } } print_locked_object_class_name(st, monitor->owner(), lock_state); - if (Verbose && mark != NULL) { - // match with format above, replacing "-" with " ". - st->print("\t lockbits="); + if (ObjectMonitor::Knob_Verbose && mark != NULL) { + st->print("\t- lockbits="); mark->print_on(st); st->cr(); } diff --git a/hotspot/src/share/vm/runtime/vframe.hpp b/hotspot/src/share/vm/runtime/vframe.hpp index badd129455b..74c9b725811 100644 --- a/hotspot/src/share/vm/runtime/vframe.hpp +++ b/hotspot/src/share/vm/runtime/vframe.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -135,7 +135,8 @@ class javaVFrame: public vframe { // Return an array of monitors locked by this frame in the youngest to oldest order GrowableArray* locked_monitors(); - // printing used during stack dumps + // printing used during stack dumps and diagnostics + static void print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state); void print_lock_info_on(outputStream* st, int frame_count); void print_lock_info(int frame_count) { print_lock_info_on(tty, frame_count); } From 99e5ddaa453f462cd893c07cf341f2749b409471 Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Tue, 14 Jul 2015 16:28:53 +0200 Subject: [PATCH 18/56] 8131325: Remove hprof agent tests in hotspot repo Reviewed-by: dholmes --- hotspot/test/serviceability/hprof/cpu002.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 hotspot/test/serviceability/hprof/cpu002.java diff --git a/hotspot/test/serviceability/hprof/cpu002.java b/hotspot/test/serviceability/hprof/cpu002.java deleted file mode 100644 index 765e6896a2a..00000000000 --- a/hotspot/test/serviceability/hprof/cpu002.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 8076421 - * @summary Test of hprof option crashes Zero - * @compile cpu002.java - * @run main/othervm -Xrunhprof:cpu=times,file=cpu002.hprof.out cpu002 - */ - -import java.io.*; - -public class cpu002 { - public static final int PASSED = 0; - public static final int FAILED = 2; - public static final int JCK_STATUS_BASE = 95; - - public static void main (String argv[]) { - System.exit(run(argv,System.out) + JCK_STATUS_BASE); - } - - public static int run(String argv[], PrintStream out) { - return PASSED; - } -} From b063fde5045359954c2fd2b363536111fab01f15 Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Tue, 14 Jul 2015 09:36:38 -0700 Subject: [PATCH 19/56] 8131128: Merge error in jprt.properties leads to missing devkit argument Add missing line break; fix backslash lineup. Reviewed-by: tbell, kvn --- make/jprt.properties | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/jprt.properties b/make/jprt.properties index b0d59a51b18..e882b8a21a9 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -121,10 +121,11 @@ jprt.i586.fastdebugOpen.build.configure.args= \ ${jprt.fastdebugOpen.build.configure.args} jprt.i586.productOpen.build.configure.args= \ ${my.i586.default.build.configure.args} \ - ${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \ - --with-devkit=$VS2013_HOME \ + ${jprt.productOpen.build.configure.args} +jprt.windows_i586.build.configure.args= \ + --with-devkit=$VS2013_HOME \ ${jprt.i586.build.configure.args} -jprt.windows_x64.build.configure.args= \ +jprt.windows_x64.build.configure.args= \ --with-devkit=$VS2013_HOME ######## From c5e7bbdd6c75684f434b20fdb6bec6463af62182 Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Wed, 15 Jul 2015 13:21:25 +0200 Subject: [PATCH 20/56] 8131328: Restore demo/jvmti tests Reviewed-by: sspitsyn --- jdk/test/TEST.groups | 4 +- jdk/test/demo/jvmti/Context.java | 188 ++++++++++++++++ jdk/test/demo/jvmti/DemoRun.java | 211 ++++++++++++++++++ jdk/test/demo/jvmti/HeapUser.java | 72 ++++++ jdk/test/demo/jvmti/Hello.java | 35 +++ .../CompiledMethodLoadTest.java | 51 +++++ jdk/test/demo/jvmti/gctest/BigHello.java | 47 ++++ jdk/test/demo/jvmti/gctest/Gctest.java | 51 +++++ .../jvmti/heapTracker/HeapTrackerTest.java | 52 +++++ .../demo/jvmti/heapViewer/HeapViewerTest.java | 52 +++++ jdk/test/demo/jvmti/minst/MinstExample.java | 39 ++++ jdk/test/demo/jvmti/minst/MinstTest.java | 52 +++++ .../FailsWhenJvmtiVersionDiffers.java | 57 +++++ jdk/test/demo/jvmti/waiters/WaitersTest.java | 52 +++++ 14 files changed, 962 insertions(+), 1 deletion(-) create mode 100644 jdk/test/demo/jvmti/Context.java create mode 100644 jdk/test/demo/jvmti/DemoRun.java create mode 100644 jdk/test/demo/jvmti/HeapUser.java create mode 100644 jdk/test/demo/jvmti/Hello.java create mode 100644 jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java create mode 100644 jdk/test/demo/jvmti/gctest/BigHello.java create mode 100644 jdk/test/demo/jvmti/gctest/Gctest.java create mode 100644 jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java create mode 100644 jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java create mode 100644 jdk/test/demo/jvmti/minst/MinstExample.java create mode 100644 jdk/test/demo/jvmti/minst/MinstTest.java create mode 100644 jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java create mode 100644 jdk/test/demo/jvmti/waiters/WaitersTest.java diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups index 9a985dd0e4c..f9e6753b340 100644 --- a/jdk/test/TEST.groups +++ b/jdk/test/TEST.groups @@ -223,7 +223,8 @@ svc_tools = \ sun/tools \ -sun/tools/java \ -sun/tools/jrunscript \ - sun/jvmstat + sun/jvmstat \ + demo/jvmti jdk_tools = \ :core_tools \ @@ -434,6 +435,7 @@ jdk = \ needs_jdk = \ :jdk_jdi \ com/sun/tools \ + demo \ sun/security/tools/jarsigner \ sun/security/tools/policytool \ sun/rmi/rmic \ diff --git a/jdk/test/demo/jvmti/Context.java b/jdk/test/demo/jvmti/Context.java new file mode 100644 index 00000000000..2bb822ffbaa --- /dev/null +++ b/jdk/test/demo/jvmti/Context.java @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * + * Sample target application for jvmti demos + * + * java Context [threadCount [iterationCount [sleepContention]]] + * Default: java Context 5 10 0 + * + * threadCount Number of threads + * iterationCount Total turns taken for all threads + * sleepContention Time for main thread to sleep while holding lock + * (creates monitor contention on all other threads) + * + */ + +/* Used to sync up turns and keep track of who's turn it is */ +final class TurnChecker { + int thread_index; + TurnChecker(int thread_index) { + this.thread_index = thread_index; + } +} + +/* Creates a bunch of threads that sequentially take turns */ +public final class Context extends Thread { + /* Used to track threads */ + private static long startTime; + private static TurnChecker turn = new TurnChecker(-1); + private static int total_turns_taken; + + /* Used for each Context thread */ + private final int thread_count; + private final int thread_index; + private final int thread_turns; + + /* Main program */ + public static void main(String[] argv) throws InterruptedException { + int default_thread_count = 5; + int default_thread_turns = 10; + int default_contention_sleep = 0; + int expected_turns_taken; + long sleepTime = 10L; + + /* Override defaults */ + if ( argv.length >= 1 ) { + default_thread_count = Integer.parseInt(argv[0]); + } + if ( argv.length >= 2 ) { + expected_turns_taken = Integer.parseInt(argv[1]); + default_thread_turns = expected_turns_taken/default_thread_count; + } + expected_turns_taken = default_thread_count*default_thread_turns; + if ( argv.length >= 3 ) { + default_contention_sleep = Integer.parseInt(argv[2]); + } + + System.out.println("Context started with " + + default_thread_count + " threads and " + + default_thread_turns + " turns per thread"); + + /* Get all threads running (they will block until we set turn) */ + for (int i = 0; i < default_thread_count; i++) { + new Context(default_thread_count, i, default_thread_turns).start(); + } + + /* Sleep to make sure thread_index 0 make it to the wait call */ + System.out.println("Context sleeping, so threads will start wait"); + Thread.yield(); + Thread.sleep(sleepTime); + + /* Save start time */ + startTime = System.currentTimeMillis(); + + /* This triggers the starting of taking turns */ + synchronized (turn) { + turn.thread_index = 0; + turn.notifyAll(); + } + System.out.println("Context sleeping, so threads can run"); + Thread.yield(); + Thread.sleep(sleepTime); + + /* Wait for threads to finish (after everyone has had their turns) */ + while ( true ) { + boolean done; + done = false; + synchronized (turn) { + if ( total_turns_taken == expected_turns_taken ) { + done = true; + } + /* Create some monitor contention by sleeping with lock */ + if ( default_contention_sleep > 0 ) { + System.out.println("Context sleeping, to create contention"); + Thread.yield(); + Thread.sleep((long)default_contention_sleep); + } + } + if ( done ) + break; + System.out.println("Context sleeping, so threads will complete"); + Thread.sleep(sleepTime); + } + + long endTime = System.currentTimeMillis(); + long totalTime = endTime - startTime; + + System.out.println("Total time (milliseconds): " + totalTime); + System.out.println("Milliseconds per thread: " + + ((double)totalTime / (default_thread_count))); + + System.out.println("Context completed"); + System.exit(0); + } + + /* Thread object to run */ + Context(int thread_count, int thread_index, int thread_turns) { + this.thread_count = thread_count; + this.thread_index = thread_index; + this.thread_turns = thread_turns; + } + + /* Main for thread */ + public void run() { + int next_thread_index = (thread_index + 1) % thread_count; + int turns_taken = 0; + + try { + + /* Loop until we make sure we get all our turns */ + for (int i = 0; i < thread_turns * thread_count; i++) { + synchronized (turn) { + /* Keep waiting for our turn */ + while (turn.thread_index != thread_index) + turn.wait(); + /* MY TURN! Each thread gets thread_turns */ + total_turns_taken++; + turns_taken++; + System.out.println("Turn #" + total_turns_taken + + " taken by thread " + thread_index + + ", " + turns_taken + + " turns taken by this thread"); + /* Give next thread a turn */ + turn.thread_index = next_thread_index; + turn.notifyAll(); + } + /* If we've had all our turns, break out of this loop */ + if (thread_turns == turns_taken) { + System.out.println("Loop end: thread got " + turns_taken + + " turns, expected " + thread_turns); + break; + } + } + } catch (InterruptedException intEx) { + System.out.println("Got an InterruptedException:" + intEx); + /* skip */ + } + + /* Make sure we got all our turns */ + if ( thread_turns != turns_taken ) { + System.out.println("ERROR: thread got " + turns_taken + + " turns, expected " + thread_turns); + System.exit(1); + } + } +} diff --git a/jdk/test/demo/jvmti/DemoRun.java b/jdk/test/demo/jvmti/DemoRun.java new file mode 100644 index 00000000000..1e5f47dd9b3 --- /dev/null +++ b/jdk/test/demo/jvmti/DemoRun.java @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* DemoRun: + * + * Support classes for java jvmti demo tests + * + */ + +import java.io.InputStream; +import java.io.IOException; +import java.io.File; +import java.io.BufferedInputStream; +import java.io.PrintStream; + +/* + * Helper class to direct process output to a StringBuffer + */ +class MyInputStream implements Runnable { + private String name; + private BufferedInputStream in; + private StringBuffer buffer; + + /* Create MyInputStream that saves all output to a StringBuffer */ + MyInputStream(String name, InputStream in) { + this.name = name; + this.in = new BufferedInputStream(in); + buffer = new StringBuffer(4096); + Thread thr = new Thread(this); + thr.setDaemon(true); + thr.start(); + } + + /* Dump the buffer */ + void dump(PrintStream x) { + String str = buffer.toString(); + x.println(""); + x.println(str); + x.println(""); + } + + /* Check to see if a pattern is inside the output. */ + boolean contains(String pattern) { + String str = buffer.toString(); + return str.contains(pattern); + } + + /* Runs as a separate thread capturing all output in a StringBuffer */ + public void run() { + try { + byte b[] = new byte[100]; + for (;;) { + int n = in.read(b); + String str; + if (n < 0) { + break; + } + str = new String(b, 0, n); + buffer.append(str); + System.out.print(str); + } + } catch (IOException ioe) { /* skip */ } + } +} + +/* + * Main JVMTI Demo Run class. + */ +public class DemoRun { + + private String demo_name; + private String demo_options; + private MyInputStream output; + private MyInputStream error; + + /* Create a Demo run process */ + public DemoRun(String name, String options) + { + demo_name = name; + demo_options = options; + } + + /* + * Execute a process with an -agentpath or -agentlib command option + */ + public void runit(String class_name) + { + runit(class_name, null); + } + + /* + * Execute a process with an -agentpath or -agentlib command option + * plus any set of other java options. + */ + public void runit(String class_name, String vm_options[]) + { + String sdk_home = System.getProperty("java.home"); + String cdir = System.getProperty("test.classes", "."); + String os_arch = System.getProperty("os.arch"); + String os_name = System.getProperty("os.name"); + String libprefix = os_name.contains("Windows")?"":"lib"; + String libsuffix = os_name.contains("Windows")?".dll": + os_name.contains("OS X")?".dylib":".so"; + String java = sdk_home + + File.separator + "bin" + + File.separator + "java"; + /* Array of strings to be passed in for exec: + * 1. java + * 2. -Dtest.classes=. + * 3. -Xcheck:jni (Just because it finds bugs) + * 4. -Xverify:all (Make sure verification is on full blast) + * 5. -agent + * vm_options + * 6+i. classname + */ + int nvm_options = 0; + if ( vm_options != null ) nvm_options = vm_options.length; + String cmd[] = new String[1 + 7 + nvm_options]; + String cmdLine; + int exitStatus; + int i,j; + + i = 0; + cmdLine = ""; + cmdLine += (cmd[i++] = java); + cmdLine += " "; + cmdLine += (cmd[i++] = "-cp"); + cmdLine += " "; + cmdLine += (cmd[i++] = cdir); + cmdLine += " "; + cmdLine += (cmd[i++] = "-Dtest.classes=" + cdir); + cmdLine += " "; + cmdLine += (cmd[i++] = "-Xcheck:jni"); + cmdLine += " "; + cmdLine += (cmd[i++] = "-Xverify:all"); + String libname = sdk_home + + File.separator + "demo" + + File.separator + "jvmti" + + File.separator + demo_name + + File.separator + "lib" + + File.separator + libprefix + demo_name + libsuffix; + cmdLine += " "; + cmdLine += (cmd[i++] = "-agentpath:" + libname + + (demo_options.equals("") ? "" : ("=" + demo_options))); + /* Add any special VM options */ + for ( j = 0; j < nvm_options; j++ ) { + cmdLine += " "; + cmdLine += (cmd[i++] = vm_options[j]); + } + /* Add classname */ + cmdLine += " "; + cmdLine += (cmd[i++] = class_name); + + /* Begin process */ + Process p; + + System.out.println("Starting: " + cmdLine); + try { + p = Runtime.getRuntime().exec(cmd); + } catch ( IOException e ) { + throw new RuntimeException("Test failed - exec got IO exception"); + } + + /* Save process output in StringBuffers */ + output = new MyInputStream("Input Stream", p.getInputStream()); + error = new MyInputStream("Error Stream", p.getErrorStream()); + + /* Wait for process to complete, and if exit code is non-zero we fail */ + try { + exitStatus = p.waitFor(); + if ( exitStatus != 0) { + System.out.println("Exit code is " + exitStatus); + error.dump(System.out); + output.dump(System.out); + throw new RuntimeException("Test failed - " + + "exit return code non-zero " + + "(exitStatus==" + exitStatus + ")"); + } + } catch ( InterruptedException e ) { + throw new RuntimeException("Test failed - process interrupted"); + } + System.out.println("Completed: " + cmdLine); + } + + /* Does the pattern appear in the output of this process */ + public boolean output_contains(String pattern) + { + return output.contains(pattern) || error.contains(pattern); + } +} diff --git a/jdk/test/demo/jvmti/HeapUser.java b/jdk/test/demo/jvmti/HeapUser.java new file mode 100644 index 00000000000..ea99979dd69 --- /dev/null +++ b/jdk/test/demo/jvmti/HeapUser.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * + * Sample target application + * + */ + +class Animal { + int category; + int age; +} + +class Pet extends Animal { + String owner; + String name; + String vet; + String records; + String address; + Pet(String name) { this.name = name; } +} + +class Dog extends Pet { + int breed; + int barks; + Dog(String name) { super(name); } +} + +class Cat extends Pet { + int breed; + int claws; + Cat(String name) { super(name); } +} + +public class HeapUser { + private static Dog dogs[]; + private static Cat cats[]; + public static void main(String args[]) { + System.out.println("HeapUser start, 101 dogs, 1000 cats"); + dogs = new Dog[101]; + for(int i=0; i<101; i++) { + dogs[i] = new Dog("fido " + i); + } + cats = new Cat[1000]; + for(int i=0; i<1000; i++) { + cats[i] = new Cat("feefee " + i); + } + System.out.println("HeapUser end"); + } +} diff --git a/jdk/test/demo/jvmti/Hello.java b/jdk/test/demo/jvmti/Hello.java new file mode 100644 index 00000000000..3161d28b7b9 --- /dev/null +++ b/jdk/test/demo/jvmti/Hello.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * + * Sample target application for jvmti demos + * + */ + +public class Hello { + public static void main(String args[]) { + System.out.println("Hello"); + } +} diff --git a/jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java b/jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java new file mode 100644 index 00000000000..c2cb13b174a --- /dev/null +++ b/jdk/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 6580131 + * @summary Test jvmti demo compiledMethodLoad + * + * @compile ../DemoRun.java ../Hello.java + * @build CompiledMethodLoadTest + * @run main CompiledMethodLoadTest Hello + */ + +public class CompiledMethodLoadTest { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI compiledMethodLoad agent (no options) */ + demo = new DemoRun("compiledMethodLoad", "" /* options to compiledMethodLoad */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} diff --git a/jdk/test/demo/jvmti/gctest/BigHello.java b/jdk/test/demo/jvmti/gctest/BigHello.java new file mode 100644 index 00000000000..b08643a5849 --- /dev/null +++ b/jdk/test/demo/jvmti/gctest/BigHello.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * + * Sample target application for gctest demo + * + */ + +public class BigHello { + private final static int NLOOPS = 20000; + private static Object garbage[]; + public static void main(String args[]) { + long count = 0; + System.out.println("Big Hello start"); + for(int i=1; i<=NLOOPS; i++) { + count += i; + garbage = new Object[i]; + garbage[0] = new Object(); + } + System.out.println("Allocated " + count + + " array elements, and " + NLOOPS + + " arrays and Objects."); + System.out.println("Big Hello end"); + } +} diff --git a/jdk/test/demo/jvmti/gctest/Gctest.java b/jdk/test/demo/jvmti/gctest/Gctest.java new file mode 100644 index 00000000000..2683cf2bc89 --- /dev/null +++ b/jdk/test/demo/jvmti/gctest/Gctest.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 5027764 + * @summary Test jvmti demo gctest + * + * @compile ../DemoRun.java + * @build BigHello Gctest + * @run main Gctest BigHello + */ + +public class Gctest { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI gctest agent (no options) */ + demo = new DemoRun("gctest", "" /* options to gctest */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} diff --git a/jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java b/jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java new file mode 100644 index 00000000000..68c2eb75ff8 --- /dev/null +++ b/jdk/test/demo/jvmti/heapTracker/HeapTrackerTest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 5050116 6299047 + * @summary Test jvmti demo heapTracker + * + * @compile ../DemoRun.java + * @compile ../HeapUser.java + * @build HeapTrackerTest + * @run main HeapTrackerTest HeapUser + */ + +public class HeapTrackerTest { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI heapTracker agent (no options) */ + demo = new DemoRun("heapTracker", "" /* options to heapTracker */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} diff --git a/jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java b/jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java new file mode 100644 index 00000000000..a49416a3293 --- /dev/null +++ b/jdk/test/demo/jvmti/heapViewer/HeapViewerTest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 5033539 + * @summary Test jvmti demo heapViewer + * + * @compile ../DemoRun.java + * @compile ../HeapUser.java + * @build HeapViewerTest + * @run main HeapViewerTest HeapUser + */ + +public class HeapViewerTest { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI heapViewer agent (no options) */ + demo = new DemoRun("heapViewer", "" /* options to heapViewer */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} diff --git a/jdk/test/demo/jvmti/minst/MinstExample.java b/jdk/test/demo/jvmti/minst/MinstExample.java new file mode 100644 index 00000000000..e16decb9ac8 --- /dev/null +++ b/jdk/test/demo/jvmti/minst/MinstExample.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* MinstExample: + * + */ + +public class MinstExample { + private static int called = 0; + private static void foobar() { + called++; + } + public static void main(String[] args) { + System.out.println("MinstExample started"); + for(int i=0; i<200; i++) foobar(); + System.out.println("MinstExample ended"); + } +} diff --git a/jdk/test/demo/jvmti/minst/MinstTest.java b/jdk/test/demo/jvmti/minst/MinstTest.java new file mode 100644 index 00000000000..b40afdf1004 --- /dev/null +++ b/jdk/test/demo/jvmti/minst/MinstTest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 6377205 + * @summary Test jvmti demo minst + * + * @compile ../DemoRun.java + * @compile MinstExample.java + * @build MinstTest + * @run main MinstTest MinstExample + */ + +public class MinstTest { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI minst agent (no options) */ + demo = new DemoRun("minst", "exclude=java/*,exclude=javax/*,exclude=com/*,exclude=jdk/*,exclude=sun/*" /* options to minst */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} diff --git a/jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java b/jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java new file mode 100644 index 00000000000..d169b938fb0 --- /dev/null +++ b/jdk/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 5039613 + * @summary Test jvmti demo versionCheck + * + * @compile ../DemoRun.java ../Hello.java + * @build FailsWhenJvmtiVersionDiffers + * @run main FailsWhenJvmtiVersionDiffers Hello + */ + +public class FailsWhenJvmtiVersionDiffers { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI versionCheck agent (no options) */ + demo = new DemoRun("versionCheck", "" /* options to versionCheck */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + System.out.println( + "NOTE: The jmvti.h file doesn't match the JVMTI in the VM.\n" + +" This may or may not be a serious issue.\n" + +" Check the jtr file for details.\n" + +" Call your local serviceability representative for help." + ); + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} diff --git a/jdk/test/demo/jvmti/waiters/WaitersTest.java b/jdk/test/demo/jvmti/waiters/WaitersTest.java new file mode 100644 index 00000000000..323615414a7 --- /dev/null +++ b/jdk/test/demo/jvmti/waiters/WaitersTest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* @test + * @bug 5027764 + * @summary Test jvmti demo waiters + * + * @compile ../DemoRun.java + * @compile ../Context.java + * @build WaitersTest + * @run main WaitersTest Context + */ + +public class WaitersTest { + + public static void main(String args[]) throws Exception { + DemoRun demo; + + /* Run demo that uses JVMTI waiters agent (no options) */ + demo = new DemoRun("waiters", "" /* options to waiters */ ); + demo.runit(args[0]); + + /* Make sure patterns in output look ok */ + if (demo.output_contains("ERROR")) { + throw new RuntimeException("Test failed - ERROR seen in output"); + } + + /* Must be a pass. */ + System.out.println("Test passed - cleanly terminated"); + } +} From ce283b134725deed3ef1e1efd7a1d2144983ded4 Mon Sep 17 00:00:00 2001 From: Christian Tornqvist Date: Wed, 15 Jul 2015 10:37:11 -0700 Subject: [PATCH 21/56] 8080733: [TESTBUG] several runtime/ErrorHandling/* tests time out on Windows Reviewed-by: coleenp, gtriantafill --- .../test/runtime/ErrorHandling/CreateCoredumpOnCrash.java | 8 -------- hotspot/test/runtime/ErrorHandling/TestOnError.java | 1 + hotspot/test/runtime/memory/ReserveMemory.java | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java b/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java index 209b2c22182..aae18e070c5 100644 --- a/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java +++ b/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java @@ -46,16 +46,8 @@ public class CreateCoredumpOnCrash { runTest("-XX:-CreateCoredumpOnCrash").shouldContain("CreateCoredumpOnCrash turned off, no core file dumped"); if (Platform.isWindows()) { - runTest("-XX:+CreateCoredumpOnCrash").shouldContain("Core dump will be written. Default location"); - // The old CreateMinidumpOnCrash option should still work - runTest("-XX:+CreateMinidumpOnCrash").shouldContain("Core dump will be written. Default location"); runTest("-XX:-CreateMinidumpOnCrash").shouldContain("CreateCoredumpOnCrash turned off, no core file dumped"); - - if (Platform.isDebugBuild()) { - // Make sure we create dumps on Windows debug builds by default - runTest("-Ddummyopt=false").shouldContain("Core dump will be written. Default location"); - } } else { runTest("-XX:+CreateCoredumpOnCrash").shouldNotContain("CreateCoredumpOnCrash turned off, no core file dumped"); } diff --git a/hotspot/test/runtime/ErrorHandling/TestOnError.java b/hotspot/test/runtime/ErrorHandling/TestOnError.java index e896f10cff6..4e8763f662e 100644 --- a/hotspot/test/runtime/ErrorHandling/TestOnError.java +++ b/hotspot/test/runtime/ErrorHandling/TestOnError.java @@ -45,6 +45,7 @@ public class TestOnError { // Execute the VM so that a ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( "-XX:-TransmitErrorReport", + "-XX:-CreateCoredumpOnCrash", "-XX:ErrorHandlerTest=12", // trigger potential SEGV "-XX:OnError=echo " + msg, TestOnError.class.getName()); diff --git a/hotspot/test/runtime/memory/ReserveMemory.java b/hotspot/test/runtime/memory/ReserveMemory.java index 9a1ad347425..4c0ecdcb8ce 100644 --- a/hotspot/test/runtime/memory/ReserveMemory.java +++ b/hotspot/test/runtime/memory/ReserveMemory.java @@ -60,6 +60,7 @@ public class ReserveMemory { "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", "-XX:-TransmitErrorReport", + "-XX:-CreateCoredumpOnCrash", "-Xmx32m", "ReserveMemory", "test"); From 6384ca7b1f93f5ca593f4de58db8536457c2224b Mon Sep 17 00:00:00 2001 From: Yumin Qi Date: Wed, 15 Jul 2015 12:24:41 -0700 Subject: [PATCH 22/56] 8025692: Log what methods are touched at run-time Added two diagnostic flags, LogTouchedMethods and PrintTouchedMethodsAtExit to list all methods that have been touched at run time. Added new jcmd, VM.print_touched_methods. Reviewed-by: acorn, iklam --- .../vm/templateInterpreter_aarch64.cpp | 6 +- .../cpu/ppc/vm/templateInterpreter_ppc.cpp | 4 +- .../sparc/vm/templateInterpreter_sparc.cpp | 6 +- .../cpu/x86/vm/templateInterpreter_x86_32.cpp | 6 +- .../cpu/x86/vm/templateInterpreter_x86_64.cpp | 6 +- hotspot/src/share/vm/ci/ciMethod.cpp | 3 + .../src/share/vm/classfile/symbolTable.cpp | 4 +- hotspot/src/share/vm/oops/method.cpp | 84 +++++++++++++++ hotspot/src/share/vm/oops/method.hpp | 2 + hotspot/src/share/vm/oops/symbol.hpp | 15 ++- hotspot/src/share/vm/runtime/globals.hpp | 6 ++ hotspot/src/share/vm/runtime/java.cpp | 8 ++ hotspot/src/share/vm/runtime/mutexLocker.cpp | 2 + hotspot/src/share/vm/runtime/mutexLocker.hpp | 1 + .../src/share/vm/runtime/vm_operations.hpp | 1 + .../share/vm/services/diagnosticCommand.cpp | 33 ++++++ .../share/vm/services/diagnosticCommand.hpp | 17 +++ .../CommandLine/PrintTouchedMethods.java | 101 ++++++++++++++++++ .../CommandLine/TestLogTouchedMethods.java | 32 ++++++ 19 files changed, 319 insertions(+), 18 deletions(-) create mode 100644 hotspot/test/runtime/CommandLine/PrintTouchedMethods.java create mode 100644 hotspot/test/runtime/CommandLine/TestLogTouchedMethods.java diff --git a/hotspot/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp index 32e4a29d865..1459495172f 100644 --- a/hotspot/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -869,7 +869,7 @@ void InterpreterGenerator::bang_stack_shadow_pages(bool native_call) { // native method than the typical interpreter frame setup. address InterpreterGenerator::generate_native_entry(bool synchronized) { // determine code generation flags - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // r1: Method* // rscratch1: sender sp @@ -1307,7 +1307,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { // address InterpreterGenerator::generate_normal_entry(bool synchronized) { // determine code generation flags - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // rscratch1: sender sp address entry_point = __ pc(); diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp b/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp index 2789be2aa55..bf41dae36ea 100644 --- a/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp @@ -668,7 +668,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) { address entry = __ pc(); - const bool inc_counter = UseCompiler || CountCompiledCalls; + const bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // ----------------------------------------------------------------------------- // Allocate a new frame that represents the native callee (i2n frame). @@ -1118,7 +1118,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) { // Generic interpreted method entry to (asm) interpreter. // address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) { - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; address entry = __ pc(); // Generate the code to allocate the interpreter stack frame. Register Rsize_of_parameters = R4_ARG2, // Written by generate_fixed_frame. diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp index c3039d51337..e9ffb17136e 100644 --- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -801,7 +801,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { // the following temporary registers are used during frame creation const Register Gtmp1 = G3_scratch ; const Register Gtmp2 = G1_scratch; - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // make sure registers are different! assert_different_registers(G2_thread, G5_method, Gargs, Gtmp1, Gtmp2); @@ -1225,7 +1225,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { address InterpreterGenerator::generate_normal_entry(bool synchronized) { address entry = __ pc(); - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // the following temporary registers are used during frame creation const Register Gtmp1 = G3_scratch ; diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp index 69c8533d12e..852695a092f 100644 --- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp +++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -849,7 +849,7 @@ address InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpret address InterpreterGenerator::generate_native_entry(bool synchronized) { // determine code generation flags - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // rbx,: Method* // rsi: sender sp @@ -1265,7 +1265,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { // address InterpreterGenerator::generate_normal_entry(bool synchronized) { // determine code generation flags - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // rbx,: Method* // rsi: sender sp diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp index 6318a958517..06fd2b0d651 100644 --- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp +++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -809,7 +809,7 @@ address InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpret // native method than the typical interpreter frame setup. address InterpreterGenerator::generate_native_entry(bool synchronized) { // determine code generation flags - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // rbx: Method* // r13: sender sp @@ -1256,7 +1256,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { // address InterpreterGenerator::generate_normal_entry(bool synchronized) { // determine code generation flags - bool inc_counter = UseCompiler || CountCompiledCalls; + bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods; // ebx: Method* // r13: sender sp diff --git a/hotspot/src/share/vm/ci/ciMethod.cpp b/hotspot/src/share/vm/ci/ciMethod.cpp index 101056794c6..8bc5b319f4a 100644 --- a/hotspot/src/share/vm/ci/ciMethod.cpp +++ b/hotspot/src/share/vm/ci/ciMethod.cpp @@ -75,6 +75,9 @@ ciMethod::ciMethod(methodHandle h_m, ciInstanceKlass* holder) : { assert(h_m() != NULL, "no null method"); + if (LogTouchedMethods) { + h_m()->log_touched(Thread::current()); + } // These fields are always filled in in loaded methods. _flags = ciFlags(h_m()->access_flags()); diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp index f67bae45a84..faef8d12d0d 100644 --- a/hotspot/src/share/vm/classfile/symbolTable.cpp +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp @@ -58,14 +58,14 @@ Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS if (DumpSharedSpaces) { // Allocate all symbols to CLD shared metaspace - sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, -1); + sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, PERM_REFCOUNT); } else if (c_heap) { // refcount starts as 1 sym = new (len, THREAD) Symbol(name, len, 1); assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted"); } else { // Allocate to global arena - sym = new (len, arena(), THREAD) Symbol(name, len, -1); + sym = new (len, arena(), THREAD) Symbol(name, len, PERM_REFCOUNT); } return sym; } diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp index b484045f75d..089d3896459 100644 --- a/hotspot/src/share/vm/oops/method.cpp +++ b/hotspot/src/share/vm/oops/method.cpp @@ -422,6 +422,11 @@ MethodCounters* Method::build_method_counters(Method* m, TRAPS) { if (!mh->init_method_counters(counters)) { MetadataFactory::free_metadata(mh->method_holder()->class_loader_data(), counters); } + + if (LogTouchedMethods) { + mh->log_touched(CHECK_NULL); + } + return mh->method_counters(); } @@ -2130,6 +2135,85 @@ void Method::collect_statistics(KlassSizeStats *sz) const { } #endif // INCLUDE_SERVICES +// LogTouchedMethods and PrintTouchedMethods + +// TouchedMethodRecord -- we can't use a HashtableEntry because +// the Method may be garbage collected. Let's roll our own hash table. +class TouchedMethodRecord : CHeapObj { +public: + // It's OK to store Symbols here because they will NOT be GC'ed if + // LogTouchedMethods is enabled. + TouchedMethodRecord* _next; + Symbol* _class_name; + Symbol* _method_name; + Symbol* _method_signature; +}; + +static const int TOUCHED_METHOD_TABLE_SIZE = 20011; +static TouchedMethodRecord** _touched_method_table = NULL; + +void Method::log_touched(TRAPS) { + + const int table_size = TOUCHED_METHOD_TABLE_SIZE; + Symbol* my_class = klass_name(); + Symbol* my_name = name(); + Symbol* my_sig = signature(); + + unsigned int hash = my_class->identity_hash() + + my_name->identity_hash() + + my_sig->identity_hash(); + juint index = juint(hash) % table_size; + + MutexLocker ml(TouchedMethodLog_lock, THREAD); + if (_touched_method_table == NULL) { + _touched_method_table = NEW_C_HEAP_ARRAY2(TouchedMethodRecord*, table_size, + mtTracing, CURRENT_PC); + memset(_touched_method_table, 0, sizeof(TouchedMethodRecord*)*table_size); + } + + TouchedMethodRecord* ptr = _touched_method_table[index]; + while (ptr) { + if (ptr->_class_name == my_class && + ptr->_method_name == my_name && + ptr->_method_signature == my_sig) { + return; + } + if (ptr->_next == NULL) break; + ptr = ptr->_next; + } + TouchedMethodRecord* nptr = NEW_C_HEAP_OBJ(TouchedMethodRecord, mtTracing); + my_class->set_permanent(); // prevent reclaimed by GC + my_name->set_permanent(); + my_sig->set_permanent(); + nptr->_class_name = my_class; + nptr->_method_name = my_name; + nptr->_method_signature = my_sig; + nptr->_next = NULL; + + if (ptr == NULL) { + // first + _touched_method_table[index] = nptr; + } else { + ptr->_next = nptr; + } +} + +void Method::print_touched_methods(outputStream* out) { + MutexLockerEx ml(Thread::current()->is_VM_thread() ? NULL : TouchedMethodLog_lock); + out->print_cr("# Method::print_touched_methods version 1"); + if (_touched_method_table) { + for (int i = 0; i < TOUCHED_METHOD_TABLE_SIZE; i++) { + TouchedMethodRecord* ptr = _touched_method_table[i]; + while(ptr) { + ptr->_class_name->print_symbol_on(out); out->print("."); + ptr->_method_name->print_symbol_on(out); out->print(":"); + ptr->_method_signature->print_symbol_on(out); out->cr(); + ptr = ptr->_next; + } + } + } +} + // Verification void Method::verify_on(outputStream* st) { diff --git a/hotspot/src/share/vm/oops/method.hpp b/hotspot/src/share/vm/oops/method.hpp index 8700052a953..539e2978858 100644 --- a/hotspot/src/share/vm/oops/method.hpp +++ b/hotspot/src/share/vm/oops/method.hpp @@ -625,6 +625,8 @@ class Method : public Metadata { #if INCLUDE_SERVICES void collect_statistics(KlassSizeStats *sz) const; #endif + void log_touched(TRAPS); + static void print_touched_methods(outputStream* out); // interpreter support static ByteSize const_offset() { return byte_offset_of(Method, _constMethod ); } diff --git a/hotspot/src/share/vm/oops/symbol.hpp b/hotspot/src/share/vm/oops/symbol.hpp index aaa55c58992..2917f22bdd9 100644 --- a/hotspot/src/share/vm/oops/symbol.hpp +++ b/hotspot/src/share/vm/oops/symbol.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -96,12 +96,16 @@ // TempNewSymbol (passed in as a parameter) so the reference count on its symbol // will be decremented when it goes out of scope. - // This cannot be inherited from ResourceObj because it cannot have a vtable. // Since sometimes this is allocated from Metadata, pick a base allocation // type without virtual functions. class ClassLoaderData; +// Set _refcount to PERM_REFCOUNT to prevent the Symbol from being GC'ed. +#ifndef PERM_REFCOUNT +#define PERM_REFCOUNT -1 +#endif + // We separate the fields in SymbolBase from Symbol::_body so that // Symbol::size(int) can correctly calculate the space needed. class SymbolBase : public MetaspaceObj { @@ -160,6 +164,13 @@ class Symbol : private SymbolBase { int refcount() const { return _refcount; } void increment_refcount(); void decrement_refcount(); + // Set _refcount non zero to avoid being reclaimed by GC. + void set_permanent() { + assert(LogTouchedMethods, "Should not be called with LogTouchedMethods off"); + if (_refcount != PERM_REFCOUNT) { + _refcount = PERM_REFCOUNT; + } + } int byte_at(int index) const { assert(index >=0 && index < _length, "symbol index overflow"); diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index e17d99af220..8675a73e929 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -2717,6 +2717,12 @@ public: develop(bool, EagerInitialization, false, \ "Eagerly initialize classes if possible") \ \ + diagnostic(bool, LogTouchedMethods, false, \ + "Log methods which have been ever touched in runtime") \ + \ + diagnostic(bool, PrintTouchedMethodsAtExit, false, \ + "Print all methods that have been ever touched in runtime") \ + \ develop(bool, TraceMethodReplacement, false, \ "Print when methods are replaced do to recompilation") \ \ diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp index 9288b12755c..db44a81eb9f 100644 --- a/hotspot/src/share/vm/runtime/java.cpp +++ b/hotspot/src/share/vm/runtime/java.cpp @@ -330,6 +330,10 @@ void print_statistics() { SystemDictionary::print(); } + if (LogTouchedMethods && PrintTouchedMethodsAtExit) { + Method::print_touched_methods(tty); + } + if (PrintBiasedLockingStatistics) { BiasedLocking::print_counters(); } @@ -382,6 +386,10 @@ void print_statistics() { if (PrintNMTStatistics) { MemTracker::final_report(tty); } + + if (LogTouchedMethods && PrintTouchedMethodsAtExit) { + Method::print_touched_methods(tty); + } } #endif diff --git a/hotspot/src/share/vm/runtime/mutexLocker.cpp b/hotspot/src/share/vm/runtime/mutexLocker.cpp index fde75f3feae..96ee4cbe53f 100644 --- a/hotspot/src/share/vm/runtime/mutexLocker.cpp +++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp @@ -63,6 +63,7 @@ Monitor* StringDedupQueue_lock = NULL; Mutex* StringDedupTable_lock = NULL; Monitor* CodeCache_lock = NULL; Mutex* MethodData_lock = NULL; +Mutex* TouchedMethodLog_lock = NULL; Mutex* RetData_lock = NULL; Monitor* VMOperationQueue_lock = NULL; Monitor* VMOperationRequest_lock = NULL; @@ -274,6 +275,7 @@ void mutex_init() { def(Compile_lock , Mutex , nonleaf+3, true, Monitor::_safepoint_check_sometimes); def(MethodData_lock , Mutex , nonleaf+3, false, Monitor::_safepoint_check_always); + def(TouchedMethodLog_lock , Mutex , nonleaf+3, false, Monitor::_safepoint_check_always); def(MethodCompileQueue_lock , Monitor, nonleaf+4, true, Monitor::_safepoint_check_always); def(Debug2_lock , Mutex , nonleaf+4, true, Monitor::_safepoint_check_never); diff --git a/hotspot/src/share/vm/runtime/mutexLocker.hpp b/hotspot/src/share/vm/runtime/mutexLocker.hpp index cc847c0c8e5..0028b2e9963 100644 --- a/hotspot/src/share/vm/runtime/mutexLocker.hpp +++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp @@ -55,6 +55,7 @@ extern Monitor* StringDedupQueue_lock; // a lock on the string dedupli extern Mutex* StringDedupTable_lock; // a lock on the string deduplication table extern Monitor* CodeCache_lock; // a lock on the CodeCache, rank is special, use MutexLockerEx extern Mutex* MethodData_lock; // a lock on installation of method data +extern Mutex* TouchedMethodLog_lock; // a lock on allocation of LogExecutedMethods info extern Mutex* RetData_lock; // a lock on installation of RetData inside method data extern Mutex* DerivedPointerTableGC_lock; // a lock to protect the derived pointer table extern Monitor* VMOperationQueue_lock; // a lock on queue of vm_operations waiting to execute diff --git a/hotspot/src/share/vm/runtime/vm_operations.hpp b/hotspot/src/share/vm/runtime/vm_operations.hpp index 19d3331e11f..71f8a141cd5 100644 --- a/hotspot/src/share/vm/runtime/vm_operations.hpp +++ b/hotspot/src/share/vm/runtime/vm_operations.hpp @@ -101,6 +101,7 @@ template(WhiteBoxOperation) \ template(ClassLoaderStatsOperation) \ template(DumpHashtable) \ + template(DumpTouchedMethods) \ template(MarkActiveNMethods) \ template(PrintCompileQueue) \ template(PrintCodeList) \ diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp index 11c307d054d..e0fa2193c11 100644 --- a/hotspot/src/share/vm/services/diagnosticCommand.cpp +++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp @@ -74,6 +74,7 @@ void DCmdRegistrant::register_dcmds(){ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); + DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export, true, false)); // Enhanced JMX Agent Support // These commands won't be exported via the DiagnosticCommandMBean until an @@ -808,3 +809,35 @@ int ClassHierarchyDCmd::num_arguments() { } #endif + +class VM_DumpTouchedMethods : public VM_Operation { +private: + outputStream* _out; +public: + VM_DumpTouchedMethods(outputStream* out) { + _out = out; + } + + virtual VMOp_Type type() const { return VMOp_DumpTouchedMethods; } + + virtual void doit() { + Method::print_touched_methods(_out); + } +}; + +TouchedMethodsDCmd::TouchedMethodsDCmd(outputStream* output, bool heap) : + DCmdWithParser(output, heap) +{} + +void TouchedMethodsDCmd::execute(DCmdSource source, TRAPS) { + if (!UnlockDiagnosticVMOptions) { + output()->print_cr("VM.touched_methods command requires -XX:+UnlockDiagnosticVMOptions"); + return; + } + VM_DumpTouchedMethods dumper(output()); + VMThread::execute(&dumper); +} + +int TouchedMethodsDCmd::num_arguments() { + return 0; +} diff --git a/hotspot/src/share/vm/services/diagnosticCommand.hpp b/hotspot/src/share/vm/services/diagnosticCommand.hpp index 71dbf62e629..9362687128a 100644 --- a/hotspot/src/share/vm/services/diagnosticCommand.hpp +++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp @@ -35,6 +35,7 @@ #include "services/diagnosticFramework.hpp" #include "utilities/macros.hpp" #include "utilities/ostream.hpp" +#include "oops/method.hpp" class HelpDCmd : public DCmdWithParser { protected: @@ -341,6 +342,22 @@ public: virtual void execute(DCmdSource source, TRAPS); }; +class TouchedMethodsDCmd : public DCmdWithParser { +public: + TouchedMethodsDCmd(outputStream* output, bool heap); + static const char* name() { + return "VM.print_touched_methods"; + } + static const char* description() { + return "Print all methods that have ever been touched during the lifetime of this JVM."; + } + static const char* impact() { + return "Medium: Depends on Java content."; + } + static int num_arguments(); + virtual void execute(DCmdSource source, TRAPS); +}; + // See also: thread_dump in attachListener.cpp class ThreadDumpDCmd : public DCmdWithParser { protected: diff --git a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java new file mode 100644 index 00000000000..0eb1852552a --- /dev/null +++ b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8025692 + * @modules java.base/sun.misc + * java.management + * @library /testlibrary + * @compile TestLogTouchedMethods.java PrintTouchedMethods.java + * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+LogTouchedMethods PrintTouchedMethods + */ + +import java.io.File; +import java.util.List; +import jdk.test.lib.*; + +public class PrintTouchedMethods { + + public static void main(String args[]) throws Exception { + String[] javaArgs1 = {"-XX:-UnlockDiagnosticVMOptions", "-XX:+LogTouchedMethods", "-XX:+PrintTouchedMethodsAtExit", "TestLogTouchedMethods"}; + ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(javaArgs1); + + // UnlockDiagnostic turned off, should fail + OutputAnalyzer output = new OutputAnalyzer(pb.start()); + output.shouldContain("Error: VM option 'LogTouchedMethods' is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions."); + output.shouldContain("Error: Could not create the Java Virtual Machine."); + + String[] javaArgs2 = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+LogTouchedMethods", "-XX:+PrintTouchedMethodsAtExit", "TestLogTouchedMethods"}; + pb = ProcessTools.createJavaProcessBuilder(javaArgs2); + output = new OutputAnalyzer(pb.start()); + // check order: + // 1 "# Method::print_touched_methods version 1" is the first in first line + // 2 should contain TestLogMethods.methodA:()V + // 3 should not contain TestLogMethods.methodB:()V + // Repeat above for another run with -Xint + List lines = output.asLines(); + + if (lines.size() < 1) { + throw new Exception("Empty output"); + } + + String first = lines.get(0); + if (!first.equals("# Method::print_touched_methods version 1")) { + throw new Exception("First line mismatch"); + } + + output.shouldContain("TestLogTouchedMethods.methodA:()V"); + output.shouldNotContain("TestLogTouchedMethods.methodB:()V"); + output.shouldHaveExitValue(0); + + String[] javaArgs3 = {"-XX:+UnlockDiagnosticVMOptions", "-Xint", "-XX:+LogTouchedMethods", "-XX:+PrintTouchedMethodsAtExit", "TestLogTouchedMethods"}; + pb = ProcessTools.createJavaProcessBuilder(javaArgs3); + output = new OutputAnalyzer(pb.start()); + lines = output.asLines(); + + if (lines.size() < 1) { + throw new Exception("Empty output"); + } + + first = lines.get(0); + if (!first.equals("# Method::print_touched_methods version 1")) { + throw new Exception("First line mismatch"); + } + + output.shouldContain("TestLogTouchedMethods.methodA:()V"); + output.shouldNotContain("TestLogTouchedMethods.methodB:()V"); + output.shouldHaveExitValue(0); + + // Test jcmd PrintTouchedMethods VM.print_touched_methods + String pid = Integer.toString(ProcessTools.getProcessId()); + pb = new ProcessBuilder(); + pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.print_touched_methods"}); + output = new OutputAnalyzer(pb.start()); + try { + output.shouldContain("PrintTouchedMethods.main:([Ljava/lang/String;)V"); + } catch (RuntimeException e) { + output.shouldContain("Unknown diagnostic command"); + } + } +} diff --git a/hotspot/test/runtime/CommandLine/TestLogTouchedMethods.java b/hotspot/test/runtime/CommandLine/TestLogTouchedMethods.java new file mode 100644 index 00000000000..57996b383d9 --- /dev/null +++ b/hotspot/test/runtime/CommandLine/TestLogTouchedMethods.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* used by PrintTouchedMethods.java */ +public class TestLogTouchedMethods { + public static void main(String[] args) { + new TestLogTouchedMethods().methodA(); + } + + public void methodA() {} // called + public void methodB() {} // this should not be called +} From 6964787851723e6484d9a592e81a55fa228e80ca Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Wed, 15 Jul 2015 15:52:55 -0700 Subject: [PATCH 23/56] 8131331: tmtools/jstack/locks/wait_interrupt and wait_notify fail due to wrong number of lock records Make new thread dump output line optional Reviewed-by: dholmes --- hotspot/src/share/vm/runtime/vframe.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/runtime/vframe.cpp b/hotspot/src/share/vm/runtime/vframe.cpp index ca37dd04203..ef3ca343847 100644 --- a/hotspot/src/share/vm/runtime/vframe.cpp +++ b/hotspot/src/share/vm/runtime/vframe.cpp @@ -235,12 +235,14 @@ void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) { // disable the extra printing below. mark = NULL; } - } else if (frame_count != 0) { + } else if (frame_count != 0 && ObjectMonitor::Knob_Verbose) { // This is not the first frame so we either own this monitor // or we owned the monitor before and called wait(). Because // wait() could have been called on any monitor in a lower // numbered frame on the stack, we have to check all the // monitors on the list for this frame. + // Note: Only enable this new output line in verbose mode + // since existing tests are not ready for it. mark = monitor->owner()->mark(); if (mark->has_monitor() && ( // we have marked ourself as pending on this monitor From d9cbd23d508768f4b48a10eb92f2e405c406522a Mon Sep 17 00:00:00 2001 From: Michael Haupt Date: Fri, 17 Jul 2015 08:10:41 +0200 Subject: [PATCH 24/56] 8062543: Replace uses of MethodHandleImpl.castReference with Class.cast Reviewed-by: psandoz, vlivanov --- .../lang/invoke/InvokerBytecodeGenerator.java | 5 ++- .../java/lang/invoke/MethodHandleImpl.java | 36 +++++-------------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index 6698d9da36e..2c94e081568 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,7 +61,6 @@ class InvokerBytecodeGenerator { private static final String LFN_SIG = "L" + LFN + ";"; private static final String LL_SIG = "(L" + OBJ + ";)L" + OBJ + ";"; private static final String LLV_SIG = "(L" + OBJ + ";L" + OBJ + ";)V"; - private static final String CLL_SIG = "(L" + CLS + ";L" + OBJ + ";)L" + OBJ + ";"; /** Name of its super class*/ private static final String superName = OBJ; @@ -571,7 +570,7 @@ class InvokerBytecodeGenerator { mv.visitLdcInsn(constantPlaceholder(cls)); mv.visitTypeInsn(Opcodes.CHECKCAST, CLS); mv.visitInsn(Opcodes.SWAP); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, MHI, "castReference", CLL_SIG, false); + mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, CLS, "cast", LL_SIG, false); if (Object[].class.isAssignableFrom(cls)) mv.visitTypeInsn(Opcodes.CHECKCAST, OBJARY); else if (PROFILE_LEVEL > 0) diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java index 4de3439d0a4..3fad3315ea1 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -219,7 +219,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; if (convSpec == null) continue; MethodHandle fn; if (convSpec instanceof Class) { - fn = Lazy.MH_castReference.bindTo(convSpec); + fn = Lazy.MH_cast.bindTo(convSpec); } else { fn = (MethodHandle) convSpec; } @@ -239,7 +239,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; if (convSpec == void.class) fn = null; else - fn = Lazy.MH_castReference.bindTo(convSpec); + fn = Lazy.MH_cast.bindTo(convSpec); } else { fn = (MethodHandle) convSpec; } @@ -302,7 +302,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; Name conv; if (convSpec instanceof Class) { Class convClass = (Class) convSpec; - conv = new Name(Lazy.MH_castReference, convClass, names[INARG_BASE + i]); + conv = new Name(Lazy.MH_cast, convClass, names[INARG_BASE + i]); } else { MethodHandle fn = (MethodHandle) convSpec; conv = new Name(fn, names[INARG_BASE + i]); @@ -326,7 +326,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; conv = new Name(LambdaForm.constantZero(BasicType.basicType(srcType.returnType()))); } else if (convSpec instanceof Class) { Class convClass = (Class) convSpec; - conv = new Name(Lazy.MH_castReference, convClass, names[OUT_CALL]); + conv = new Name(Lazy.MH_cast, convClass, names[OUT_CALL]); } else { MethodHandle fn = (MethodHandle) convSpec; if (fn.type().parameterCount() == 0) @@ -343,25 +343,6 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; return SimpleMethodHandle.make(srcType, form); } - /** - * Identity function, with reference cast. - * @param t an arbitrary reference type - * @param x an arbitrary reference value - * @return the same value x - */ - @ForceInline - @SuppressWarnings("unchecked") - static T castReference(Class t, U x) { - // inlined Class.cast because we can't ForceInline it - if (x != null && !t.isInstance(x)) - throw newClassCastException(t, x); - return (T) x; - } - - private static ClassCastException newClassCastException(Class t, Object obj) { - return new ClassCastException("Cannot cast " + obj.getClass().getName() + " to " + t.getName()); - } - static Object[] computeValueConversions(MethodType srcType, MethodType dstType, boolean strict, boolean monobox) { final int INARG_COUNT = srcType.parameterCount(); @@ -591,6 +572,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; */ static class Lazy { private static final Class MHI = MethodHandleImpl.class; + private static final Class CLS = Class.class; private static final MethodHandle[] ARRAYS; private static final MethodHandle[] FILL_ARRAYS; @@ -600,7 +582,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; static final NamedFunction NF_throwException; static final NamedFunction NF_profileBoolean; - static final MethodHandle MH_castReference; + static final MethodHandle MH_cast; static final MethodHandle MH_selectAlternative; static final MethodHandle MH_copyAsPrimitiveArray; static final MethodHandle MH_fillNewTypedArray; @@ -623,8 +605,8 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP; NF_throwException.resolve(); NF_profileBoolean.resolve(); - MH_castReference = IMPL_LOOKUP.findStatic(MHI, "castReference", - MethodType.methodType(Object.class, Class.class, Object.class)); + MH_cast = IMPL_LOOKUP.findVirtual(CLS, "cast", + MethodType.methodType(Object.class, Object.class)); MH_copyAsPrimitiveArray = IMPL_LOOKUP.findStatic(MHI, "copyAsPrimitiveArray", MethodType.methodType(Object.class, Wrapper.class, Object[].class)); MH_arrayIdentity = IMPL_LOOKUP.findStatic(MHI, "identity", From 4ae1cb2cd60869d27ec44204dcdbe1d8a1f1395d Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Fri, 17 Jul 2015 12:46:07 +0100 Subject: [PATCH 25/56] 8130304: Inference: NodeNotFoundException thrown with deep generic method call chain Bug in Tarjan implementation is generating node ids which can overflow 32 bits Reviewed-by: vromero --- .../com/sun/tools/javac/util/GraphUtils.java | 72 ++++++++++++------ .../generics/inference/8130304/T8130304.java | 74 +++++++++++++++++++ 2 files changed, 122 insertions(+), 24 deletions(-) create mode 100644 langtools/test/tools/javac/generics/inference/8130304/T8130304.java diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java index b7257bbb8ff..935ae3e6ade 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java @@ -151,32 +151,57 @@ public class GraphUtils { * directed graph in linear time. Works on TarjanNode. */ public static > List> tarjan(Iterable nodes) { - ListBuffer> cycles = new ListBuffer<>(); - ListBuffer stack = new ListBuffer<>(); - int index = 0; - for (N node: nodes) { - if (node.index == -1) { - index += tarjan(node, index, stack, cycles); - } - } - return cycles.toList(); + Tarjan tarjan = new Tarjan<>(); + return tarjan.findSCC(nodes); } + //where + private static class Tarjan> { - private static > int tarjan(N v, int index, ListBuffer stack, ListBuffer> cycles) { - v.index = index; - v.lowlink = index; - index++; - stack.prepend(v); - v.active = true; - for (N n: v.getAllDependencies()) { - if (n.index == -1) { - tarjan(n, index, stack, cycles); - v.lowlink = Math.min(v.lowlink, n.lowlink); - } else if (stack.contains(n)) { - v.lowlink = Math.min(v.lowlink, n.index); + /** Unique node identifier. */ + int index = 0; + + /** List of SCCs found fso far. */ + ListBuffer> sccs = new ListBuffer<>(); + + /** Stack of all reacheable nodes from given root. */ + ListBuffer stack = new ListBuffer<>(); + + private List> findSCC(Iterable nodes) { + for (N node : nodes) { + if (node.index == -1) { + findSCC(node); + } + } + return sccs.toList(); + } + + private void findSCC(N v) { + visitNode(v); + for (N n: v.getAllDependencies()) { + if (n.index == -1) { + //it's the first time we see this node + findSCC(n); + v.lowlink = Math.min(v.lowlink, n.lowlink); + } else if (stack.contains(n)) { + //this node is already reachable from current root + v.lowlink = Math.min(v.lowlink, n.index); + } + } + if (v.lowlink == v.index) { + //v is the root of a SCC + addSCC(v); } } - if (v.lowlink == v.index) { + + private void visitNode(N n) { + n.index = index; + n.lowlink = index; + index++; + stack.prepend(n); + n.active = true; + } + + private void addSCC(N v) { N n; ListBuffer cycle = new ListBuffer<>(); do { @@ -184,9 +209,8 @@ public class GraphUtils { n.active = false; cycle.add(n); } while (n != v); - cycles.add(cycle.toList()); + sccs.add(cycle.toList()); } - return index; } /** diff --git a/langtools/test/tools/javac/generics/inference/8130304/T8130304.java b/langtools/test/tools/javac/generics/inference/8130304/T8130304.java new file mode 100644 index 00000000000..ebbecaee926 --- /dev/null +++ b/langtools/test/tools/javac/generics/inference/8130304/T8130304.java @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8130304 + * @summary Inference: NodeNotFoundException thrown with deep generic method call chain + * @compile T8130304.java + */ +class T8130304 { + + void test() { + outer( + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner(), + inner()); + } + + void outer(T... ts) { } + + T inner() { + return null; + } +} From 978d434abf398eae5aef82e5b7870a61ac3e72b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Mon, 20 Jul 2015 13:11:26 +0200 Subject: [PATCH 26/56] 8131340: Varargs function is recompiled each time it is linked Reviewed-by: mhaupt, sundar --- .../runtime/FinalScriptFunctionData.java | 20 ++++++--- .../RecompilableScriptFunctionData.java | 31 +++++++------ .../internal/runtime/ScriptFunctionData.java | 26 ++--------- nashorn/test/script/basic/JDK-8131340.js | 43 +++++++++++++++++++ 4 files changed, 80 insertions(+), 40 deletions(-) create mode 100644 nashorn/test/script/basic/JDK-8131340.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java index c868aab2884..4ea286ea804 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java @@ -27,6 +27,7 @@ package jdk.nashorn.internal.runtime; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; +import java.util.Collection; import java.util.List; /** @@ -71,11 +72,6 @@ final class FinalScriptFunctionData extends ScriptFunctionData { } } - @Override - boolean isRecompilable() { - return false; - } - @Override protected boolean needsCallee() { final boolean needsCallee = code.getFirst().needsCallee(); @@ -92,6 +88,20 @@ final class FinalScriptFunctionData extends ScriptFunctionData { return true; } + @Override + CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope, final Collection forbidden) { + assert isValidCallSite(callSiteType) : callSiteType; + + CompiledFunction best = null; + for (final CompiledFunction candidate: code) { + if (!forbidden.contains(candidate) && candidate.betterThanFinal(best, callSiteType)) { + best = candidate; + } + } + + return best; + } + @Override MethodType getGenericType() { // We need to ask the code for its generic type. We can't just rely on this function data's arity, as it's not diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java index b06b9b98fa4..e058a9ed73f 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java @@ -617,6 +617,7 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp private CompiledFunction addCode(final MethodHandle target, final Map invalidatedProgramPoints, final MethodType callSiteType, final int fnFlags) { final CompiledFunction cfn = new CompiledFunction(target, this, invalidatedProgramPoints, callSiteType, fnFlags); + assert noDuplicateCode(cfn) : "duplicate code"; code.add(cfn); return cfn; } @@ -683,14 +684,17 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp @Override synchronized CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope, final Collection forbidden) { - CompiledFunction existingBest = super.getBest(callSiteType, runtimeScope, forbidden); + assert isValidCallSite(callSiteType) : callSiteType; + + CompiledFunction existingBest = pickFunction(callSiteType, false); + if (existingBest == null) { + existingBest = pickFunction(callSiteType, true); // try vararg last + } if (existingBest == null) { existingBest = addCode(compileTypeSpecialization(callSiteType, runtimeScope, true), callSiteType); } assert existingBest != null; - //we are calling a vararg method with real args - boolean varArgWithRealArgs = existingBest.isVarArg() && !CompiledFunction.isVarArgsType(callSiteType); //if the best one is an apply to call, it has to match the callsite exactly //or we need to regenerate @@ -699,26 +703,17 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp if (best != null) { return best; } - varArgWithRealArgs = true; - } - if (varArgWithRealArgs) { // special case: we had an apply to call, but we failed to make it fit. // Try to generate a specialized one for this callsite. It may // be another apply to call specialization, or it may not, but whatever // it is, it is a specialization that is guaranteed to fit - final FunctionInitializer fnInit = compileTypeSpecialization(callSiteType, runtimeScope, false); - existingBest = addCode(fnInit, callSiteType); + existingBest = addCode(compileTypeSpecialization(callSiteType, runtimeScope, false), callSiteType); } return existingBest; } - @Override - boolean isRecompilable() { - return true; - } - @Override public boolean needsCallee() { return getFunctionFlag(FunctionNode.NEEDS_CALLEE); @@ -827,6 +822,16 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp return newFn; } + // Make sure code does not contain a compiled function with the same signature as compiledFunction + private boolean noDuplicateCode(final CompiledFunction compiledFunction) { + for (final CompiledFunction cf : code) { + if (cf.type().equals(compiledFunction.type())) { + return false; + } + } + return true; + } + private void readObject(final java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); createLogger(); diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java index 012898bb2e3..d5674b74bd5 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java @@ -359,31 +359,13 @@ public abstract class ScriptFunctionData implements Serializable { * scope is not known, but that might cause compilation of code that will need more deoptimization passes. * @return the best function for the specified call site type. */ - CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope, final Collection forbidden) { - assert callSiteType.parameterCount() >= 2 : callSiteType; // Must have at least (callee, this) - assert callSiteType.parameterType(0).isAssignableFrom(ScriptFunction.class) : callSiteType; // Callee must be assignable from script function + abstract CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope, final Collection forbidden); - if (isRecompilable()) { - final CompiledFunction candidate = pickFunction(callSiteType, false); - if (candidate != null) { - return candidate; - } - return pickFunction(callSiteType, true); //try vararg last - } - - CompiledFunction best = null; - for (final CompiledFunction candidate: code) { - if (!forbidden.contains(candidate) && candidate.betterThanFinal(best, callSiteType)) { - best = candidate; - } - } - - return best; + boolean isValidCallSite(final MethodType callSiteType) { + return callSiteType.parameterCount() >= 2 && // Must have at least (callee, this) + callSiteType.parameterType(0).isAssignableFrom(ScriptFunction.class); // Callee must be assignable from script function } - - abstract boolean isRecompilable(); - CompiledFunction getGeneric(final ScriptObject runtimeScope) { return getBest(getGenericType(), runtimeScope, CompiledFunction.NO_FUNCTIONS); } diff --git a/nashorn/test/script/basic/JDK-8131340.js b/nashorn/test/script/basic/JDK-8131340.js new file mode 100644 index 00000000000..bcdd749f039 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8131340.js @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8131340: Varargs function is recompiled each time it is linked + * + * @test + * @run + */ + +// This is an indirect test. If repeated calls were to cause recompilation +// this would trigger an assertion in RecompilableScriptFunctionData. + +function varargs() { + return arguments; +} + +varargs(1); +varargs(2); +varargs(3); +varargs(4); +varargs(5); +varargs(6); From d7cf63161f824873eb6612eec184b2db0d66f9b5 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Mon, 20 Jul 2015 20:45:58 +0800 Subject: [PATCH 27/56] 8131350: policytool can directly reference permission classes Reviewed-by: xuelei --- modules.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules.xml b/modules.xml index e079f58fd83..6850ac07193 100644 --- a/modules.xml +++ b/modules.xml @@ -1777,6 +1777,11 @@ jdk.policytool java.base java.desktop + java.logging + java.management + java.security.jgss + java.sql + jdk.security.jgss jdk.rmic From 9866d4239de109d5f33609e01cda51b096b404e9 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Mon, 20 Jul 2015 20:47:54 +0800 Subject: [PATCH 28/56] 8131350: policytool can directly reference permission classes Reviewed-by: xuelei, mullan --- .../security/tools/policytool/PolicyTool.java | 327 ++++++++---------- 1 file changed, 152 insertions(+), 175 deletions(-) diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java index fde04357822..02a82d941f9 100644 --- a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java +++ b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java @@ -633,17 +633,16 @@ public class PolicyTool { type.equals(PolicyParser.PrincipalEntry.REPLACE_NAME)) { return; } - Class PRIN = Class.forName("java.security.Principal"); Class pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); - if (!PRIN.isAssignableFrom(pc)) { + if (!Principal.class.isAssignableFrom(pc)) { MessageFormat form = new MessageFormat(getMessage ("Illegal.Principal.Type.type")); Object[] source = {type}; throw new InstantiationException(form.format(source)); } - if (ToolDialog.X500_PRIN_CLASS.equals(pc.getName())) { + if (X500Principal.class.getName().equals(pc.getName())) { // PolicyParser checks validity of X500Principal name // - PolicyTool needs to as well so that it doesn't store // an invalid name that can't be read in later @@ -1563,14 +1562,6 @@ class ToolDialog extends JDialog { public static final int NEW = 2; public static final int OPEN = 3; - public static final String ALL_PERM_CLASS = - "java.security.AllPermission"; - public static final String FILE_PERM_CLASS = - "java.io.FilePermission"; - - public static final String X500_PRIN_CLASS = - "javax.security.auth.x500.X500Principal"; - /* popup menus */ public static final String PERM = PolicyTool.getMessage @@ -1752,11 +1743,11 @@ class ToolDialog extends JDialog { for (int i = 0; i < PERM_ARRAY.size(); i++) { Perm next = PERM_ARRAY.get(i); if (fullClassName) { - if (next.FULL_CLASS.equals(clazz)) { + if (next.getName().equals(clazz)) { return next; } } else { - if (next.CLASS.equals(clazz)) { + if (next.getSimpleName().equals(clazz)) { return next; } } @@ -1772,11 +1763,11 @@ class ToolDialog extends JDialog { for (int i = 0; i < PRIN_ARRAY.size(); i++) { Prin next = PRIN_ARRAY.get(i); if (fullClassName) { - if (next.FULL_CLASS.equals(clazz)) { + if (next.getName().equals(clazz)) { return next; } } else { - if (next.CLASS.equals(clazz)) { + if (next.getSimpleName().equals(clazz)) { return next; } } @@ -2170,7 +2161,7 @@ class ToolDialog extends JDialog { choice.getAccessibleContext().setAccessibleName(PRIN_TYPE); for (int i = 0; i < PRIN_ARRAY.size(); i++) { Prin next = PRIN_ARRAY.get(i); - choice.addItem(next.CLASS); + choice.addItem(next.getSimpleName()); } if (edit) { @@ -2180,7 +2171,7 @@ class ToolDialog extends JDialog { } else { Prin inputPrin = getPrin(editMe.getPrincipalClass(), true); if (inputPrin != null) { - choice.setSelectedItem(inputPrin.CLASS); + choice.setSelectedItem(inputPrin.getSimpleName()); } } } @@ -2286,7 +2277,7 @@ class ToolDialog extends JDialog { choice.getAccessibleContext().setAccessibleName(PERM); for (int i = 0; i < PERM_ARRAY.size(); i++) { Perm next = PERM_ARRAY.get(i); - choice.addItem(next.CLASS); + choice.addItem(next.getSimpleName()); } tw.addNewComponent(newTD, choice, PD_PERM_CHOICE, 0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH, @@ -2300,7 +2291,7 @@ class ToolDialog extends JDialog { if (edit) { Perm inputPerm = getPerm(editMe.permission, true); if (inputPerm != null) { - choice.setSelectedItem(inputPerm.CLASS); + choice.setSelectedItem(inputPerm.getSimpleName()); } } tw.addNewComponent(newTD, tf, PD_PERM_TEXTFIELD, @@ -2417,7 +2408,7 @@ class ToolDialog extends JDialog { "\t'" + pname + "' will be interpreted " + "as a key store alias.\n" + "\tThe final principal class will be " + - ToolDialog.X500_PRIN_CLASS + ".\n" + + X500Principal.class.getName() + ".\n" + "\tThe final principal name will be " + "determined by the following:\n" + "\n" + @@ -2452,7 +2443,7 @@ class ToolDialog extends JDialog { if (tf.getText().trim().equals("") == false) name = new String(tf.getText().trim()); if (permission.equals("") || - (!permission.equals(ALL_PERM_CLASS) && name == null)) { + (!permission.equals(AllPermission.class.getName()) && name == null)) { throw new InvalidParameterException(PolicyTool.getMessage ("Permission.and.Target.Name.must.have.a.value")); } @@ -2467,7 +2458,8 @@ class ToolDialog extends JDialog { // \\server\share 0, legal // \\\\server\share 2, illegal - if (permission.equals(FILE_PERM_CLASS) && name.lastIndexOf("\\\\") > 0) { + if (permission.equals(FilePermission.class.getName()) + && name.lastIndexOf("\\\\") > 0) { char result = tw.displayYesNoDialog(this, PolicyTool.getMessage("Warning"), PolicyTool.getMessage( @@ -3645,7 +3637,7 @@ class PrincipalTypeMenuListener implements ItemListener { if (prinField.getText() != null && prinField.getText().length() > 0) { Prin inputPrin = ToolDialog.getPrin(prinField.getText(), true); - prin.setSelectedItem(inputPrin.CLASS); + prin.setSelectedItem(inputPrin.getSimpleName()); } return; } @@ -3660,7 +3652,7 @@ class PrincipalTypeMenuListener implements ItemListener { // set of names and actions Prin inputPrin = ToolDialog.getPrin((String)e.getItem(), false); if (inputPrin != null) { - prinField.setText(inputPrin.FULL_CLASS); + prinField.setText(inputPrin.getName()); } } } @@ -3711,7 +3703,7 @@ class PermissionMenuListener implements ItemListener { Perm inputPerm = ToolDialog.getPerm(permField.getText(), true); if (inputPerm != null) { - perms.setSelectedItem(inputPerm.CLASS); + perms.setSelectedItem(inputPerm.getSimpleName()); } } return; @@ -3732,7 +3724,7 @@ class PermissionMenuListener implements ItemListener { if (inputPerm == null) { permField.setText(""); } else { - permField.setText(inputPerm.FULL_CLASS); + permField.setText(inputPerm.getName()); } td.setPermissionNames(inputPerm, names, nameField); td.setPermissionActions(inputPerm, actions, actionsField); @@ -4082,26 +4074,30 @@ class TaggedList extends JList { */ class Prin { - public final String CLASS; - public final String FULL_CLASS; + final Class CLASS; - public Prin(String clazz, String fullClass) { + Prin(Class clazz) { this.CLASS = clazz; - this.FULL_CLASS = fullClass; + } + + String getName() { + return CLASS.getName(); + } + + String getSimpleName() { + return CLASS.getSimpleName(); } } class KrbPrin extends Prin { - public KrbPrin() { - super("KerberosPrincipal", - "javax.security.auth.kerberos.KerberosPrincipal"); + KrbPrin() { + super(javax.security.auth.kerberos.KerberosPrincipal.class); } } class X500Prin extends Prin { - public X500Prin() { - super("X500Principal", - "javax.security.auth.x500.X500Principal"); + X500Prin() { + super(javax.security.auth.x500.X500Principal.class); } } @@ -4110,44 +4106,48 @@ class X500Prin extends Prin { */ class Perm { - public final String CLASS; - public final String FULL_CLASS; - public final String[] TARGETS; - public final String[] ACTIONS; + final Class CLASS; + final String[] TARGETS; + final String[] ACTIONS; - public Perm(String clazz, String fullClass, + Perm(Class clazz, String[] targets, String[] actions) { this.CLASS = clazz; - this.FULL_CLASS = fullClass; this.TARGETS = targets; this.ACTIONS = actions; } + + String getName() { + return CLASS.getName(); + } + + String getSimpleName() { + return CLASS.getSimpleName(); + } } class AllPerm extends Perm { - public AllPerm() { - super("AllPermission", "java.security.AllPermission", null, null); + AllPerm() { + super(java.security.AllPermission.class, null, null); } } class AudioPerm extends Perm { - public AudioPerm() { - super("AudioPermission", - "javax.sound.sampled.AudioPermission", - new String[] { + AudioPerm() { + super(javax.sound.sampled.AudioPermission.class, + new String[] { "play", "record" }, - null); + null); } } class AuthPerm extends Perm { - public AuthPerm() { - super("AuthPermission", - "javax.security.auth.AuthPermission", - new String[] { + AuthPerm() { + super(javax.security.auth.AuthPermission.class, + new String[] { "doAs", "doAsPrivileged", "getSubject", @@ -4165,15 +4165,14 @@ class AuthPerm extends Perm { PolicyTool.getMessage("configuration.type") + ">", "refreshLoginConfiguration" }, - null); + null); } } class AWTPerm extends Perm { - public AWTPerm() { - super("AWTPermission", - "java.awt.AWTPermission", - new String[] { + AWTPerm() { + super(java.awt.AWTPermission.class, + new String[] { "accessClipboard", "accessEventQueue", "accessSystemTray", @@ -4187,30 +4186,28 @@ class AWTPerm extends Perm { "showWindowWithoutWarningBanner", "toolkitModality", "watchMousePointer" - }, - null); + }, + null); } } class DelegationPerm extends Perm { - public DelegationPerm() { - super("DelegationPermission", - "javax.security.auth.kerberos.DelegationPermission", - new String[] { + DelegationPerm() { + super(javax.security.auth.kerberos.DelegationPermission.class, + new String[] { // allow user input }, - null); + null); } } class FilePerm extends Perm { - public FilePerm() { - super("FilePermission", - "java.io.FilePermission", - new String[] { + FilePerm() { + super(java.io.FilePermission.class, + new String[] { "<>" }, - new String[] { + new String[] { "read", "write", "delete", @@ -4220,64 +4217,59 @@ class FilePerm extends Perm { } class URLPerm extends Perm { - public URLPerm() { - super("URLPermission", - "java.net.URLPermission", - new String[] { - "<"+ PolicyTool.getMessage("url") + ">", - }, - new String[] { - "<" + PolicyTool.getMessage("method.list") + ">:<" - + PolicyTool.getMessage("request.headers.list") + ">", - }); + URLPerm() { + super(java.net.URLPermission.class, + new String[] { + "<"+ PolicyTool.getMessage("url") + ">", + }, + new String[] { + "<" + PolicyTool.getMessage("method.list") + ">:<" + + PolicyTool.getMessage("request.headers.list") + ">", + }); } } class InqSecContextPerm extends Perm { - public InqSecContextPerm() { - super("InquireSecContextPermission", - "com.sun.security.jgss.InquireSecContextPermission", - new String[] { + InqSecContextPerm() { + super(com.sun.security.jgss.InquireSecContextPermission.class, + new String[] { "KRB5_GET_SESSION_KEY", "KRB5_GET_TKT_FLAGS", "KRB5_GET_AUTHZ_DATA", "KRB5_GET_AUTHTIME" }, - null); + null); } } class LogPerm extends Perm { - public LogPerm() { - super("LoggingPermission", - "java.util.logging.LoggingPermission", - new String[] { + LogPerm() { + super(java.util.logging.LoggingPermission.class, + new String[] { "control" }, - null); + null); } } class MgmtPerm extends Perm { - public MgmtPerm() { - super("ManagementPermission", - "java.lang.management.ManagementPermission", - new String[] { + MgmtPerm() { + super(java.lang.management.ManagementPermission.class, + new String[] { "control", "monitor" }, - null); + null); } } class MBeanPerm extends Perm { - public MBeanPerm() { - super("MBeanPermission", - "javax.management.MBeanPermission", - new String[] { + MBeanPerm() { + super(javax.management.MBeanPermission.class, + new String[] { // allow user input }, - new String[] { + new String[] { "addNotificationListener", "getAttribute", "getClassLoader", @@ -4300,35 +4292,32 @@ class MBeanPerm extends Perm { } class MBeanSvrPerm extends Perm { - public MBeanSvrPerm() { - super("MBeanServerPermission", - "javax.management.MBeanServerPermission", - new String[] { + MBeanSvrPerm() { + super(javax.management.MBeanServerPermission.class, + new String[] { "createMBeanServer", "findMBeanServer", "newMBeanServer", "releaseMBeanServer" }, - null); + null); } } class MBeanTrustPerm extends Perm { - public MBeanTrustPerm() { - super("MBeanTrustPermission", - "javax.management.MBeanTrustPermission", - new String[] { + MBeanTrustPerm() { + super(javax.management.MBeanTrustPermission.class, + new String[] { "register" }, - null); + null); } } class NetPerm extends Perm { - public NetPerm() { - super("NetPermission", - "java.net.NetPermission", - new String[] { + NetPerm() { + super(java.net.NetPermission.class, + new String[] { "allowHttpTrace", "setDefaultAuthenticator", "requestPasswordAuthentication", @@ -4341,43 +4330,40 @@ class NetPerm extends Perm { "setResponseCache", "getResponseCache" }, - null); + null); } } class NetworkPerm extends Perm { - public NetworkPerm() { - super("NetworkPermission", - "jdk.net.NetworkPermission", - new String[] { + NetworkPerm() { + super(jdk.net.NetworkPermission.class, + new String[] { "setOption.SO_FLOW_SLA", "getOption.SO_FLOW_SLA" }, - null); + null); } } class PrivCredPerm extends Perm { - public PrivCredPerm() { - super("PrivateCredentialPermission", - "javax.security.auth.PrivateCredentialPermission", - new String[] { + PrivCredPerm() { + super(javax.security.auth.PrivateCredentialPermission.class, + new String[] { // allow user input }, - new String[] { + new String[] { "read" }); } } class PropPerm extends Perm { - public PropPerm() { - super("PropertyPermission", - "java.util.PropertyPermission", - new String[] { + PropPerm() { + super(java.util.PropertyPermission.class, + new String[] { // allow user input }, - new String[] { + new String[] { "read", "write" }); @@ -4385,21 +4371,19 @@ class PropPerm extends Perm { } class ReflectPerm extends Perm { - public ReflectPerm() { - super("ReflectPermission", - "java.lang.reflect.ReflectPermission", - new String[] { + ReflectPerm() { + super(java.lang.reflect.ReflectPermission.class, + new String[] { "suppressAccessChecks" }, - null); + null); } } class RuntimePerm extends Perm { - public RuntimePerm() { - super("RuntimePermission", - "java.lang.RuntimePermission", - new String[] { + RuntimePerm() { + super(java.lang.RuntimePermission.class, + new String[] { "createClassLoader", "getClassLoader", "setContextClassLoader", @@ -4432,15 +4416,14 @@ class RuntimePerm extends Perm { "usePolicy", // "inheritedChannel" }, - null); + null); } } class SecurityPerm extends Perm { - public SecurityPerm() { - super("SecurityPermission", - "java.security.SecurityPermission", - new String[] { + SecurityPerm() { + super(java.security.SecurityPermission.class, + new String[] { "createAccessControlContext", "getDomainCombiner", "getPolicy", @@ -4470,30 +4453,28 @@ class SecurityPerm extends Perm { //"getSignerPrivateKey", //"setSignerKeyPair" }, - null); + null); } } class SerialPerm extends Perm { - public SerialPerm() { - super("SerializablePermission", - "java.io.SerializablePermission", - new String[] { + SerialPerm() { + super(java.io.SerializablePermission.class, + new String[] { "enableSubclassImplementation", "enableSubstitution" }, - null); + null); } } class ServicePerm extends Perm { - public ServicePerm() { - super("ServicePermission", - "javax.security.auth.kerberos.ServicePermission", - new String[] { + ServicePerm() { + super(javax.security.auth.kerberos.ServicePermission.class, + new String[] { // allow user input }, - new String[] { + new String[] { "initiate", "accept" }); @@ -4501,13 +4482,12 @@ class ServicePerm extends Perm { } class SocketPerm extends Perm { - public SocketPerm() { - super("SocketPermission", - "java.net.SocketPermission", - new String[] { + SocketPerm() { + super(java.net.SocketPermission.class, + new String[] { // allow user input }, - new String[] { + new String[] { "accept", "connect", "listen", @@ -4517,38 +4497,35 @@ class SocketPerm extends Perm { } class SQLPerm extends Perm { - public SQLPerm() { - super("SQLPermission", - "java.sql.SQLPermission", - new String[] { + SQLPerm() { + super(java.sql.SQLPermission.class, + new String[] { "setLog", "callAbort", "setSyncFactory", "setNetworkTimeout", }, - null); + null); } } class SSLPerm extends Perm { - public SSLPerm() { - super("SSLPermission", - "javax.net.ssl.SSLPermission", - new String[] { + SSLPerm() { + super(javax.net.ssl.SSLPermission.class, + new String[] { "setHostnameVerifier", "getSSLSessionContext" }, - null); + null); } } class SubjDelegPerm extends Perm { - public SubjDelegPerm() { - super("SubjectDelegationPermission", - "javax.management.remote.SubjectDelegationPermission", - new String[] { + SubjDelegPerm() { + super(javax.management.remote.SubjectDelegationPermission.class, + new String[] { // allow user input }, - null); + null); } } From 981dbca21aadd67b3504f079770f2647e70fa446 Mon Sep 17 00:00:00 2001 From: Sean Mullan Date: Mon, 20 Jul 2015 09:03:03 -0400 Subject: [PATCH 29/56] 8131486: SecureClassLoader key for ProtectionDomain cache also needs to take into account certificates Reviewed-by: weijun --- .../classes/java/security/CodeSource.java | 2 +- .../java/security/SecureClassLoader.java | 57 +++-- .../SecureClassLoader/DefineClass.java | 219 ++++++++++++++++-- .../SecureClassLoader/DefineClass.policy | 7 +- 4 files changed, 254 insertions(+), 31 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/security/CodeSource.java b/jdk/src/java.base/share/classes/java/security/CodeSource.java index c08050a9f03..6c922aad441 100644 --- a/jdk/src/java.base/share/classes/java/security/CodeSource.java +++ b/jdk/src/java.base/share/classes/java/security/CodeSource.java @@ -339,7 +339,7 @@ public class CodeSource implements java.io.Serializable { * @param strict If true then a strict equality match is performed. * Otherwise a subset match is performed. */ - private boolean matchCerts(CodeSource that, boolean strict) + boolean matchCerts(CodeSource that, boolean strict) { boolean match; diff --git a/jdk/src/java.base/share/classes/java/security/SecureClassLoader.java b/jdk/src/java.base/share/classes/java/security/SecureClassLoader.java index 56d98363dd9..eee1e0bb7fe 100644 --- a/jdk/src/java.base/share/classes/java/security/SecureClassLoader.java +++ b/jdk/src/java.base/share/classes/java/security/SecureClassLoader.java @@ -25,9 +25,10 @@ package java.security; -import java.util.Map; -import java.util.ArrayList; import java.net.URL; +import java.util.ArrayList; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; @@ -50,15 +51,15 @@ public class SecureClassLoader extends ClassLoader { private final boolean initialized; /* - * Map that maps the CodeSource URL (as a String) to ProtectionDomain. - * We use a String instead of a CodeSource/URL as the key to avoid + * Map that maps the CodeSource to a ProtectionDomain. The key is a + * CodeSourceKey class that uses a String instead of a URL to avoid * potential expensive name service lookups. This does mean that URLs that * are equivalent after nameservice lookup will be placed in separate * ProtectionDomains; however during policy enforcement these URLs will be * canonicalized and resolved resulting in a consistent set of granted * permissions. */ - private final Map pdcache + private final Map pdcache = new ConcurrentHashMap<>(11); private static final Debug debug = Debug.getInstance("scl"); @@ -209,17 +210,14 @@ public class SecureClassLoader extends ClassLoader { return null; } - // Use a String form of the URL as the key. It should behave in the - // same manner as the URL when compared for equality except that no - // nameservice lookup is done on the hostname (String comparison + // Use a CodeSourceKey object key. It should behave in the + // same manner as the CodeSource when compared for equality except + // that no nameservice lookup is done on the hostname (String comparison // only), and the fragment is not considered. - String key = cs.getLocationNoFragString(); - if (key == null) { - key = ""; - } + CodeSourceKey key = new CodeSourceKey(cs); return pdcache.computeIfAbsent(key, new Function<>() { @Override - public ProtectionDomain apply(String key /* not used */) { + public ProtectionDomain apply(CodeSourceKey key /* not used */) { PermissionCollection perms = SecureClassLoader.this.getPermissions(cs); ProtectionDomain pd = new ProtectionDomain( @@ -242,4 +240,37 @@ public class SecureClassLoader extends ClassLoader { } } + private static class CodeSourceKey { + private final CodeSource cs; + + CodeSourceKey(CodeSource cs) { + this.cs = cs; + } + + @Override + public int hashCode() { + String locationNoFrag = cs.getLocationNoFragString(); + return locationNoFrag != null ? locationNoFrag.hashCode() : 0; + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + + if (!(obj instanceof CodeSourceKey)) { + return false; + } + + CodeSourceKey csk = (CodeSourceKey) obj; + + if (!Objects.equals(cs.getLocationNoFragString(), + csk.cs.getLocationNoFragString())) { + return false; + } + + return cs.matchCerts(csk.cs, true); + } + } } diff --git a/jdk/test/java/security/SecureClassLoader/DefineClass.java b/jdk/test/java/security/SecureClassLoader/DefineClass.java index c54ef2215cd..33efdb0e648 100644 --- a/jdk/test/java/security/SecureClassLoader/DefineClass.java +++ b/jdk/test/java/security/SecureClassLoader/DefineClass.java @@ -21,28 +21,44 @@ * questions. */ +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.InputStream; import java.io.IOException; +import java.io.OutputStream; import java.net.URL; import java.security.CodeSource; +import java.security.Key; +import java.security.KeyStoreException; +import java.security.KeyStoreSpi; +import java.security.NoSuchAlgorithmException; import java.security.Permission; import java.security.Policy; import java.security.ProtectionDomain; +import java.security.Provider; import java.security.SecureClassLoader; +import java.security.Security; +import java.security.UnrecoverableKeyException; +import java.security.URIParameter; import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; import java.util.List; import java.util.PropertyPermission; /* * @test - * @bug 6826789 + * @bug 6826789 8131486 * @summary Make sure equivalent ProtectionDomains are granted the same * permissions when the CodeSource URLs are different but resolve * to the same ip address after name service resolution. - * @run main/othervm/java.security.policy=DefineClass.policy DefineClass + * @run main/othervm DefineClass */ public class DefineClass { @@ -53,42 +69,100 @@ public class DefineClass { new PropertyPermission("user.name", "read") }; - // Base64 encoded bytes of a simple class: "public class Foo {}" + // Base64 encoded bytes of simple class: "package foo; public class Foo {}" private final static String FOO_CLASS = - "yv66vgAAADQADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" + + "yv66vgAAADMADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" + "D0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAAhGb28uamF2YQwABAAF" + - "AQADRm9vAQAQamF2YS9sYW5nL09iamVjdAAhAAIAAwAAAAAAAQABAAQABQAB" + - "AAYAAAAdAAEAAQAAAAUqtwABsQAAAAEABwAAAAYAAQAAAAEAAQAIAAAAAgAJ"; + "AQAHZm9vL0ZvbwEAEGphdmEvbGFuZy9PYmplY3QAIQACAAMAAAAAAAEAAQAE" + + "AAUAAQAGAAAAHQABAAEAAAAFKrcAAbEAAAABAAcAAAAGAAEAAAABAAEACAAA" + + "AAIACQ=="; - // Base64 encoded bytes of a simple class: "public class Bar {}" + // Base64 encoded bytes of simple class: "package bar; public class Bar {}" private final static String BAR_CLASS = - "yv66vgAAADQADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" + + "yv66vgAAADMADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" + "D0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAAhCYXIuamF2YQwABAAF" + - "AQADQmFyAQAQamF2YS9sYW5nL09iamVjdAAhAAIAAwAAAAAAAQABAAQABQAB" + - "AAYAAAAdAAEAAQAAAAUqtwABsQAAAAEABwAAAAYAAQAAAAEAAQAIAAAAAgAJ"; + "AQAHYmFyL0JhcgEAEGphdmEvbGFuZy9PYmplY3QAIQACAAMAAAAAAAEAAQAE" + + "AAUAAQAGAAAAHQABAAEAAAAFKrcAAbEAAAABAAcAAAAGAAEAAAABAAEACAAA" + + "AAIACQ=="; + + // Base64 encoded bytes of simple class: "package baz; public class Baz {}" + private final static String BAZ_CLASS = + "yv66vgAAADQADQoAAwAKBwALBwAMAQAGPGluaXQ+AQADKClWAQAEQ29kZQEA" + + "D0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAAhCYXouamF2YQwABAAF" + + "AQAHYmF6L0JhegEAEGphdmEvbGFuZy9PYmplY3QAIQACAAMAAAAAAAEAAQAE" + + "AAUAAQAGAAAAHQABAAEAAAAFKrcAAbEAAAABAAcAAAAGAAEAAAABAAEACAAA" + + "AAIACQ=="; + + private final static String BAZ_CERT = + "-----BEGIN CERTIFICATE-----\n" + + "MIIEFzCCA8OgAwIBAgIESpPf8TANBglghkgBZQMEAwIFADAOMQwwCgYDVQQDEwNG\n" + + "b28wHhcNMTUwNzE1MTY1ODM5WhcNMTUxMDEzMTY1ODM5WjAOMQwwCgYDVQQDEwNG\n" + + "b28wggNCMIICNQYHKoZIzjgEATCCAigCggEBAI95Ndm5qum/q+2Ies9JUbbzLsWe\n" + + "O683GOjqxJYfPv02BudDUanEGDM5uAnnwq4cU5unR1uF0BGtuLR5h3VJhGlcrA6P\n" + + "FLM2CCiiL/onEQo9YqmTRTQJoP5pbEZY+EvdIIGcNwmgEFexla3NACM9ulSEtikf\n" + + "nWSO+INEhneXnOwEtDSmrC516Zhd4j2wKS/BEYyf+p2BgeczjbeStzDXueNJWS9o\n" + + "CZhyFTkV6j1ri0ZTxjNFj4A7MqTC4PJykCVuTj+KOwg4ocRQ5OGMGimjfd9eoUPe\n" + + "S2b/BJA+1c8WI+FY1IfGCOl/IRzYHcojy244B2X4IuNCvkhMBXY5OWAc1mcCHQC6\n" + + "9pamhXj3397n+mfJd8eF7zKyM7rlgMC81WldAoIBABamXFggSFBwTnUCo5dXBA00\n" + + "2jo0eMFU1OSlwC0kLuBPluYeS9CQSr2sjzfuseCfMYLSPJBDy2QviABBYO35ygmz\n" + + "IHannDKmJ/JHPpGHm6LE50S9IIFUTLVbgCw2jR+oPtSJ6U4PoGiOMkKKXHjEeMaN\n" + + "BSe3HJo6uwsL4SxEaJY559POdNsQGmWqK4f2TGgm2z7HL0tVmYNLtO2wL3yQ6aSW\n" + + "06VdU1vr/EXU9hn2Pz3tu4c5JcLyJOB3MSltqIfsHkdI+H77X963VIQxayIy3uVT\n" + + "3a8CESsNHwLaMJcyJP4nrtqLnUspItm6i+Oe2eEDpjxSgQvGiLfi7UMW4e8X294D\n" + + "ggEFAAKCAQBsGeU8/STExzQsJ8kFM9xarA/2VAFMzyUpd3IQ2UGHQC5rEnGh/RiU\n" + + "T20y7a2hCpQ1f/qgLnY8hku9GRVY3z8WamBzWLzCAEAx67EsS58mf4o8R3sUbkH5\n" + + "/mRaZoNVSPUy+tXoLmTzIetU4W+JT8Rq4OcXXU9uo9TreeBehhVexS3vpVgQeUIn\n" + + "MmMma8WHpovIJQQlp4cyjalX7Beda/tqX/HPLkAS4TRqQAz7hFr3FqFrVMKFSGo4\n" + + "fTS06GGdQ4tw9c6NQLuQ9WF9BxYSwSk9yENQvKDZaBNarqPMnsh1Gi/QcKMRBVhM\n" + + "RT/9vb4QUi/pOowhhKCDBLgjY60QgX3HoyEwHzAdBgNVHQ4EFgQUa787CE+3ZNAb\n" + + "g1ql9yJVVrRCdx0wDQYJYIZIAWUDBAMCBQADPwAwPAIcCUkZIRrBlKdTzhKYBEOm\n" + + "E1i45MMum1RuHc28agIcfHQkkjBA4FfH5UMRgKpIyRR8V/dVboxDj4hKOA==\n" + + "-----END CERTIFICATE-----"; public static void main(String[] args) throws Exception { + Security.addProvider(new TestProvider()); + MySecureClassLoader scl = new MySecureClassLoader(); - Policy p = Policy.getPolicy(); + + File policyFile = new File(System.getProperty("test.src", "."), + "DefineClass.policy"); + Policy p = Policy.getInstance("JavaPolicy", + new URIParameter(policyFile.toURI())); + Policy.setPolicy(p); + + System.setSecurityManager(new SecurityManager()); ArrayList perms1 = getPermissions(scl, p, "http://localhost/", - "Foo", FOO_CLASS); + "foo.Foo", FOO_CLASS, + null); checkPerms(perms1, GRANTED_PERMS); ArrayList perms2 = getPermissions(scl, p, "http://127.0.0.1/", - "Bar", BAR_CLASS); + "bar.Bar", BAR_CLASS, + null); checkPerms(perms2, GRANTED_PERMS); assert(perms1.equals(perms2)); + + // check that class signed by baz is granted an additional permission + Certificate[] chain = new Certificate[] {getCert(BAZ_CERT)}; + ArrayList perms3 = getPermissions(scl, p, + "http://localhost/", + "baz.Baz", BAZ_CLASS, + chain); + List perms = new ArrayList<>(Arrays.asList(GRANTED_PERMS)); + perms.add(new PropertyPermission("user.dir", "read")); + checkPerms(perms3, perms.toArray(new Permission[0])); } // returns the permissions granted to the codebase URL private static ArrayList getPermissions(MySecureClassLoader scl, Policy p, String url, String className, - String classBytes) + String classBytes, + Certificate[] chain) throws IOException { - CodeSource cs = new CodeSource(new URL(url), (Certificate[])null); + CodeSource cs = new CodeSource(new URL(url), chain); Base64.Decoder bd = Base64.getDecoder(); byte[] bytes = bd.decode(classBytes); Class c = scl.defineMyClass(className, bytes, cs); @@ -105,10 +179,125 @@ public class DefineClass { } } + private static Certificate getCert(String base64Cert) throws Exception { + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + InputStream is = new ByteArrayInputStream(base64Cert.getBytes("UTF-8")); + return cf.generateCertificate(is); + } + // A SecureClassLoader that allows the test to define its own classes private static class MySecureClassLoader extends SecureClassLoader { Class defineMyClass(String name, byte[] b, CodeSource cs) { return super.defineClass(name, b, 0, b.length, cs); } } + + private static class TestProvider extends Provider { + TestProvider() { + super("Test8131486", 0.0, "For testing only"); + putService(new Provider.Service(this, "KeyStore", "Test8131486", + "DefineClass$TestKeyStore", null, null)); + } + } + + /** + * A KeyStore containing a single certificate entry named "baz". + */ + public static class TestKeyStore extends KeyStoreSpi { + private final String baz = "baz"; + private final List aliases = Collections.singletonList(baz); + private final Certificate bazCert; + + public TestKeyStore() { + try { + this.bazCert = getCert(BAZ_CERT); + } catch (Exception e) { + throw new Error(); + } + } + + @Override + public Enumeration engineAliases() { + return Collections.enumeration(aliases); + } + + @Override + public boolean engineContainsAlias(String alias) { + return alias.equals(baz); + } + + @Override + public void engineDeleteEntry(String alias) throws KeyStoreException { + throw new KeyStoreException(); + } + + @Override + public Certificate engineGetCertificate(String alias) { + return alias.equals(baz) ? bazCert : null; + } + + @Override + public String engineGetCertificateAlias(Certificate cert) { + return cert.equals(bazCert) ? baz : null; + } + + @Override + public Certificate[] engineGetCertificateChain(String alias) { + return alias.equals(baz) ? new Certificate[] {bazCert} : null; + } + + @Override + public Date engineGetCreationDate(String alias) { + return alias.equals(baz) ? new Date() : null; + } + + @Override + public Key engineGetKey(String alias, char[] password) + throws NoSuchAlgorithmException, UnrecoverableKeyException { + return null; + } + + @Override + public boolean engineIsCertificateEntry(String alias) { + return alias.equals(baz); + } + + @Override + public boolean engineIsKeyEntry(String alias) { + return false; + } + + @Override + public void engineLoad(InputStream stream, char[] password) + throws IOException, NoSuchAlgorithmException, CertificateException { + } + + @Override + public void engineSetCertificateEntry(String alias, Certificate cert) + throws KeyStoreException { + throw new KeyStoreException(); + } + + @Override + public void engineSetKeyEntry(String alias, byte[] key, + Certificate[] chain) + throws KeyStoreException { + throw new KeyStoreException(); + } + + @Override + public void engineSetKeyEntry(String alias, Key key, char[] password, + Certificate[] chain) + throws KeyStoreException { + throw new KeyStoreException(); + } + + @Override + public int engineSize() { return 1; } + + @Override + public void engineStore(OutputStream stream, char[] password) + throws IOException, NoSuchAlgorithmException, CertificateException { + } + } } diff --git a/jdk/test/java/security/SecureClassLoader/DefineClass.policy b/jdk/test/java/security/SecureClassLoader/DefineClass.policy index ea7eae7c003..dd9dbaa1efd 100644 --- a/jdk/test/java/security/SecureClassLoader/DefineClass.policy +++ b/jdk/test/java/security/SecureClassLoader/DefineClass.policy @@ -1,7 +1,7 @@ +keystore "NONE", "Test8131486", "Test8131486"; + grant { - permission java.lang.RuntimePermission "createClassLoader"; permission java.lang.RuntimePermission "getProtectionDomain"; - permission java.security.SecurityPermission "getPolicy"; }; grant codebase "http://localhost/" { permission java.util.PropertyPermission "user.home", "read"; @@ -9,3 +9,6 @@ grant codebase "http://localhost/" { grant codebase "http://127.0.0.1/" { permission java.util.PropertyPermission "user.name", "read"; }; +grant codebase "http://localhost/", signedby "baz" { + permission java.util.PropertyPermission "user.dir", "read"; +}; From 8b236a44de52340b8eb7adeae5111cc414ebcd85 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 20 Jul 2015 13:11:20 -0700 Subject: [PATCH 30/56] 8129904: Add beans tests to tier 3 Reviewed-by: alanb, serb --- jdk/test/TEST.groups | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups index f9e6753b340..fa237c9be2b 100644 --- a/jdk/test/TEST.groups +++ b/jdk/test/TEST.groups @@ -42,7 +42,8 @@ tier2 = \ :jdk_svc tier3 = \ - :jdk_rmi + :jdk_rmi \ + :jdk_beans ############################################################################### # From 6e48caf2507d4a45e1861ee699a32a5e459d70c2 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 20 Jul 2015 15:13:50 -0700 Subject: [PATCH 31/56] 8081734: ConcurrentHashMap/ConcurrentAssociateTest.java, times out 90% of time on sparc with 256 cpu Reviewed-by: chegar --- .../concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java index b0a1ecc8be8..9430813d020 100644 --- a/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java +++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java @@ -120,7 +120,8 @@ public class ConcurrentAssociateTest { } }; - int ps = Runtime.getRuntime().availableProcessors(); + // Bound concurrency to avoid degenerate performance + int ps = Math.min(Runtime.getRuntime().availableProcessors(), 32); Stream runners = IntStream.range(0, ps) .mapToObj(i -> sr.get()) .map(CompletableFuture::runAsync); From 7f9414bc1113ad967626d6f129f8422ca6db5f8a Mon Sep 17 00:00:00 2001 From: Tristan Yan Date: Tue, 21 Jul 2015 14:15:59 -0400 Subject: [PATCH 32/56] 8068761: Test java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException Reviewed-by: rriggs --- .../nio/channels/ServerSocketChannel/AdaptServerSocket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java b/jdk/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java index 3c88d408853..13aeea1bba4 100644 --- a/jdk/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java +++ b/jdk/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java @@ -123,7 +123,7 @@ public class AdaptServerSocket { public static void main(String[] args) throws Exception { test(0, 0, false); - test(50, 500, false); + test(50, 5000, false); test(500, 50, true); } From e81669d5dfd24bfd2fcc4aa93a5871f071c80b1e Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Tue, 21 Jul 2015 18:02:36 +0800 Subject: [PATCH 33/56] 8131051: KDC might issue a renewable ticket even if not requested Reviewed-by: xuelei --- .../classes/sun/security/krb5/KrbKdcRep.java | 9 ++-- jdk/test/sun/security/krb5/auto/KDC.java | 11 +++++ jdk/test/sun/security/krb5/auto/LongLife.java | 47 +++++++++++++++++++ jdk/test/sun/security/krb5/auto/OneKDC.java | 3 +- 4 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 jdk/test/sun/security/krb5/auto/LongLife.java diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java index 7bf3ac60c58..c4a04b1d86c 100644 --- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java +++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java @@ -75,10 +75,11 @@ abstract class KrbKdcRep { } } - // XXX Can renew a ticket but not ask for a renewable renewed ticket - // See impl of Credentials.renew(). - if (req.reqBody.kdcOptions.get(KDCOptions.RENEWABLE) != - rep.encKDCRepPart.flags.get(KDCOptions.RENEWABLE)) { + // Reply to a renewable request should be renewable, but if request does + // not contain renewable, KDC is free to issue a renewable ticket (for + // example, if ticket_lifetime is too big). + if (req.reqBody.kdcOptions.get(KDCOptions.RENEWABLE) && + !rep.encKDCRepPart.flags.get(KDCOptions.RENEWABLE)) { throw new KrbApErrException(Krb5.KRB_AP_ERR_MODIFIED); } diff --git a/jdk/test/sun/security/krb5/auto/KDC.java b/jdk/test/sun/security/krb5/auto/KDC.java index 51b2fcfa8d6..f0a664efa8c 100644 --- a/jdk/test/sun/security/krb5/auto/KDC.java +++ b/jdk/test/sun/security/krb5/auto/KDC.java @@ -28,6 +28,10 @@ import java.net.*; import java.io.*; import java.lang.reflect.Method; import java.security.SecureRandom; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalAmount; +import java.time.temporal.TemporalUnit; import java.util.*; import java.util.concurrent.*; @@ -939,6 +943,13 @@ public class KDC { } else if (till.isZero()) { till = new KerberosTime( new Date().getTime() + 1000 * DEFAULT_LIFETIME); + } else if (till.greaterThan(new KerberosTime(Instant.now() + .plus(1, ChronoUnit.DAYS)))) { + // If till is more than 1 day later, make it renewable + till = new KerberosTime( + new Date().getTime() + 1000 * DEFAULT_LIFETIME); + body.kdcOptions.set(KDCOptions.RENEWABLE, true); + if (rtime == null) rtime = till; } if (rtime == null && body.kdcOptions.get(KDCOptions.RENEWABLE)) { rtime = new KerberosTime( diff --git a/jdk/test/sun/security/krb5/auto/LongLife.java b/jdk/test/sun/security/krb5/auto/LongLife.java new file mode 100644 index 00000000000..61488092d64 --- /dev/null +++ b/jdk/test/sun/security/krb5/auto/LongLife.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8131051 + * @summary KDC might issue a renewable ticket even if not requested + * @compile -XDignore.symbol.file LongLife.java + * @run main/othervm LongLife + */ + +import sun.security.krb5.Config; + +public class LongLife { + + public static void main(String[] args) throws Exception { + + OneKDC kdc = new OneKDC(null).writeJAASConf(); + + // A lifetime 2d will make it renewable + KDC.saveConfig(OneKDC.KRB5_CONF, kdc, + "ticket_lifetime = 2d"); + Config.refresh(); + + Context.fromJAAS("client"); + } +} diff --git a/jdk/test/sun/security/krb5/auto/OneKDC.java b/jdk/test/sun/security/krb5/auto/OneKDC.java index 2d3fc543ea4..75266289c37 100644 --- a/jdk/test/sun/security/krb5/auto/OneKDC.java +++ b/jdk/test/sun/security/krb5/auto/OneKDC.java @@ -95,7 +95,7 @@ public class OneKDC extends KDC { * entries with names using existing OneKDC principals. * @throws java.lang.Exception if anything goes wrong */ - public void writeJAASConf() throws IOException { + public OneKDC writeJAASConf() throws IOException { System.setProperty("java.security.auth.login.config", JAAS_CONF); File f = new File(JAAS_CONF); FileOutputStream fos = new FileOutputStream(f); @@ -123,6 +123,7 @@ public class OneKDC extends KDC { " isInitiator=false;\n};\n" ).getBytes()); fos.close(); + return this; } /** From ecd527cd700c93980125d54406455a3c7dc24383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Wed, 22 Jul 2015 10:18:33 +0200 Subject: [PATCH 34/56] 8131683: Delete fails over multiple scopes Reviewed-by: mhaupt, sundar --- .../internal/codegen/AssignSymbols.java | 7 +- .../jdk/nashorn/internal/ir/RuntimeNode.java | 2 + .../internal/runtime/ScriptRuntime.java | 27 ++++++ nashorn/test/script/basic/JDK-8131683.js | 89 +++++++++++++++++++ .../test/script/basic/JDK-8131683.js.EXPECTED | 16 ++++ 5 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 nashorn/test/script/basic/JDK-8131683.js create mode 100644 nashorn/test/script/basic/JDK-8131683.js.EXPECTED diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java index b33d10f151b..537272e4ab9 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java @@ -783,12 +783,13 @@ final class AssignSymbols extends NodeVisitor implements Loggabl // If this is a declared variable or a function parameter, delete always fails (except for globals). final String name = ident.getName(); final Symbol symbol = ident.getSymbol(); - final boolean failDelete = strictMode || (!symbol.isScope() && (symbol.isParam() || (symbol.isVar() && !symbol.isProgramLevel()))); - if (failDelete && symbol.isThis()) { + if (symbol.isThis()) { + // Can't delete "this", ignore and return true return LiteralNode.newInstance(unaryNode, true).accept(this); } final Expression literalNode = (Expression)LiteralNode.newInstance(unaryNode, name).accept(this); + final boolean failDelete = strictMode || (!symbol.isScope() && (symbol.isParam() || (symbol.isVar() && !symbol.isProgramLevel()))); if (!failDelete) { args.add(compilerConstantIdentifier(SCOPE)); @@ -798,6 +799,8 @@ final class AssignSymbols extends NodeVisitor implements Loggabl if (failDelete) { request = Request.FAIL_DELETE; + } else if (symbol.isGlobal() && !symbol.isFunctionDeclaration()) { + request = Request.SLOW_DELETE; } } else if (rhs instanceof AccessNode) { final Expression base = ((AccessNode)rhs).getBase(); diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java index bcece018c6d..57578293ddf 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java @@ -56,6 +56,8 @@ public class RuntimeNode extends Expression { REFERENCE_ERROR, /** Delete operator */ DELETE(TokenType.DELETE, Type.BOOLEAN, 1), + /** Delete operator for slow scopes */ + SLOW_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false), /** Delete operator that always fails -- see Lower */ FAIL_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false), /** === operator with at least one object */ diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java index 6bb7aec26d5..442bfea408d 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java @@ -684,6 +684,33 @@ public final class ScriptRuntime { return true; } + /** + * ECMA 11.4.1 - delete operator, implementation for slow scopes + * + * This implementation of 'delete' walks the scope chain to find the scope that contains the + * property to be deleted, then invokes delete on it. + * + * @param obj top scope object + * @param property property to delete + * @param strict are we in strict mode + * + * @return true if property was successfully found and deleted + */ + public static boolean SLOW_DELETE(final Object obj, final Object property, final Object strict) { + if (obj instanceof ScriptObject) { + ScriptObject sobj = (ScriptObject) obj; + final String key = property.toString(); + while (sobj != null && sobj.isScope()) { + final FindProperty find = sobj.findProperty(key, false); + if (find != null) { + return sobj.delete(key, Boolean.TRUE.equals(strict)); + } + sobj = sobj.getProto(); + } + } + return DELETE(obj, property, strict); + } + /** * ECMA 11.4.1 - delete operator, special case * diff --git a/nashorn/test/script/basic/JDK-8131683.js b/nashorn/test/script/basic/JDK-8131683.js new file mode 100644 index 00000000000..315966250a6 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8131683.js @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8131683: Delete fails over multiple scopes + * + * @test + * @run + */ + +a = 1; +b = 2; +c = 3; + +var A = 1; +var B = 2; +var C = 3; +function D() {} + +print((function() { + var x; // force creation of scope + (function() { x; })(); + return delete a; +})()); + +print((function() { + eval(""); + return delete b; +})()); + +print((function() { + return eval("delete c"); +})()); + +print((function() { + eval("d = 4"); + return eval("delete d"); +})()); + +print(typeof a); +print(typeof b); +print(typeof c); +print(typeof d); + +print((function() { + var x; // force creation of scope + (function() { x; })(); + return delete A; +})()); + +print((function() { + eval(""); + return delete B; +})()); + +print((function() { + return eval("delete C"); +})()); + +print((function() { + eval(""); + return delete D; +})()); + +print(typeof A); +print(typeof B); +print(typeof C); +print(typeof D); + diff --git a/nashorn/test/script/basic/JDK-8131683.js.EXPECTED b/nashorn/test/script/basic/JDK-8131683.js.EXPECTED new file mode 100644 index 00000000000..d1fbed7412c --- /dev/null +++ b/nashorn/test/script/basic/JDK-8131683.js.EXPECTED @@ -0,0 +1,16 @@ +true +true +true +true +undefined +undefined +undefined +undefined +false +false +false +false +number +number +number +function From e0ae5e6391dd0ee68cfd978a38d3e6d781c3383d Mon Sep 17 00:00:00 2001 From: Michael Haupt Date: Wed, 22 Jul 2015 09:28:28 +0200 Subject: [PATCH 35/56] 8131142: late-bind check for testng.jar presence in Nashorn test execution Reviewed-by: hannesw, sundar --- nashorn/make/build.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml index a2fd068671d..b3190b092bf 100644 --- a/nashorn/make/build.xml +++ b/nashorn/make/build.xml @@ -48,7 +48,9 @@ - + + + @@ -484,7 +486,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -514,7 +516,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -542,7 +544,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -561,7 +563,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -585,7 +587,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -604,7 +606,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + - + @@ -746,7 +748,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -758,7 +760,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + From ef917cec152985624590df4055dd4bce4fbeeb9e Mon Sep 17 00:00:00 2001 From: Rajan Halade Date: Wed, 22 Jul 2015 11:08:35 +0300 Subject: [PATCH 36/56] 8130031: Remove the intermittent keyword for this test Reviewed-by: xuelei --- jdk/test/javax/net/ssl/TLS/TestJSSE.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSE.java b/jdk/test/javax/net/ssl/TLS/TestJSSE.java index 4bc99e6a547..b7a439f8820 100644 --- a/jdk/test/javax/net/ssl/TLS/TestJSSE.java +++ b/jdk/test/javax/net/ssl/TLS/TestJSSE.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it under @@ -72,7 +72,6 @@ import java.security.Security; * -DCLIENT_PROTOCOL=DEFAULT -Djdk.tls.client.protocols=TLSv1.2 * -DCIPHER=SSL_RSA_WITH_RC4_128_MD5 * TestJSSE javax.net.ssl.SSLHandshakeException - * @key intermittent * */ From 793dc7b0d265b0837f5284ec0a3be90d2a3d5dfd Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Wed, 22 Jul 2015 10:55:39 -0700 Subject: [PATCH 37/56] 8131907: Numerous threads lock during XML processing while running Weblogic 12.1.3 Reviewed-by: rriggs, dfuchs, lancea --- .../xerces/internal/impl/dv/DTDDVFactory.java | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java index fd7426f7551..0345c29a038 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java @@ -1,13 +1,13 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 2001, 2002,2004 The Apache Software Foundation. - * - * 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * @@ -20,8 +20,10 @@ package com.sun.org.apache.xerces.internal.impl.dv; -import java.util.Hashtable; +import com.sun.org.apache.xerces.internal.impl.dv.dtd.DTDDVFactoryImpl; +import com.sun.org.apache.xerces.internal.impl.dv.dtd.XML11DTDDVFactoryImpl; import com.sun.org.apache.xerces.internal.utils.ObjectFactory; +import java.util.Hashtable; /** * The factory to create and return DTD types. The implementation should @@ -35,7 +37,11 @@ import com.sun.org.apache.xerces.internal.utils.ObjectFactory; */ public abstract class DTDDVFactory { - private static final String DEFAULT_FACTORY_CLASS = "com.sun.org.apache.xerces.internal.impl.dv.dtd.DTDDVFactoryImpl"; + private static final String DEFAULT_FACTORY_CLASS = + "com.sun.org.apache.xerces.internal.impl.dv.dtd.DTDDVFactoryImpl"; + + private static final String XML11_DATATYPE_VALIDATOR_FACTORY = + "com.sun.org.apache.xerces.internal.impl.dv.dtd.XML11DTDDVFactoryImpl"; /** * Get an instance of the default DTDDVFactory implementation. @@ -58,9 +64,15 @@ public abstract class DTDDVFactory { */ public static final DTDDVFactory getInstance(String factoryClass) throws DVFactoryException { try { - // if the class name is not specified, use the default one - return (DTDDVFactory) - (ObjectFactory.newInstance(factoryClass, true)); + if (DEFAULT_FACTORY_CLASS.equals(factoryClass)) { + return new DTDDVFactoryImpl(); + } else if (XML11_DATATYPE_VALIDATOR_FACTORY.equals(factoryClass)) { + return new XML11DTDDVFactoryImpl(); + } else { + //fall back for compatibility + return (DTDDVFactory) + (ObjectFactory.newInstance(factoryClass, true)); + } } catch (ClassCastException e) { throw new DVFactoryException("DTD factory class " + factoryClass + " does not extend from DTDDVFactory."); From 47dbbc7b72951eb26909427a4dca383c041a97d3 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Wed, 22 Jul 2015 21:43:33 +0000 Subject: [PATCH 38/56] 8075526: Need a way to read and write ZipEntry timestamp using local date/time without tz conversion To add a pair of set/getTimeLocal() Reviewed-by: ksrini, rriggs --- .../share/classes/java/util/zip/ZipEntry.java | 88 +++++++++++++- .../share/classes/java/util/zip/ZipUtils.java | 9 ++ jdk/test/java/util/zip/TestExtraTime.java | 6 +- jdk/test/java/util/zip/TestLocalTime.java | 111 ++++++++++++++++++ 4 files changed, 210 insertions(+), 4 deletions(-) create mode 100644 jdk/test/java/util/zip/TestLocalTime.java diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java b/jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java index aa93bcb368d..c380058356b 100644 --- a/jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java +++ b/jdk/src/java.base/share/classes/java/util/zip/ZipEntry.java @@ -29,6 +29,9 @@ import static java.util.zip.ZipUtils.*; import java.nio.file.attribute.FileTime; import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.time.LocalDateTime; +import java.time.ZonedDateTime; +import java.time.ZoneId; import static java.util.zip.ZipConstants64.*; @@ -194,6 +197,85 @@ class ZipEntry implements ZipConstants, Cloneable { return (xdostime != -1) ? extendedDosToJavaTime(xdostime) : -1; } + /** + * Sets the last modification time of the entry in local date-time. + * + *

If the entry is output to a ZIP file or ZIP file formatted + * output stream the last modification time set by this method will + * be stored into the {@code date and time fields} of the zip file + * entry and encoded in standard {@code MS-DOS date and time format}. + * If the date-time set is out of the range of the standard {@code + * MS-DOS date and time format}, the time will also be stored into + * zip file entry's extended timestamp fields in {@code optional + * extra data} in UTC time. The {@link java.time.ZoneId#systemDefault() + * system default TimeZone} is used to convert the local date-time + * to UTC time. + * + *

{@code LocalDateTime} uses a precision of nanoseconds, whereas + * this class uses a precision of milliseconds. The conversion will + * truncate any excess precision information as though the amount in + * nanoseconds was subject to integer division by one million. + * + * @param time + * The last modification time of the entry in local date-time + * + * @see #getTimeLocal() + * @since 1.9 + */ + public void setTimeLocal(LocalDateTime time) { + int year = time.getYear() - 1980; + if (year < 0) { + this.xdostime = DOSTIME_BEFORE_1980; + } else { + this.xdostime = (year << 25 | + time.getMonthValue() << 21 | + time.getDayOfMonth() << 16 | + time.getHour() << 11 | + time.getMinute() << 5 | + time.getSecond() >> 1) + + ((long)(((time.getSecond() & 0x1) * 1000) + + time.getNano() / 1000_000) << 32); + } + if (xdostime != DOSTIME_BEFORE_1980 && year <= 0x7f) { + this.mtime = null; + } else { + this.mtime = FileTime.from( + ZonedDateTime.of(time, ZoneId.systemDefault()).toInstant()); + } + } + + /** + * Returns the last modification time of the entry in local date-time. + * + *

If the entry is read from a ZIP file or ZIP file formatted + * input stream, this is the last modification time from the zip + * file entry's {@code optional extra data} if the extended timestamp + * fields are present. Otherwise, the last modification time is read + * from entry's standard MS-DOS formatted {@code date and time fields}. + * + *

The {@link java.time.ZoneId#systemDefault() system default TimeZone} + * is used to convert the UTC time to local date-time. + * + * @return The last modification time of the entry in local date-time + * + * @see #setTimeLocal(LocalDateTime) + * @since 1.9 + */ + public LocalDateTime getTimeLocal() { + if (mtime != null) { + return LocalDateTime.ofInstant(mtime.toInstant(), ZoneId.systemDefault()); + } + int ms = (int)(xdostime >> 32); + return LocalDateTime.of((int)(((xdostime >> 25) & 0x7f) + 1980), + (int)((xdostime >> 21) & 0x0f), + (int)((xdostime >> 16) & 0x1f), + (int)((xdostime >> 11) & 0x1f), + (int)((xdostime >> 5) & 0x3f), + (int)((xdostime << 1) & 0x3e) + ms / 1000, + (ms % 1000) * 1000_000); + } + + /** * Sets the last modification time of the entry. * @@ -498,15 +580,15 @@ class ZipEntry implements ZipConstants, Cloneable { // flag its presence or absence. But if mtime is present // in LOC it must be present in CEN as well. if ((flag & 0x1) != 0 && (sz0 + 4) <= sz) { - mtime = unixTimeToFileTime(get32(extra, off + sz0)); + mtime = unixTimeToFileTime(get32S(extra, off + sz0)); sz0 += 4; } if ((flag & 0x2) != 0 && (sz0 + 4) <= sz) { - atime = unixTimeToFileTime(get32(extra, off + sz0)); + atime = unixTimeToFileTime(get32S(extra, off + sz0)); sz0 += 4; } if ((flag & 0x4) != 0 && (sz0 + 4) <= sz) { - ctime = unixTimeToFileTime(get32(extra, off + sz0)); + ctime = unixTimeToFileTime(get32S(extra, off + sz0)); sz0 += 4; } break; diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java b/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java index cd8b0527858..5ee27083406 100644 --- a/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java +++ b/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java @@ -144,4 +144,13 @@ class ZipUtils { public static final long get64(byte b[], int off) { return get32(b, off) | (get32(b, off+4) << 32); } + + /** + * Fetches signed 32-bit value from byte array at specified offset. + * The bytes are assumed to be in Intel (little-endian) byte order. + * + */ + public static final int get32S(byte b[], int off) { + return (get16(b, off) | (get16(b, off+2) << 16)); + } } diff --git a/jdk/test/java/util/zip/TestExtraTime.java b/jdk/test/java/util/zip/TestExtraTime.java index 666121cdbfe..d5183c14477 100644 --- a/jdk/test/java/util/zip/TestExtraTime.java +++ b/jdk/test/java/util/zip/TestExtraTime.java @@ -23,7 +23,7 @@ /** * @test - * @bug 4759491 6303183 7012868 8015666 8023713 8068790 8076641 + * @bug 4759491 6303183 7012868 8015666 8023713 8068790 8076641 8075526 * @summary Test ZOS and ZIS timestamp in extra field correctly */ @@ -54,8 +54,12 @@ public class TestExtraTime { for (byte[] extra : new byte[][] { null, new byte[] {1, 2, 3}}) { test(mtime, null, null, null, extra); + // ms-dos 1980 epoch problem test(FileTime.from(10, TimeUnit.MILLISECONDS), null, null, null, extra); + // negative epoch time + test(FileTime.from(-100, TimeUnit.DAYS), null, null, null, extra); + // non-default tz test(mtime, null, null, tz, extra); diff --git a/jdk/test/java/util/zip/TestLocalTime.java b/jdk/test/java/util/zip/TestLocalTime.java new file mode 100644 index 00000000000..47d3e81d226 --- /dev/null +++ b/jdk/test/java/util/zip/TestLocalTime.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8075526 + * @summary Test timestamp via ZipEntry.get/setTimeLocal() + */ + +import java.io.*; +import java.nio.file.*; +import java.time.*; +import java.util.*; +import java.util.zip.*; + +public class TestLocalTime { + private static TimeZone tz0 = TimeZone.getDefault(); + + public static void main(String[] args) throws Throwable{ + try { + LocalDateTime ldt = LocalDateTime.now(); + test(getBytes(ldt), ldt); // now + ldt = ldt.withYear(1968); test(getBytes(ldt), ldt); + ldt = ldt.withYear(1970); test(getBytes(ldt), ldt); + ldt = ldt.withYear(1982); test(getBytes(ldt), ldt); + ldt = ldt.withYear(2037); test(getBytes(ldt), ldt); + ldt = ldt.withYear(2100); test(getBytes(ldt), ldt); + ldt = ldt.withYear(2106); test(getBytes(ldt), ldt); + + TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai"); + // dos time does not support < 1980, have to use + // utc in mtime. + testWithTZ(tz, ldt.withYear(1982)); + testWithTZ(tz, ldt.withYear(2037)); + testWithTZ(tz, ldt.withYear(2100)); + testWithTZ(tz, ldt.withYear(2106)); + } finally { + TimeZone.setDefault(tz0); + } + } + + static byte[] getBytes(LocalDateTime mtime) throws Throwable { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ZipOutputStream zos = new ZipOutputStream(baos); + ZipEntry ze = new ZipEntry("TestLocalTime.java"); + ze.setTimeLocal(mtime); + check(ze, mtime); + + zos.putNextEntry(ze); + zos.write(new byte[] { 1, 2, 3, 4}); + zos.close(); + return baos.toByteArray(); + } + + static void testWithTZ(TimeZone tz, LocalDateTime ldt) throws Throwable { + TimeZone.setDefault(tz); + byte[] zbytes = getBytes(ldt); + TimeZone.setDefault(tz0); + test(zbytes, ldt); + } + + static void test(byte[] zbytes, LocalDateTime expected) throws Throwable { + System.out.printf("--------------------%nTesting: [%s]%n", expected); + // ZipInputStream + ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(zbytes)); + ZipEntry ze = zis.getNextEntry(); + zis.close(); + check(ze, expected); + + // ZipFile + Path zpath = Paths.get(System.getProperty("test.dir", "."), + "TestLocalTime.zip"); + try { + Files.copy(new ByteArrayInputStream(zbytes), zpath); + ZipFile zf = new ZipFile(zpath.toFile()); + ze = zf.getEntry("TestLocalTime.java"); + check(ze, expected); + zf.close(); + } finally { + Files.deleteIfExists(zpath); + } + } + + static void check(ZipEntry ze, LocalDateTime expected) { + LocalDateTime ldt = ze.getTimeLocal(); + if (ldt.atOffset(ZoneOffset.UTC).toEpochSecond() >> 1 + != expected.atOffset(ZoneOffset.UTC).toEpochSecond() >> 1) { + throw new RuntimeException("Timestamp: storing mtime failed!"); + } + } +} From 3d82fdcaad07a2d96b24d91cf3fcfcf825dc7639 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Wed, 22 Jul 2015 21:11:38 -0700 Subject: [PATCH 39/56] 8130914: java/util/zip/TestExtraTime.java fails with "java.lang.RuntimeException: setTime should make getLastModifiedTime return the specified instant: 3078282244456 got: 3078282244455" Fixed the 32-bit overflow. Reviewed-by: rriggs --- jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java | 6 +++--- jdk/test/java/util/zip/TestExtraTime.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java b/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java index 5ee27083406..df90496b609 100644 --- a/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java +++ b/jdk/src/java.base/share/classes/java/util/zip/ZipUtils.java @@ -99,9 +99,9 @@ class ZipUtils { if (year < 1980) { return ZipEntry.DOSTIME_BEFORE_1980; } - return (year - 1980) << 25 | (d.getMonth() + 1) << 21 | - d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 | - d.getSeconds() >> 1; + return ((year - 1980) << 25 | (d.getMonth() + 1) << 21 | + d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 | + d.getSeconds() >> 1) & 0xffffffffL; } /** diff --git a/jdk/test/java/util/zip/TestExtraTime.java b/jdk/test/java/util/zip/TestExtraTime.java index d5183c14477..2fd2b4ad7ad 100644 --- a/jdk/test/java/util/zip/TestExtraTime.java +++ b/jdk/test/java/util/zip/TestExtraTime.java @@ -23,7 +23,7 @@ /** * @test - * @bug 4759491 6303183 7012868 8015666 8023713 8068790 8076641 8075526 + * @bug 4759491 6303183 7012868 8015666 8023713 8068790 8076641 8075526 8130914 * @summary Test ZOS and ZIS timestamp in extra field correctly */ From fdc7b2e85ff133613dd11c67b44786b411ed8665 Mon Sep 17 00:00:00 2001 From: Konstantin Shefov Date: Thu, 23 Jul 2015 16:46:54 +0300 Subject: [PATCH 40/56] 8130006: java/lang/invoke/MethodHandles/CatchExceptionTest Fails Reviewed-by: psandoz --- .../java/lang/invoke/MethodHandles/CatchExceptionTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java b/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java index dab58a40d94..e8af1ea6bd6 100644 --- a/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java +++ b/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java @@ -168,6 +168,11 @@ public class CatchExceptionTest { try { returned = target.invokeWithArguments(args); } catch (Throwable ex) { + if (CodeCacheOverflowProcessor.isThrowableCausedByVME(ex)) { + // This error will be treated by CodeCacheOverflowProcessor + // to prevent the test from failing because of code cache overflow. + throw new Error(ex); + } testCase.assertCatch(ex); returned = ex; } From 57d1a3730d1055583d5fa2b31eb2e8bca5fe41e7 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:23 -0700 Subject: [PATCH 41/56] Added tag jdk9-b74 for changeset 243b84f44954 --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 4284c9e7cfd..1dcaf7ef62c 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -316,3 +316,4 @@ eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70 c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71 8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72 4c2cbaae528bce970dabbb5676005d379357f4b6 jdk9-b73 +57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74 From e7a02beb563264c422e58bb0c3be7d57f2fb58f4 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:26 -0700 Subject: [PATCH 42/56] Added tag jdk9-b74 for changeset 7c5e7ba80fcd --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index f89aa29d985..93fdfa4cd5c 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -476,3 +476,4 @@ ff0929a59ced0e144201aa05819ae2e47d6f2c61 jdk9-b69 07c6b035d68b0c41b1dcd442157b50b41a2551e9 jdk9-b71 c1b2825ef47e75cb34dd18450d1c4280b7c5853c jdk9-b72 e37d432868be0aa7cb5e0f3d7caff1e825d8ead3 jdk9-b73 +fff6b54e9770ac4c12c2fb4cab5aa7672affa4bd jdk9-b74 From fb5d1a6ed64993bac1e4e125d6cff7912311ef6e Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:26 -0700 Subject: [PATCH 43/56] Added tag jdk9-b74 for changeset 5a6507bfdb55 --- corba/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/corba/.hgtags b/corba/.hgtags index 47cf27f7299..64aea838478 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -316,3 +316,4 @@ e7cf01990ed366bd493080663259281e91ce223b jdk9-b70 cd39ed501fb0504554a7f58ac6cf3dd2b64afec0 jdk9-b71 f9f3706bd24c42c07cb260fe05730a749b8e52f4 jdk9-b72 29096b78d93b01a2f8882509cd40755e3d6b8cd9 jdk9-b73 +622fe934e351e89107edf3c667d6b57f543f58f1 jdk9-b74 From 039813143d4a4721fa800a1fdfd5047c1d268669 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:28 -0700 Subject: [PATCH 44/56] Added tag jdk9-b74 for changeset de28c7256c35 --- jaxp/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxp/.hgtags b/jaxp/.hgtags index 213231e1641..e56b2ae77b7 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -316,3 +316,4 @@ f844a908d3308f47d73cf64e87c98d37d5d76ce8 jdk9-b69 a3200b88f259f904876b9ab13fd4c4ec2726f8ba jdk9-b71 81e85f3b6174314155991048767452a9931e12e2 jdk9-b72 be5efc34a43bdd982d1cbe11cb2f6d6a060dde60 jdk9-b73 +eadcb2b55cd1daf77625813aad0f6f3967b1528a jdk9-b74 From eea9e42b51933acea0c5a4995409cdbad1e48001 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:29 -0700 Subject: [PATCH 45/56] Added tag jdk9-b74 for changeset 63fb159920a7 --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index 74dc8e54ea1..f49da139113 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -316,3 +316,4 @@ a7f731125b7fb0e4b0186172f85a21e2d5139f7e jdk9-b70 e47d3bfbc61accc3fbd372a674fdce2933b54f31 jdk9-b71 f376824d4940f45719d91838f3f6249f873440db jdk9-b72 1c8bca2ebba13948199de33a1b71e2d6f1c7a8a6 jdk9-b73 +6dd82d2e4a104f4d204b2890f33ef11ec3e3f8d0 jdk9-b74 From da9674501c8f88bfe71fb0dab660dec1435687ec Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:29 -0700 Subject: [PATCH 46/56] Added tag jdk9-b74 for changeset be41b3ebc712 --- jaxws/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxws/.hgtags b/jaxws/.hgtags index fb8bbe92d88..bfb3fa324a8 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -319,3 +319,4 @@ f5911c6155c29ac24b6f9068273207e5ebd3a3df jdk9-b69 61caeb7061bbf8cc74a767997e5d17cc00712629 jdk9-b71 1d87054e2d2f405c114f0061b97cbf8214bddf0a jdk9-b72 285939df908721cdb2b18a119638114306b8dca7 jdk9-b73 +6232472e51418757f7b2bf05332678ea78096e6b jdk9-b74 From 85e90ced97f5b05ee99727a69374358e912aa181 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:33 -0700 Subject: [PATCH 47/56] Added tag jdk9-b74 for changeset ca2d747bbf94 --- langtools/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/langtools/.hgtags b/langtools/.hgtags index 160769a1872..15992c941df 100644 --- a/langtools/.hgtags +++ b/langtools/.hgtags @@ -316,3 +316,4 @@ d732d6dfa72743e3aa96375c6e33f1388dbaa5c6 jdk9-b70 dc35e315436d21eab68ef44909922fb3424917f3 jdk9-b71 832e51533706b633d37a77282ae94d016b95e649 jdk9-b72 1fccc38cd6f56cb2173195e317ba2784b484c2d1 jdk9-b73 +02681b7c4232ba5d43ccba794492db9502211ff0 jdk9-b74 From 6c92ef20e689315731854199e5d01e6125d50516 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 23 Jul 2015 11:54:34 -0700 Subject: [PATCH 48/56] Added tag jdk9-b74 for changeset 1889ccd678ae --- nashorn/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/nashorn/.hgtags b/nashorn/.hgtags index 8452d0354a3..dbc39eb6a49 100644 --- a/nashorn/.hgtags +++ b/nashorn/.hgtags @@ -307,3 +307,4 @@ dd6dd848b854dbd3f3cc422668276b1ae0834179 jdk9-b68 7066af6e7b06f3c6ebf449c88fc1064d2181237a jdk9-b71 d017877b3b8cd39337f1bdc00d958f821433c4c3 jdk9-b72 548f1eb2c3c89e024ef3805f48ceed9de503588f jdk9-b73 +2e8bb16872d7b15dc0a4f8e45c6ad65f762c1b04 jdk9-b74 From 5f0a5f2be0ccb2c822c2fef690f938d2d5b913c7 Mon Sep 17 00:00:00 2001 From: "J. Duke" Date: Wed, 5 Jul 2017 20:42:40 +0200 Subject: [PATCH 49/56] Added tag jdk9-b74 for changeset 7c577fda1855 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9452282fa51..eeb9123ddb1 100644 --- a/.hgtags +++ b/.hgtags @@ -316,3 +316,4 @@ d69c968463f0ae5d0b45de3fc14fe65171b23948 jdk9-b69 f66c185284727f6e6ffd27e9c45ed2dd9da0a691 jdk9-b71 61d2d0629b6dbf4c091dc86151ade1b3ef34fffe jdk9-b72 9b3a9d72f07b40c648de79961679f42283af1bb5 jdk9-b73 +7c577fda1855d03c04546694d514678f596508c9 jdk9-b74 From 8f15d5a0c2b95e164eab11631875ad230958f353 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Fri, 24 Jul 2015 18:57:04 +0200 Subject: [PATCH 50/56] 8132335: jimage tool extract and recreate options are not consistent Incorrect fileName formatting. Replaced with getFileName() + removal of .jimage extension. Reviewed-by: jlaskey --- .../share/classes/jdk/internal/jimage/ImageFileCreator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java index 1a16ad1c69f..6bb482a208f 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java +++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageFileCreator.java @@ -159,7 +159,11 @@ public final class ImageFileCreator { throw new UnsupportedOperationException("Not supported, no external file " + "in a jimage file"); }, entriesForModule, order); - String fileName = jimageFile.getRoot().toString(); + String fileName = jimageFile.getFileName().toString(); + if (fileName.endsWith(IMAGE_EXT)) { + fileName = fileName.substring(0, fileName.length() + - BasicImageWriter.IMAGE_EXT.length()); + } generateJImage(jimageFile, fileName, resources, order); } From 7cd090f2305706caf2cff9152eda0b124c028b1d Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Fri, 24 Jul 2015 11:52:30 -0700 Subject: [PATCH 51/56] 8065556: (bf) Buffer.position and other methods should include detail in IAE Add messages to IAEs which have none. Reviewed-by: alanb --- .../share/classes/java/nio/Buffer.java | 84 +++++++++++++++++-- .../java/nio/Direct-X-Buffer.java.template | 4 +- .../java/nio/Heap-X-Buffer.java.template | 2 +- .../classes/java/nio/X-Buffer.java.template | 4 +- .../java/nio/Buffer/Basic-X.java.template | 68 ++++++++++++++- jdk/test/java/nio/Buffer/BasicByte.java | 66 +++++++++++++++ jdk/test/java/nio/Buffer/BasicChar.java | 66 +++++++++++++++ jdk/test/java/nio/Buffer/BasicDouble.java | 66 +++++++++++++++ jdk/test/java/nio/Buffer/BasicFloat.java | 68 ++++++++++++++- jdk/test/java/nio/Buffer/BasicInt.java | 66 +++++++++++++++ jdk/test/java/nio/Buffer/BasicLong.java | 66 +++++++++++++++ jdk/test/java/nio/Buffer/BasicShort.java | 66 +++++++++++++++ 12 files changed, 613 insertions(+), 13 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/nio/Buffer.java b/jdk/src/java.base/share/classes/java/nio/Buffer.java index 58b451675bf..ba72f285a8f 100644 --- a/jdk/src/java.base/share/classes/java/nio/Buffer.java +++ b/jdk/src/java.base/share/classes/java/nio/Buffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -197,7 +197,7 @@ public abstract class Buffer { // Buffer(int mark, int pos, int lim, int cap) { // package-private if (cap < 0) - throw new IllegalArgumentException("Negative capacity: " + cap); + throw createCapacityException(cap); this.capacity = cap; limit(lim); position(pos); @@ -209,6 +209,34 @@ public abstract class Buffer { } } + /** + * Returns an {@code IllegalArgumentException} indicating that the source + * and target are the same {@code Buffer}. Intended for use in + * {@code put(src)} when the parameter is the {@code Buffer} on which the + * method is being invoked. + * + * @returns IllegalArgumentException + * With a message indicating equal source and target buffers + */ + static IllegalArgumentException createSameBufferException() { + return new IllegalArgumentException("The source buffer is this buffer"); + } + + /** + * Verify that the capacity is nonnegative. + * + * @param capacity + * The new buffer's capacity, in $type$s + * + * @throws IllegalArgumentException + * If the capacity is a negative integer + */ + static IllegalArgumentException createCapacityException(int capacity) { + assert capacity < 0 : "capacity expected to be negative"; + return new IllegalArgumentException("capacity < 0: (" + + capacity + " < 0)"); + } + /** * Returns this buffer's capacity. * @@ -241,13 +269,35 @@ public abstract class Buffer { * If the preconditions on newPosition do not hold */ public Buffer position(int newPosition) { - if ((newPosition > limit) || (newPosition < 0)) - throw new IllegalArgumentException(); + if (newPosition > limit | newPosition < 0) + throw createPositionException(newPosition); position = newPosition; if (mark > position) mark = -1; return this; } + /** + * Verify that {@code 0 < newPosition <= limit} + * + * @param newPosition + * The new position value + * + * @throws IllegalArgumentException + * If the specified position is out of bounds. + */ + private IllegalArgumentException createPositionException(int newPosition) { + String msg = null; + + if (newPosition > limit) { + msg = "newPosition > limit: (" + newPosition + " > " + limit + ")"; + } else { // assume negative + assert newPosition < 0 : "newPosition expected to be negative"; + msg = "newPosition < 0: (" + newPosition + " < 0)"; + } + + return new IllegalArgumentException(msg); + } + /** * Returns this buffer's limit. * @@ -272,14 +322,36 @@ public abstract class Buffer { * If the preconditions on newLimit do not hold */ public Buffer limit(int newLimit) { - if ((newLimit > capacity) || (newLimit < 0)) - throw new IllegalArgumentException(); + if (newLimit > capacity | newLimit < 0) + throw createLimitException(newLimit); limit = newLimit; if (position > limit) position = limit; if (mark > limit) mark = -1; return this; } + /** + * Verify that {@code 0 < newLimit <= capacity} + * + * @param newLimit + * The new limit value + * + * @throws IllegalArgumentException + * If the specified limit is out of bounds. + */ + private IllegalArgumentException createLimitException(int newLimit) { + String msg = null; + + if (newLimit > capacity) { + msg = "newLimit > capacity: (" + newLimit + " > " + capacity + ")"; + } else { // assume negative + assert newLimit < 0 : "newLimit expected to be negative"; + msg = "newLimit < 0: (" + newLimit + " < 0)"; + } + + return new IllegalArgumentException(msg); + } + /** * Sets this buffer's mark at its position. * diff --git a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template index 57801f7c5c2..8ef6b8d0841 100644 --- a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -314,7 +314,7 @@ class Direct$Type$Buffer$RW$$BO$ #if[rw] if (src instanceof Direct$Type$Buffer$BO$) { if (src == this) - throw new IllegalArgumentException(); + throw createSameBufferException(); Direct$Type$Buffer$RW$$BO$ sb = (Direct$Type$Buffer$RW$$BO$)src; int spos = sb.position(); diff --git a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template index 3876b147093..c37901431fb 100644 --- a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template @@ -216,7 +216,7 @@ class Heap$Type$Buffer$RW$ #if[rw] if (src instanceof Heap$Type$Buffer) { if (src == this) - throw new IllegalArgumentException(); + throw createSameBufferException(); Heap$Type$Buffer sb = (Heap$Type$Buffer)src; int n = sb.remaining(); if (n > remaining()) diff --git a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template index 2ed17e9d806..78afa40a506 100644 --- a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template @@ -339,7 +339,7 @@ public abstract class $Type$Buffer */ public static $Type$Buffer allocate(int capacity) { if (capacity < 0) - throw new IllegalArgumentException(); + throw createCapacityException(capacity); return new Heap$Type$Buffer(capacity, capacity); } @@ -797,7 +797,7 @@ public abstract class $Type$Buffer */ public $Type$Buffer put($Type$Buffer src) { if (src == this) - throw new IllegalArgumentException(); + throw createSameBufferException(); if (isReadOnly()) throw new ReadOnlyBufferException(); int n = src.remaining(); diff --git a/jdk/test/java/nio/Buffer/Basic-X.java.template b/jdk/test/java/nio/Buffer/Basic-X.java.template index cae8c26514e..b4c3bac6d4f 100644 --- a/jdk/test/java/nio/Buffer/Basic-X.java.template +++ b/jdk/test/java/nio/Buffer/Basic-X.java.template @@ -128,6 +128,15 @@ public class Basic$Type$ c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class Basic$Type$ b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -502,7 +551,8 @@ public class Basic$Type$ ck(b, b.get(), -Float.MIN_VALUE); ck(b, b.get(), Float.NEGATIVE_INFINITY); ck(b, b.get(), Float.POSITIVE_INFINITY); - if (Float.floatToRawIntBits(v = b.get()) != Float.floatToRawIntBits(Float.NaN)) + if (Float.floatToRawIntBits(v = b.get()) != + Float.floatToRawIntBits(Float.NaN)) fail(b, (long)Float.NaN, (long)v); ck(b, b.get(), 0.91697687f); #end[float] @@ -934,11 +984,27 @@ public class Basic$Type$ public void run() { $Type$Buffer.allocate(-1); }}); + try { + $Type$Buffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } #if[byte] tryCatch((Buffer) null, IllegalArgumentException.class, new Runnable() { public void run() { $Type$Buffer.allocateDirect(-1); }}); + try { + $Type$Buffer.allocateDirect(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity direct buffer"); + } + } #end[byte] } diff --git a/jdk/test/java/nio/Buffer/BasicByte.java b/jdk/test/java/nio/Buffer/BasicByte.java index fc3f7adf398..0c9c9b3d02b 100644 --- a/jdk/test/java/nio/Buffer/BasicByte.java +++ b/jdk/test/java/nio/Buffer/BasicByte.java @@ -128,6 +128,15 @@ public class BasicByte c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicByte b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -516,6 +565,7 @@ public class BasicByte + // Comparison @@ -934,11 +984,27 @@ public class BasicByte public void run() { ByteBuffer.allocate(-1); }}); + try { + ByteBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } tryCatch((Buffer) null, IllegalArgumentException.class, new Runnable() { public void run() { ByteBuffer.allocateDirect(-1); }}); + try { + ByteBuffer.allocateDirect(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity direct buffer"); + } + } } diff --git a/jdk/test/java/nio/Buffer/BasicChar.java b/jdk/test/java/nio/Buffer/BasicChar.java index 1710fcf899e..1005d3c18ed 100644 --- a/jdk/test/java/nio/Buffer/BasicChar.java +++ b/jdk/test/java/nio/Buffer/BasicChar.java @@ -128,6 +128,15 @@ public class BasicChar c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicChar b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -516,6 +565,7 @@ public class BasicChar + // Comparison @@ -934,6 +984,22 @@ public class BasicChar public void run() { CharBuffer.allocate(-1); }}); + try { + CharBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } + + + + + + + + diff --git a/jdk/test/java/nio/Buffer/BasicDouble.java b/jdk/test/java/nio/Buffer/BasicDouble.java index 0f9509064cb..9e334608e68 100644 --- a/jdk/test/java/nio/Buffer/BasicDouble.java +++ b/jdk/test/java/nio/Buffer/BasicDouble.java @@ -128,6 +128,15 @@ public class BasicDouble c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicDouble b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -507,6 +556,7 @@ public class BasicDouble + ck(b, b.get(), -Double.MAX_VALUE); ck(b, b.get(), -Double.MIN_VALUE); ck(b, b.get(), Double.NEGATIVE_INFINITY); @@ -934,6 +984,22 @@ public class BasicDouble public void run() { DoubleBuffer.allocate(-1); }}); + try { + DoubleBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } + + + + + + + + diff --git a/jdk/test/java/nio/Buffer/BasicFloat.java b/jdk/test/java/nio/Buffer/BasicFloat.java index 0ada0ab971b..c9a22b5d96b 100644 --- a/jdk/test/java/nio/Buffer/BasicFloat.java +++ b/jdk/test/java/nio/Buffer/BasicFloat.java @@ -128,6 +128,15 @@ public class BasicFloat c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicFloat b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -502,7 +551,8 @@ public class BasicFloat ck(b, b.get(), -Float.MIN_VALUE); ck(b, b.get(), Float.NEGATIVE_INFINITY); ck(b, b.get(), Float.POSITIVE_INFINITY); - if (Float.floatToRawIntBits(v = b.get()) != Float.floatToRawIntBits(Float.NaN)) + if (Float.floatToRawIntBits(v = b.get()) != + Float.floatToRawIntBits(Float.NaN)) fail(b, (long)Float.NaN, (long)v); ck(b, b.get(), 0.91697687f); @@ -934,6 +984,22 @@ public class BasicFloat public void run() { FloatBuffer.allocate(-1); }}); + try { + FloatBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } + + + + + + + + diff --git a/jdk/test/java/nio/Buffer/BasicInt.java b/jdk/test/java/nio/Buffer/BasicInt.java index 445c9711f78..71377168850 100644 --- a/jdk/test/java/nio/Buffer/BasicInt.java +++ b/jdk/test/java/nio/Buffer/BasicInt.java @@ -128,6 +128,15 @@ public class BasicInt c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicInt b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -516,6 +565,7 @@ public class BasicInt + // Comparison @@ -934,6 +984,22 @@ public class BasicInt public void run() { IntBuffer.allocate(-1); }}); + try { + IntBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } + + + + + + + + diff --git a/jdk/test/java/nio/Buffer/BasicLong.java b/jdk/test/java/nio/Buffer/BasicLong.java index bc8c5f7a124..05b1a5fb4c3 100644 --- a/jdk/test/java/nio/Buffer/BasicLong.java +++ b/jdk/test/java/nio/Buffer/BasicLong.java @@ -128,6 +128,15 @@ public class BasicLong c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicLong b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -516,6 +565,7 @@ public class BasicLong + // Comparison @@ -934,6 +984,22 @@ public class BasicLong public void run() { LongBuffer.allocate(-1); }}); + try { + LongBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } + + + + + + + + diff --git a/jdk/test/java/nio/Buffer/BasicShort.java b/jdk/test/java/nio/Buffer/BasicShort.java index 3f0a24bf0df..aed3d070ce0 100644 --- a/jdk/test/java/nio/Buffer/BasicShort.java +++ b/jdk/test/java/nio/Buffer/BasicShort.java @@ -128,6 +128,15 @@ public class BasicShort c.position(7); b.put(c); b.flip(); + try { + b.put(b); + fail("IllegalArgumentException expected for put into same buffer"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected from" + + " put into same buffer"); + } + } } //6231529 @@ -464,6 +473,46 @@ public class BasicShort b.reset(); }}); + try { + b.position(b.limit() + 1); + fail("IllegalArgumentException expected for position beyond limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " position beyond limit"); + } + } + + try { + b.position(-1); + fail("IllegalArgumentException expected for negative position"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative position"); + } + } + + try { + b.limit(b.capacity() + 1); + fail("IllegalArgumentException expected for limit beyond capacity"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " limit beyond capacity"); + } + } + + try { + b.limit(-1); + fail("IllegalArgumentException expected for negative limit"); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " negative limit"); + } + } + // Values b.clear(); @@ -516,6 +565,7 @@ public class BasicShort + // Comparison @@ -934,6 +984,22 @@ public class BasicShort public void run() { ShortBuffer.allocate(-1); }}); + try { + ShortBuffer.allocate(-1); + } catch (IllegalArgumentException e) { + if (e.getMessage() == null) { + fail("Non-null IllegalArgumentException message expected for" + + " attempt to allocate negative capacity buffer"); + } + } + + + + + + + + From b6bee08125e1204e2275bc7bda7ec94cb46af2d4 Mon Sep 17 00:00:00 2001 From: Artem Smotrakov Date: Sat, 25 Jul 2015 08:50:45 +0300 Subject: [PATCH 52/56] 8048596: Tests for AEAD ciphers Reviewed-by: valeriep --- .../crypto/provider/Cipher/AEAD/Encrypt.java | 753 ++++++++++++++++++ .../Cipher/AEAD/GCMParameterSpecTest.java | 218 +++++ .../crypto/provider/Cipher/AEAD/Helper.java | 33 + .../provider/Cipher/AEAD/KeyWrapper.java | 87 ++ .../provider/Cipher/AEAD/ReadWriteSkip.java | 317 ++++++++ .../provider/Cipher/AEAD/SameBuffer.java | 423 ++++++++++ .../Cipher/AEAD/SealedObjectTest.java | 110 +++ .../crypto/provider/Cipher/AEAD/WrongAAD.java | 174 ++++ 8 files changed, 2115 insertions(+) create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/Helper.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java new file mode 100644 index 00000000000..d96cb00a6f4 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Encrypt.java @@ -0,0 +1,753 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.nio.ByteBuffer; +import java.security.AlgorithmParameters; +import java.security.Provider; +import java.security.Security; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.crypto.SecretKey; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; + +/* + * @test + * @bug 8048596 + * @summary AEAD encryption/decryption test + */ + +/* + * The test does the following: + * - create an input text and additional data + * - generate a secret key + * - instantiate a cipher according to the GCM transformation + * - generate an outputText using a single-part encryption/decryption + * in AEAD mode + * - perform 16 different combinations of multiple-part encryption/decryption + * operation in AEAD mode (in encryption mode new Cipher object is created + * and initialized with the same secret key and parameters) + * - check that all 17 results are equal + * + * Combinations: + * + * combination #1 + * updateAAD(byte[] src) + * update(byte[], int, int) + * doFinal(byte[], int, int) + * + * combination #2 + * updateAAD(byte[] src) + * update(byte[], int, int) + * doFinal(byte[], int, int, byte[], int) + * + * combination #3 + * updateAAD(byte[] src) + * update(byte[], int, int, byte[], int) + * doFinal(byte[], int, int) + * + * combination #4 + * updateAAD(byte[] src) + * update(byte[], int, int, byte[], int) + * doFinal(byte[], int, int, byte[], int) + * + * combination #5 - #8 are similar to #1 -#4, + * but with updateAAD(byte[] src, int offset, int len) + * + * combination #9 - #12 are similar to #1 - #4, + * but with updateAAD(ByteBuffer src) + * + * combination #13 - #16 are similar to #9 - #12 but with directly allocated + * ByteBuffer and update(ByteBuffer input, ByteBuffer output) + * + */ +public class Encrypt { + + private static final String ALGORITHMS[] = { "AES", "Rijndael" }; + private static final int KEY_STRENGTHS[] = { 128, 192, 256 }; + private static final int TEXT_LENGTHS[] = { 0, 256, 1024 }; + private static final int AAD_LENGTHS[] = { 0, 8, 128, 256, 1024 }; + private static final int ARRAY_OFFSET = 8; + + private final String transformation; + private final Provider provider; + private final SecretKey key; + private final int textLength; + private final int AADLength; + + /** + * @param provider Security provider + * @param algorithm Security algorithm to test + * @param mode The mode (GCM is only expected) + * @param padding Algorithm padding + * @param keyStrength key length + * @param textLength Plain text length + * @param AADLength Additional data length + */ + public Encrypt(Provider provider, String algorithm, String mode, + String padding, int keyStrength, int textLength, int AADLength) + throws Exception { + + // init a secret Key + KeyGenerator kg = KeyGenerator.getInstance(algorithm, provider); + kg.init(keyStrength); + key = kg.generateKey(); + + this.provider = provider; + this.transformation = algorithm + "/" + mode + "/" + padding; + this.textLength = textLength; + this.AADLength = AADLength; + } + + public static void main(String[] args) throws Exception { + Provider p = Security.getProvider("SunJCE"); + for (String alg : ALGORITHMS) { + for (int keyStrength : KEY_STRENGTHS) { + if (keyStrength > Cipher.getMaxAllowedKeyLength(alg)) { + // skip this if this key length is larger than what's + // configured in the JCE jurisdiction policy files + continue; + } + for (int textLength : TEXT_LENGTHS) { + for (int AADLength : AAD_LENGTHS) { + Encrypt test = new Encrypt(p, alg, + "GCM", "NoPadding", keyStrength, textLength, + AADLength); + Cipher cipher = test.createCipher(Cipher.ENCRYPT_MODE, + null); + AlgorithmParameters params = cipher.getParameters(); + test.doTest(params); + System.out.println("Test " + alg + ":" + + keyStrength + ":" + textLength + ":" + + AADLength + " passed"); + } + } + } + } + } + + public void doTest(AlgorithmParameters params) throws Exception { + System.out.println("Test transformation = " + transformation + + ", textLength = " + textLength + + ", AADLength = " + AADLength); + byte[] input = Helper.generateBytes(textLength); + byte[] AAD = Helper.generateBytes(AADLength); + byte[] result = execute(Cipher.ENCRYPT_MODE, AAD, input, params); + result = execute(Cipher.DECRYPT_MODE, AAD, result, params); + if (!Arrays.equals(input, result)) { + throw new RuntimeException("Test failed"); + } + System.out.println("Test passed"); + } + + /** + * Create a Cipher object for the requested encryption/decryption mode. + * + * @param mode encryption or decryption mode + * @return Cipher object initiated to perform requested mode operation + */ + private Cipher createCipher(int mode, AlgorithmParameters params) + throws Exception { + Cipher ci; + if (Cipher.ENCRYPT_MODE == mode) { + // create a new Cipher object for encryption + ci = Cipher.getInstance(transformation, provider); + + // initiate it with the saved parameters + if (params != null) { + ci.init(Cipher.ENCRYPT_MODE, key, params); + } else { + // initiate the cipher without parameters + ci.init(Cipher.ENCRYPT_MODE, key); + } + } else { + // it is expected that parameters already generated + // before decryption + ci = Cipher.getInstance(transformation, provider); + ci.init(Cipher.DECRYPT_MODE, key, params); + } + + return ci; + } + + /** + * Test AEAD combinations + * + * @param mode decryption or encryption + * @param AAD additional data for AEAD operations + * @param inputText plain text to decrypt/encrypt + * @return output text after encrypt/decrypt + */ + public byte[] execute(int mode, byte[] AAD, byte[] inputText, + AlgorithmParameters params) throws Exception { + + Cipher cipher = createCipher(mode, params); + + // results of each combination will be saved in the outputTexts + List outputTexts = new ArrayList<>(); + + // generate a standard outputText using a single-part en/de-cryption + cipher.updateAAD(AAD); + byte[] output = cipher.doFinal(inputText); + + // execute multiple-part encryption/decryption combinations + combination_1(outputTexts, mode, AAD, inputText, params); + combination_2(outputTexts, mode, AAD, inputText, params); + combination_3(outputTexts, mode, AAD, inputText, params); + combination_4(outputTexts, mode, AAD, inputText, params); + combination_5(outputTexts, mode, AAD, inputText, params); + combination_6(outputTexts, mode, AAD, inputText, params); + combination_7(outputTexts, mode, AAD, inputText, params); + combination_8(outputTexts, mode, AAD, inputText, params); + combination_9(outputTexts, mode, AAD, inputText, params); + combination_10(outputTexts, mode, AAD, inputText, params); + combination_11(outputTexts, mode, AAD, inputText, params); + combination_12(outputTexts, mode, AAD, inputText, params); + combination_13(outputTexts, mode, AAD, inputText, params); + combination_14(outputTexts, mode, AAD, inputText, params); + combination_15(outputTexts, mode, AAD, inputText, params); + combination_16(outputTexts, mode, AAD, inputText, params); + + for (int k = 0; k < outputTexts.size(); k++) { + if (!Arrays.equals(output, outputTexts.get(k))) { + throw new RuntimeException("Combination #" + k + " failed"); + } + } + return output; + } + + /* + * Execute multiple-part encryption/decryption combination #1: + * updateAAD(byte[] src) + * update(byte[], int, int) + * doFinal(byte[], int, int) + */ + private void combination_1(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + c.updateAAD(AAD); + byte[] part11 = c.update(plainText, 0, plainText.length); + int part11_length = part11 == null ? 0 : part11.length; + byte[] part12 = c.doFinal(); + byte[] outputText1 = new byte[part11_length + part12.length]; + if (part11 != null) { + System.arraycopy(part11, 0, outputText1, 0, part11_length); + } + System.arraycopy(part12, 0, outputText1, part11_length, part12.length); + results.add(outputText1); + } + + /* + * Execute multiple-part encryption/decryption combination #2: + * updateAAD(byte[] src) + * update(byte[], int, int) + * doFinal(byte[], int, int, byte[], int) + */ + private void combination_2(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + c.updateAAD(AAD); + int t = 0; + int offset = 0; + if (plainText.length > ARRAY_OFFSET) { + t = plainText.length - ARRAY_OFFSET; + offset = ARRAY_OFFSET; + } + byte[] part21 = c.update(plainText, 0, t); + byte[] part22 = new byte[c.getOutputSize(plainText.length)]; + int len2 = c.doFinal(plainText, t, offset, part22, 0); + int part21Length = part21 != null ? part21.length : 0; + byte[] outputText2 = new byte[part21Length + len2]; + if (part21 != null) { + System.arraycopy(part21, 0, outputText2, 0, part21Length); + } + System.arraycopy(part22, 0, outputText2, part21Length, len2); + results.add(outputText2); + } + + /* + * Execute multiple-part encryption/decryption combination #3 + * updateAAD(byte[] src) + * update(byte[], int, int, byte[], int) + * doFinal(byte[], int, int) + */ + private void combination_3(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher ci = createCipher(mode, params); + ci.updateAAD(AAD); + byte[] part31 = new byte[ci.getOutputSize(plainText.length)]; + int offset = plainText.length > ARRAY_OFFSET ? ARRAY_OFFSET : 0; + int len = ci.update(plainText, 0, plainText.length - offset, part31, 0); + byte[] part32 = ci.doFinal(plainText, plainText.length - offset, + offset); + byte[] outputText3 = new byte[len + part32.length]; + System.arraycopy(part31, 0, outputText3, 0, len); + System.arraycopy(part32, 0, outputText3, len, part32.length); + results.add(outputText3); + } + + /* + * Execute multiple-part encryption/decryption combination #4: + * updateAAD(byte[] src) + * update(byte[], int, int, byte[], int) + * doFinal(byte[], int, int, byte[], int) + */ + private void combination_4(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher ci = createCipher(mode, params); + ci.updateAAD(AAD); + byte[] part41 = new byte[ci.getOutputSize(plainText.length)]; + int offset = plainText.length > ARRAY_OFFSET ? ARRAY_OFFSET : 0; + int len = ci.update(plainText, 0, plainText.length - offset, part41, 0); + int rest4 = ci.doFinal(plainText, plainText.length - offset, offset, + part41, len); + byte[] outputText4 = new byte[len + rest4]; + System.arraycopy(part41, 0, outputText4, 0, outputText4.length); + results.add(outputText4); + } + + /* + * Execute multiple-part encryption/decryption combination #5: + * updateAAD(byte[] src, int offset, int len) + * update(byte[], int, int) + * doFinal(byte[], int, int) + */ + private void combination_5(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + c.updateAAD(AAD, 0, AAD.length); + byte[] part51 = c.update(plainText, 0, plainText.length); + byte[] part52 = c.doFinal(); + int part51Length = part51 != null ? part51.length : 0; + byte[] outputText5 = new byte[part51Length + part52.length]; + if (part51 != null) { + System.arraycopy(part51, 0, outputText5, 0, part51Length); + } + System.arraycopy(part52, 0, outputText5, part51Length, part52.length); + results.add(outputText5); + } + + /* + * Execute multiple-part encryption/decryption combination #6: + * updateAAD(byte[] src, int offset, int len) + * updateAAD(byte[] src, int offset, int len) + * update(byte[], int, int) doFinal(byte[], int, int, byte[], int) + */ + private void combination_6(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + c.updateAAD(AAD, 0, AAD.length / 2); + c.updateAAD(AAD, AAD.length / 2, AAD.length - AAD.length / 2); + int t = 0; + int offset = 0; + if (plainText.length > ARRAY_OFFSET) { + t = plainText.length - ARRAY_OFFSET; + offset = ARRAY_OFFSET; + } + byte[] part61 = c.update(plainText, 0, t); + byte[] part62 = new byte[c.getOutputSize(plainText.length)]; + int len = c.doFinal(plainText, t, offset, part62, 0); + int part61Length = part61 != null ? part61.length : 0; + byte[] outputText6 = new byte[part61Length + len]; + if (part61 != null) { + System.arraycopy(part61, 0, outputText6, 0, part61Length); + } + System.arraycopy(part62, 0, outputText6, part61Length, len); + results.add(outputText6); + } + + /* + * Execute multiple-part encryption/decryption combination #7 + * updateAAD(byte[] src, int offset, int len) + * updateAAD(byte[] src, src.length, 0) + * update(byte[], int, int, byte[], int) doFinal(byte[],int, int) + */ + private void combination_7(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher ci = createCipher(mode, params); + ci.updateAAD(AAD, 0, AAD.length); + ci.updateAAD(AAD, AAD.length, 0); + byte[] part71 = new byte[ci.getOutputSize(plainText.length)]; + int offset = plainText.length > ARRAY_OFFSET ? ARRAY_OFFSET : 0; + int len = ci.update(plainText, 0, plainText.length - offset, part71, 0); + byte[] part72 = ci.doFinal(plainText, plainText.length - offset, offset); + byte[] outputText7 = new byte[len + part72.length]; + System.arraycopy(part71, 0, outputText7, 0, len); + System.arraycopy(part72, 0, outputText7, len, part72.length); + results.add(outputText7); + } + + /* + * Execute multiple-part encryption/decryption combination #8: + * updateAAD(byte[] src, 0, 0) + * updateAAD(byte[] src, 0, src.length) + * update(byte[], int, int, byte[], int) + * doFinal(byte[], int, int, byte[], int) + */ + private void combination_8(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher ci = createCipher(mode, params); + ci.updateAAD(AAD, 0, 0); + ci.updateAAD(AAD, 0, AAD.length); + byte[] part81 = new byte[ci.getOutputSize(plainText.length)]; + int offset = plainText.length > ARRAY_OFFSET ? ARRAY_OFFSET : 0; + int len = ci.update(plainText, 0, plainText.length - offset, part81, 0); + int rest = ci.doFinal(plainText, plainText.length - offset, offset, + part81, len); + byte[] outputText8 = new byte[len + rest]; + System.arraycopy(part81, 0, outputText8, 0, outputText8.length); + results.add(outputText8); + } + + /* + * Execute multiple-part encryption/decryption combination #9: + * updateAAD(ByteBuffer src) + * update(byte[], int, int) doFinal(byte[], int, int) + */ + private void combination_9(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + + // prepare ByteBuffer to test + ByteBuffer buf = ByteBuffer.allocate(AAD.length); + buf.put(AAD); + buf.position(0); + buf.limit(AAD.length); + + // Get Cipher object and do the combination + Cipher c = createCipher(mode, params); + c.updateAAD(buf); + byte[] part91 = c.update(plainText, 0, plainText.length); + int part91_length = part91 == null ? 0 : part91.length; + byte[] part92 = c.doFinal(); + byte[] outputText9 = new byte[part91_length + part92.length]; + + // form result of the combination + if (part91 != null) { + System.arraycopy(part91, 0, outputText9, 0, part91_length); + } + System.arraycopy(part92, 0, outputText9, part91_length, part92.length); + results.add(outputText9); + } + + /* + * Execute multiple-part encryption/decryption combination #10: + * updateAAD(ByteBuffer src) + * updateAAD(ByteBuffer src) update(byte[], int, int) + * doFinal(byte[], int, int, byte[], int) + */ + private void combination_10(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + + // prepare ByteBuffer to test + ByteBuffer buf = ByteBuffer.allocate(AAD.length); + buf.put(AAD); + buf.position(0); + buf.limit(AAD.length / 2); + + // get a Cipher object and do the combination + Cipher c = createCipher(mode, params); + + // process the first half of AAD data + c.updateAAD(buf); + + // process the rest of AAD data + buf.limit(AAD.length); + c.updateAAD(buf); + + // prapare variables for the combination + int t = 0; + int offset = 0; + if (plainText.length > ARRAY_OFFSET) { + t = plainText.length - ARRAY_OFFSET; + offset = ARRAY_OFFSET; + } + + // encrypt the text + byte[] part10_1 = c.update(plainText, 0, t); + int part10_1_Length = part10_1 != null ? part10_1.length : 0; + byte[] part10_2 = new byte[c.getOutputSize(plainText.length)]; + int len2 = c.doFinal(plainText, t, offset, part10_2, 0); + + // form the combination's result + byte[] outputText10 = new byte[part10_1_Length + len2]; + if (part10_1 != null) { + System.arraycopy(part10_1, 0, outputText10, 0, part10_1_Length); + } + System.arraycopy(part10_2, 0, outputText10, part10_1_Length, len2); + results.add(outputText10); + } + + /* + * Execute multiple-part encryption/decryption combination #11 + * updateAAD(ByteBuffer src1) + * updateAAD(ByteBuffer src2) + * update(byte[],int, int, byte[], int) + * doFinal(byte[], int, int) + */ + private void combination_11(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + + // prepare ByteBuffer1 to test + ByteBuffer buf1 = ByteBuffer.allocate(AAD.length / 2); + buf1.put(AAD, 0, AAD.length / 2); + buf1.position(0); + buf1.limit(AAD.length / 2); + + // get a Cipher object and do combination + Cipher ci = createCipher(mode, params); + + // process the first half of AAD data + ci.updateAAD(buf1); + + // prepare ByteBuffer2 to test + ByteBuffer buf2 = ByteBuffer.allocate(AAD.length - AAD.length / 2); + buf2.put(AAD, AAD.length / 2, AAD.length - AAD.length / 2); + buf2.position(0); + buf2.limit(AAD.length - AAD.length / 2); + + // process the rest of AAD data + ci.updateAAD(buf2); + + // encrypt plain text + byte[] part11_1 = new byte[ci.getOutputSize(plainText.length)]; + int offset = plainText.length > ARRAY_OFFSET ? ARRAY_OFFSET : 0; + int len_11 = ci.update(plainText, 0, plainText.length - offset, + part11_1, 0); + byte[] part11_2 = ci.doFinal(plainText, plainText.length - offset, + offset); + byte[] outputText11 = new byte[len_11 + part11_2.length]; + System.arraycopy(part11_1, 0, outputText11, 0, len_11); + System.arraycopy(part11_2, 0, outputText11, len_11, part11_2.length); + results.add(outputText11); + } + + /* + * Execute multiple-part encryption/decryption combination #12: + * updateAAD(ByteBuffer src) + * updateAAD(ByteBuffer emptyByteBuffer) + * update(byte[], int, int, byte[], int) + * doFinal(byte[], int, int, byte[], int) + */ + private void combination_12(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + + // prepare ByteBuffer to test + ByteBuffer buf = ByteBuffer.allocate(AAD.length); + buf.put(AAD); + buf.position(0); + buf.limit(AAD.length); + Cipher ci = createCipher(mode, params); + ci.updateAAD(buf); + + // prepare an empty ByteBuffer + ByteBuffer emptyBuf = ByteBuffer.allocate(0); + emptyBuf.put(new byte[0]); + ci.updateAAD(emptyBuf); + byte[] part12_1 = new byte[ci.getOutputSize(plainText.length)]; + int offset = plainText.length > ARRAY_OFFSET ? ARRAY_OFFSET : 0; + int len12 = ci.update(plainText, 0, plainText.length - offset, + part12_1, 0); + int rest12 = ci.doFinal(plainText, plainText.length - offset, offset, + part12_1, len12); + byte[] outputText12 = new byte[len12 + rest12]; + System.arraycopy(part12_1, 0, outputText12, 0, outputText12.length); + results.add(outputText12); + } + + /* + * Execute multiple-part encryption/decryption combination #13: + * updateAAD(ByteBuffer src), where src is directly allocated + * update(ByteBuffer input, ByteBuffer out) + * doFinal(ByteBuffer input, ByteBuffer out) + */ + private void combination_13(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + + // prepare ByteBuffer to test + ByteBuffer buf = ByteBuffer.allocateDirect(AAD.length); + buf.put(AAD); + buf.position(0); + buf.limit(AAD.length); + c.updateAAD(buf); + + // prepare buffers to encrypt/decrypt + ByteBuffer in = ByteBuffer.allocateDirect(plainText.length); + in.put(plainText); + in.position(0); + in.limit(plainText.length); + ByteBuffer output = ByteBuffer.allocateDirect( + c.getOutputSize(in.limit())); + output.position(0); + output.limit(c.getOutputSize(in.limit())); + + // process input text + c.update(in, output); + c.doFinal(in, output); + int resultSize = output.position(); + byte[] result13 = new byte[resultSize]; + output.position(0); + output.limit(resultSize); + output.get(result13, 0, resultSize); + results.add(result13); + } + + /* + * Execute multiple-part encryption/decryption combination #14: + * updateAAD(ByteBuffer src) updateAAD(ByteBuffer src), + * where src is directly allocated + * update(ByteBuffer input, ByteBuffer out) + * doFinal(ByteBuffer input, ByteBuffer out) + */ + private void combination_14(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + // prepare ByteBuffer to test + ByteBuffer buf = ByteBuffer.allocateDirect(AAD.length); + buf.put(AAD); + + // process the first half of AAD data + buf.position(0); + buf.limit(AAD.length / 2); + c.updateAAD(buf); + + // process the rest of AAD data + buf.limit(AAD.length); + c.updateAAD(buf); + + // prepare buffers to encrypt/decrypt + ByteBuffer in = ByteBuffer.allocate(plainText.length); + in.put(plainText); + in.position(0); + in.limit(plainText.length); + ByteBuffer out = ByteBuffer.allocate(c.getOutputSize(in.limit())); + out.position(0); + out.limit(c.getOutputSize(in.limit())); + + // process input text + c.update(in, out); + c.doFinal(in, out); + int resultSize = out.position(); + byte[] result14 = new byte[resultSize]; + out.position(0); + out.limit(resultSize); + out.get(result14, 0, resultSize); + results.add(result14); + } + + /* + * Execute multiple-part encryption/decryption combination #15 + * updateAAD(ByteBuffer src1), where src1 is directly allocated + * updateAAD(ByteBuffer src2), where src2 is directly allocated + * doFinal(ByteBuffer input, ByteBuffer out) + */ + private void combination_15(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + + // prepare ByteBuffer1 to test + ByteBuffer buf1 = ByteBuffer.allocateDirect(AAD.length / 2); + buf1.put(AAD, 0, AAD.length / 2); + buf1.position(0); + buf1.limit(AAD.length / 2); + + // process the first half of AAD data + c.updateAAD(buf1); + + // prepare ByteBuffer2 to test + ByteBuffer buf2 = ByteBuffer.allocateDirect( + AAD.length - AAD.length / 2); + buf2.put(AAD, AAD.length / 2, AAD.length - AAD.length / 2); + buf2.position(0); + buf2.limit(AAD.length - AAD.length / 2); + + // process the rest of AAD data + c.updateAAD(buf2); + + // prepare buffers to encrypt/decrypt + ByteBuffer in = ByteBuffer.allocateDirect(plainText.length); + in.put(plainText); + in.position(0); + in.limit(plainText.length); + ByteBuffer output = ByteBuffer.allocateDirect( + c.getOutputSize(in.limit())); + output.position(0); + output.limit(c.getOutputSize(in.limit())); + + // process input text + c.doFinal(in, output); + int resultSize = output.position(); + byte[] result15 = new byte[resultSize]; + output.position(0); + output.limit(resultSize); + output.get(result15, 0, resultSize); + results.add(result15); + } + + /* + * Execute multiple-part encryption/decryption combination #16: + * updateAAD(ByteBuffer src) + * updateAAD(ByteBuffer emptyByteBuffer) + * update(ByteBuffer input, ByteBuffer out) + * doFinal(EmptyByteBuffer, ByteBuffer out) + */ + private void combination_16(List results, int mode, byte[] AAD, + byte[] plainText, AlgorithmParameters params) throws Exception { + Cipher c = createCipher(mode, params); + + // prepare ByteBuffer to test + ByteBuffer buf = ByteBuffer.allocateDirect(AAD.length); + buf.put(AAD); + buf.position(0); + buf.limit(AAD.length); + c.updateAAD(buf); + + // prepare empty ByteBuffer + ByteBuffer emptyBuf = ByteBuffer.allocateDirect(0); + emptyBuf.put(new byte[0]); + c.updateAAD(emptyBuf); + + // prepare buffers to encrypt/decrypt + ByteBuffer in = ByteBuffer.allocateDirect(plainText.length); + in.put(plainText); + in.position(0); + in.limit(plainText.length); + ByteBuffer output = ByteBuffer.allocateDirect( + c.getOutputSize(in.limit())); + output.position(0); + output.limit(c.getOutputSize(in.limit())); + + // process input text with an empty buffer + c.update(in, output); + ByteBuffer emptyBuf2 = ByteBuffer.allocate(0); + emptyBuf2.put(new byte[0]); + c.doFinal(emptyBuf2, output); + int resultSize = output.position(); + byte[] result16 = new byte[resultSize]; + output.position(0); + output.limit(resultSize); + output.get(result16, 0, resultSize); + results.add(result16); + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java new file mode 100644 index 00000000000..7250c4d7f0f --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/GCMParameterSpecTest.java @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.util.Arrays; +import javax.crypto.SecretKey; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.spec.GCMParameterSpec; + +/* + * @test + * @bug 8048596 + * @summary Check if GCMParameterSpec works as expected + */ +public class GCMParameterSpecTest { + + private static final int[] IV_LENGTHS = { 96, 8, 1024 }; + private static final int[] KEY_LENGTHS = { 128, 192, 256 }; + private static final int[] DATA_LENGTHS = { 0, 128, 1024 }; + private static final int[] AAD_LENGTHS = { 0, 128, 1024 }; + private static final int[] TAG_LENGTHS = { 128, 120, 112, 104, 96 }; + private static final int[] OFFSETS = { 0, 2, 5, 99 }; + private static final String TRANSFORMATION = "AES/GCM/NoPadding"; + private static final String TEMPLATE = "Test:\n tag = %d\n" + + " IV length = %d\n data length = %d\n" + + " AAD length = %d\n offset = %d\n keylength = %d\n"; + + private final byte[] IV; + private final byte[] IVO; + private final byte[] data; + private final byte[] AAD; + private final SecretKey key; + private final int tagLength; + private final int IVlength; + private final int offset; + + /** + * Initialize IV, IV with offset, plain text, AAD and SecretKey + * + * @param keyLength length of a secret key + * @param tagLength tag length + * @param IVlength IV length + * @param offset offset in a buffer for IV + * @param textLength plain text length + * @param AADLength AAD length + */ + public GCMParameterSpecTest(int keyLength, int tagLength, int IVlength, + int offset, int textLength, int AADLength) + throws NoSuchAlgorithmException, NoSuchProviderException { + this.tagLength = tagLength; // save tag length + this.IVlength = IVlength; // save IV length + this.offset = offset; // save IV offset + + // prepare IV + IV = Helper.generateBytes(IVlength); + + // prepare IV with offset + IVO = new byte[this.IVlength + this.offset]; + System.arraycopy(IV, 0, IVO, offset, this.IVlength); + + // prepare data + data = Helper.generateBytes(textLength); + + // prepare AAD + AAD = Helper.generateBytes(AADLength); + + // init a secret key + KeyGenerator kg = KeyGenerator.getInstance("AES", "SunJCE"); + kg.init(keyLength); + key = kg.generateKey(); + } + + /* + * Run the test for each key length, tag length, IV length, plain text + * length, AAD length and offset. + */ + public static void main(String[] args) throws Exception { + boolean success = true; + for (int k : KEY_LENGTHS) { + if (k > Cipher.getMaxAllowedKeyLength(TRANSFORMATION)) { + // skip this if this key length is larger than what's + // allowed in the jce jurisdiction policy files + continue; + } + for (int t : TAG_LENGTHS) { + for (int n : IV_LENGTHS) { + for (int p : DATA_LENGTHS) { + for (int a : AAD_LENGTHS) { + for (int o : OFFSETS) { + System.out.printf(TEMPLATE, t, n, p, a, o, k); + success &= new GCMParameterSpecTest( + k, t, n, o, p, a).doTest(); + } + } + } + } + } + } + + if (!success) { + throw new RuntimeException("At least one test case failed"); + } + } + + /* + * Run the test: + * - check if result of encryption of plain text is the same + * when parameters constructed with different GCMParameterSpec + * constructors are used + * - check if GCMParameterSpec.getTLen() is equal to actual tag length + * - check if ciphertext has the same length as plaintext + */ + private boolean doTest() throws Exception { + GCMParameterSpec spec1 = new GCMParameterSpec(tagLength, IV); + GCMParameterSpec spec2 = new GCMParameterSpec(tagLength, IVO, offset, + IVlength); + byte[] cipherText1 = getCipherTextBySpec(spec1); + if (cipherText1 == null) { + return false; + } + byte[] cipherText2 = getCipherTextBySpec(spec2); + if (cipherText2 == null) { + return false; + } + if (!Arrays.equals(cipherText1, cipherText2)) { + System.out.println("Cipher texts are different"); + return false; + } + if (spec1.getTLen() != spec2.getTLen()) { + System.out.println("Tag lengths are not equal"); + return false; + } + byte[] recoveredText1 = recoverCipherText(cipherText1, spec2); + if (recoveredText1 == null) { + return false; + } + byte[] recoveredText2 = recoverCipherText(cipherText2, spec1); + if (recoveredText2 == null) { + return false; + } + if (!Arrays.equals(recoveredText1, recoveredText2)) { + System.out.println("Recovered texts are different"); + return false; + } + if (!Arrays.equals(recoveredText1, data)) { + System.out.println("Recovered and original texts are not equal"); + return false; + } + + return true; + } + + /* + * Encrypt a plain text, and check if GCMParameterSpec.getIV() + * is equal to Cipher.getIV() + */ + private byte[] getCipherTextBySpec(GCMParameterSpec spec) throws Exception { + // init a cipher + Cipher cipher = createCipher(Cipher.ENCRYPT_MODE, spec); + cipher.updateAAD(AAD); + byte[] cipherText = cipher.doFinal(data); + + // check IVs + if (!Arrays.equals(cipher.getIV(), spec.getIV())) { + System.out.println("IV in parameters is incorrect"); + return null; + } + if (spec.getTLen() != (cipherText.length - data.length) * 8) { + System.out.println("Tag length is incorrect"); + return null; + } + return cipherText; + } + + private byte[] recoverCipherText(byte[] cipherText, GCMParameterSpec spec) + throws Exception { + // init a cipher + Cipher cipher = createCipher(Cipher.DECRYPT_MODE, spec); + + // check IVs + if (!Arrays.equals(cipher.getIV(), spec.getIV())) { + System.out.println("IV in parameters is incorrect"); + return null; + } + + cipher.updateAAD(AAD); + return cipher.doFinal(cipherText); + } + + private Cipher createCipher(int mode, GCMParameterSpec spec) + throws Exception { + Cipher cipher = Cipher.getInstance(TRANSFORMATION, "SunJCE"); + cipher.init(mode, key, spec); + return cipher; + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Helper.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Helper.java new file mode 100644 index 00000000000..dad216b9f7c --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/Helper.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +public class Helper { + + public static byte[] generateBytes(int length) { + byte[] bytes = new byte[length]; + for (int i = 0; i < length; i++) { + bytes[i] = (byte) (i % 256); + } + return bytes; + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java new file mode 100644 index 00000000000..21f1deec45b --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/KeyWrapper.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.AlgorithmParameters; +import java.security.Key; +import java.util.Arrays; +import javax.crypto.SecretKey; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; + +/* + * @test + * @bug 8048596 + * @summary Check if a key wrapper works properly with GCM mode + */ +public class KeyWrapper { + + static final String AES = "AES"; + static final String TRANSFORMATION = "AES/GCM/NoPadding"; + static final String PROVIDER = "SunJCE"; + static final int KEY_LENGTH = 128; + + public static void main(String argv[]) throws Exception { + doTest(PROVIDER, TRANSFORMATION); + } + + private static void doTest(String provider, String algo) throws Exception { + SecretKey key; + SecretKey keyToWrap; + + // init a secret Key + KeyGenerator kg = KeyGenerator.getInstance(AES, PROVIDER); + kg.init(KEY_LENGTH); + key = kg.generateKey(); + keyToWrap = kg.generateKey(); + + // initialization + Cipher cipher = Cipher.getInstance(algo, provider); + cipher.init(Cipher.WRAP_MODE, key); + AlgorithmParameters params = cipher.getParameters(); + + // wrap the key + byte[] keyWrapper = cipher.wrap(keyToWrap); + try { + // check if we can't wrap it again with the same key/IV + keyWrapper = cipher.wrap(keyToWrap); + throw new RuntimeException( + "FAILED: expected IllegalStateException hasn't " + + "been thrown "); + } catch (IllegalStateException ise) { + System.out.println(ise.getMessage()); + System.out.println("Expected exception"); + } + + // unwrap the key + cipher.init(Cipher.UNWRAP_MODE, key, params); + cipher.unwrap(keyWrapper, algo, Cipher.SECRET_KEY); + + // check if we can unwrap second time + Key unwrapKey = cipher.unwrap(keyWrapper, algo, Cipher.SECRET_KEY); + + if (!Arrays.equals(keyToWrap.getEncoded(), unwrapKey.getEncoded())) { + throw new RuntimeException( + "FAILED: original and unwrapped keys are not equal"); + } + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java new file mode 100644 index 00000000000..f6bd3805ae4 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/ReadWriteSkip.java @@ -0,0 +1,317 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; + +/* + * @test + * @bug 8048596 + * @summary Test CICO AEAD read/write/skip operations + */ +public class ReadWriteSkip { + + static enum BufferType { + BYTE_ARRAY_BUFFERING, INT_BYTE_BUFFERING + } + + static final int KEY_LENGTHS[] = {128, 192, 256}; + static final int TXT_LENGTHS[] = {800, 0}; + static final int AAD_LENGTHS[] = {0, 100}; + static final int BLOCK = 50; + static final int SAVE = 45; + static final int DISCARD = BLOCK - SAVE; + static final String PROVIDER = "SunJCE"; + static final String AES = "AES"; + static final String GCM = "GCM"; + static final String PADDING = "NoPadding"; + static final String TRANSFORM = AES + "/" + GCM + "/" + PADDING; + + final SecretKey key; + final byte[] plaintext; + final byte[] AAD; + final int textLength;; + final int keyLength; + Cipher encryptCipher; + Cipher decryptCipher; + CipherInputStream ciInput; + + public static void main(String[] args) throws Exception { + boolean success = true; + for (int keyLength : KEY_LENGTHS) { + if (keyLength > Cipher.getMaxAllowedKeyLength(TRANSFORM)) { + // skip this if this key length is larger than what's + // configured in the jce jurisdiction policy files + continue; + } + for (int textLength : TXT_LENGTHS) { + for (int AADLength : AAD_LENGTHS) { + System.out.println("Key length = " + keyLength + + ", text length = " + textLength + + ", AAD length = " + AADLength); + try { + run(keyLength, textLength, AADLength); + System.out.println("Test case passed"); + } catch (Exception e) { + System.out.println("Test case failed: " + e); + success = false; + } + } + } + } + + if (!success) { + throw new RuntimeException("At least one test case failed"); + } + + System.out.println("Test passed"); + } + + ReadWriteSkip(int keyLength, int textLength, int AADLength) + throws Exception { + this.keyLength = keyLength; + this.textLength = textLength; + + // init AAD + this.AAD = Helper.generateBytes(AADLength); + + // init a secret Key + KeyGenerator kg = KeyGenerator.getInstance(AES, PROVIDER); + kg.init(this.keyLength); + this.key = kg.generateKey(); + + this.plaintext = Helper.generateBytes(textLength); + } + + final void doTest(BufferType type) throws Exception { + // init ciphers + encryptCipher = createCipher(Cipher.ENCRYPT_MODE); + decryptCipher = createCipher(Cipher.DECRYPT_MODE); + + // init cipher input stream + ciInput = new CipherInputStream(new ByteArrayInputStream(plaintext), + encryptCipher); + + runTest(type); + } + + void runTest(BufferType type) throws Exception {} + + private Cipher createCipher(int mode) throws GeneralSecurityException { + Cipher cipher = Cipher.getInstance(TRANSFORM, PROVIDER); + if (mode == Cipher.ENCRYPT_MODE) { + cipher.init(Cipher.ENCRYPT_MODE, key); + } else { + if (encryptCipher != null) { + cipher.init(Cipher.DECRYPT_MODE, key, + encryptCipher.getParameters()); + } else { + throw new RuntimeException("Can't create a cipher"); + } + } + cipher.updateAAD(AAD); + return cipher; + } + + /* + * Run test cases + */ + static void run(int keyLength, int textLength, int AADLength) + throws Exception { + new ReadWriteTest(keyLength, textLength, AADLength) + .doTest(BufferType.BYTE_ARRAY_BUFFERING); + new ReadWriteTest(keyLength, textLength, AADLength) + .doTest(BufferType.INT_BYTE_BUFFERING); + new SkipTest(keyLength, textLength, AADLength) + .doTest(BufferType.BYTE_ARRAY_BUFFERING); + new SkipTest(keyLength, textLength, AADLength) + .doTest(BufferType.INT_BYTE_BUFFERING); + } + + static void check(byte[] first, byte[] second) { + if (!Arrays.equals(first, second)) { + throw new RuntimeException("Arrays are not equal"); + } + } + + /* + * CICO AEAD read/write functional test. + * + * Check if encrypt/decrypt operations work correctly. + * + * Test scenario: + * - initializes plain text + * - for given AEAD algorithm instantiates encrypt and decrypt Ciphers + * - instantiates CipherInputStream with the encrypt Cipher + * - instantiates CipherOutputStream with the decrypt Cipher + * - performs reading from the CipherInputStream (encryption data) + * and writing to the CipherOutputStream (decryption). As a result, + * output of the CipherOutputStream should be equal + * with original plain text + * - check if the original plain text is equal to output + * of the CipherOutputStream + * - if it is equal the test passes, otherwise it fails + */ + static class ReadWriteTest extends ReadWriteSkip { + + public ReadWriteTest(int keyLength, int textLength, int AADLength) + throws Exception { + super(keyLength, textLength, AADLength); + } + + @Override + public void runTest(BufferType bufType) throws IOException, + GeneralSecurityException { + + ByteArrayOutputStream baOutput = new ByteArrayOutputStream(); + try (CipherOutputStream ciOutput = new CipherOutputStream(baOutput, + decryptCipher)) { + if (bufType == BufferType.BYTE_ARRAY_BUFFERING) { + doByteTest(ciOutput); + } else { + doIntTest(ciOutput); + } + } + + check(plaintext, baOutput.toByteArray()); + } + + /* + * Implements byte array buffering type test case + */ + public void doByteTest(CipherOutputStream out) throws IOException { + byte[] buffer = Helper.generateBytes(textLength + 1); + int len = ciInput.read(buffer); + while (len != -1) { + out.write(buffer, 0, len); + len = ciInput.read(buffer); + } + } + + /* + * Implements integer buffering type test case + */ + public void doIntTest(CipherOutputStream out) throws IOException { + int buffer = ciInput.read(); + while (buffer != -1) { + out.write(buffer); + buffer = ciInput.read(); + } + } + } + + /* + * CICO AEAD SKIP functional test. + * + * Checks if the encrypt/decrypt operations work correctly + * when skip() method is used. + * + * Test scenario: + * - initializes a plain text + * - initializes ciphers + * - initializes cipher streams + * - split plain text to TEXT_SIZE/BLOCK blocks + * - read from CipherInputStream2 one block at time + * - the last DISCARD = BLOCK - SAVE bytes are skipping for each block + * - therefore, plain text data go through CipherInputStream1 (encrypting) + * and CipherInputStream2 (decrypting) + * - as a result, output should equal to the original text + * except DISCART byte for each block + * - check result buffers + */ + static class SkipTest extends ReadWriteSkip { + + private final int numberOfBlocks; + private final byte[] outputText; + + public SkipTest(int keyLength, int textLength, int AADLength) + throws Exception { + super(keyLength, textLength, AADLength); + numberOfBlocks = this.textLength / BLOCK; + outputText = new byte[numberOfBlocks * SAVE]; + } + + private void doByteTest(int blockNum, CipherInputStream cis) + throws IOException { + int index = blockNum * SAVE; + int len = cis.read(outputText, index, SAVE); + index += len; + int read = 0; + while (len != SAVE && read != -1) { + read = cis.read(outputText, index, SAVE - len); + len += read; + index += read; + } + } + + private void doIntTest(int blockNum, CipherInputStream cis) + throws IOException { + int i = blockNum * SAVE; + for (int j = 0; j < SAVE && i < outputText.length; j++, i++) { + int b = cis.read(); + if (b != -1) { + outputText[i] = (byte) b; + } + } + } + + @Override + public void runTest(BufferType type) throws IOException, + NoSuchAlgorithmException { + try (CipherInputStream cis = new CipherInputStream(ciInput, + decryptCipher)) { + for (int i = 0; i < numberOfBlocks; i++) { + if (type == BufferType.BYTE_ARRAY_BUFFERING) { + doByteTest(i, cis); + } else { + doIntTest(i, cis); + } + if (cis.available() >= DISCARD) { + cis.skip(DISCARD); + } else { + for (int k = 0; k < DISCARD; k++) { + cis.read(); + } + } + } + } + + byte[] expectedText = new byte[numberOfBlocks * SAVE]; + for (int m = 0; m < numberOfBlocks; m++) { + for (int n = 0; n < SAVE; n++) { + expectedText[m * SAVE + n] = plaintext[m * BLOCK + n]; + } + } + check(expectedText, outputText); + } + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java new file mode 100644 index 00000000000..30afb8ee8ea --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java @@ -0,0 +1,423 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.nio.ByteBuffer; +import java.security.AlgorithmParameters; +import java.security.Provider; +import java.security.Security; +import javax.crypto.SecretKey; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.spec.GCMParameterSpec; + +/* + * @test + * @bug 8048596 + * @summary Check if AEAD operations work correctly when buffers used + * for storing plain text and cipher text are overlapped or the same + */ +public class SameBuffer { + + private static final String PROVIDER = "SunJCE"; + private static final String AES = "AES"; + private static final String GCM = "GCM"; + private static final String PADDING = "NoPadding"; + private static final int OFFSET = 2; + private static final int OFFSETS = 4; + private static final int KEY_LENGTHS[] = { 128, 192, 256 }; + private static final int TEXT_LENGTHS[] = { 0, 1024 }; + private static final int AAD_LENGTHS[] = { 0, 1024 }; + + private final Provider provider; + private final SecretKey key; + private final String transformation; + private final int textLength; + private final int AADLength; + + /** + * Constructor of the test + * + * @param provider security provider + * @param keyStrength key length + * @param textLength length of data + * @param AADLength AAD length + */ + public SameBuffer(Provider provider, String algorithm, String mode, + String padding, int keyStrength, int textLength, int AADLength) + throws Exception { + + // init a secret key + KeyGenerator kg = KeyGenerator.getInstance(algorithm, provider); + kg.init(keyStrength); + key = kg.generateKey(); + + this.transformation = algorithm + "/" + mode + "/" + padding; + this.provider = provider; + this.textLength = textLength; + this.AADLength = AADLength; + } + + public static void main(String[] args) throws Exception { + Provider p = Security.getProvider(PROVIDER); + for (int keyLength : KEY_LENGTHS) { + for (int textLength : TEXT_LENGTHS) { + for (int AADLength : AAD_LENGTHS) { + for (int i = 0; i < OFFSETS; i++) { + // try different offsets + int offset = i * OFFSET; + runTest(p, AES, GCM, PADDING, keyLength, textLength, + AADLength, offset); + } + } + } + } + } + + /* + * Run single test case with given parameters + */ + static void runTest(Provider p, String algo, String mode, + String padding, int keyLength, int textLength, int AADLength, + int offset) throws Exception { + System.out.println("Testing " + keyLength + " key length; " + + textLength + " text lenght; " + AADLength + " AAD length; " + + offset + " offset"); + if (keyLength > Cipher.getMaxAllowedKeyLength(algo)) { + // skip this if this key length is larger than what's + // configured in the jce jurisdiction policy files + return; + } + SameBuffer test = new SameBuffer(p, algo, mode, + padding, keyLength, textLength, AADLength); + + /* + * There are four test cases: + * 1. AAD and text are placed in separated byte arrays + * 2. AAD and text are placed in the same byte array + * 3. AAD and text are placed in separated byte buffers + * 4. AAD and text are placed in the same byte buffer + */ + Cipher ci = test.createCipher(Cipher.ENCRYPT_MODE, null); + AlgorithmParameters params = ci.getParameters(); + test.doTestWithSeparateArrays(offset, params); + test.doTestWithSameArrays(offset, params); + test.doTestWithSeparatedBuffer(offset, params); + test.doTestWithSameBuffer(offset, params); + } + + /* + * Run the test in case when AAD and text are placed in separated byte + * arrays. + */ + private void doTestWithSeparateArrays(int offset, + AlgorithmParameters params) throws Exception { + // prepare buffers to test + Cipher c = createCipher(Cipher.ENCRYPT_MODE, params); + int outputLength = c.getOutputSize(textLength); + int outputBufSize = outputLength + offset * 2; + + byte[] inputText = Helper.generateBytes(outputBufSize); + byte[] AAD = Helper.generateBytes(AADLength); + + // do the test + runGCMWithSeparateArray(Cipher.ENCRYPT_MODE, AAD, inputText, offset * 2, + textLength, offset, params); + int tagLength = c.getParameters() + .getParameterSpec(GCMParameterSpec.class).getTLen() / 8; + runGCMWithSeparateArray(Cipher.DECRYPT_MODE, AAD, inputText, offset, + textLength + tagLength, offset, params); + } + + /** + * Run the test in case when AAD and text are placed in the same byte + * array. + */ + private void doTestWithSameArrays(int offset, AlgorithmParameters params) + throws Exception { + // prepare buffers to test + Cipher c = createCipher(Cipher.ENCRYPT_MODE, params); + int outputLength = c.getOutputSize(textLength); + int outputBufSize = AADLength + outputLength + offset * 2; + + byte[] AAD_and_text = Helper.generateBytes(outputBufSize); + + // do the test + runGCMWithSameArray(Cipher.ENCRYPT_MODE, AAD_and_text, AADLength + offset, + textLength, params); + int tagLength = c.getParameters() + .getParameterSpec(GCMParameterSpec.class).getTLen() / 8; + runGCMWithSameArray(Cipher.DECRYPT_MODE, AAD_and_text, AADLength + offset, + textLength + tagLength, params); + } + + /* + * Run the test in case when AAD and text are placed in separated ByteBuffer + */ + private void doTestWithSeparatedBuffer(int offset, + AlgorithmParameters params) throws Exception { + // prepare AAD byte buffers to test + byte[] AAD = Helper.generateBytes(AADLength); + ByteBuffer AAD_Buf = ByteBuffer.allocate(AADLength); + AAD_Buf.put(AAD, 0, AAD.length); + AAD_Buf.flip(); + + // prepare text byte buffer to encrypt/decrypt + Cipher c = createCipher(Cipher.ENCRYPT_MODE, params); + int outputLength = c.getOutputSize(textLength); + int outputBufSize = outputLength + offset; + byte[] inputText = Helper.generateBytes(outputBufSize); + ByteBuffer plainTextBB = ByteBuffer.allocateDirect(inputText.length); + plainTextBB.put(inputText); + plainTextBB.position(offset); + plainTextBB.limit(offset + textLength); + + // do test + runGCMWithSeparateBuffers(Cipher.ENCRYPT_MODE, AAD_Buf, plainTextBB, offset, + textLength, params); + int tagLength = c.getParameters() + .getParameterSpec(GCMParameterSpec.class).getTLen() / 8; + plainTextBB.position(offset); + plainTextBB.limit(offset + textLength + tagLength); + runGCMWithSeparateBuffers(Cipher.DECRYPT_MODE, AAD_Buf, plainTextBB, offset, + textLength + tagLength, params); + } + + /* + * Run the test in case when AAD and text are placed in the same ByteBuffer + */ + private void doTestWithSameBuffer(int offset, AlgorithmParameters params) + throws Exception { + // calculate output length + Cipher c = createCipher(Cipher.ENCRYPT_MODE, params); + int outputLength = c.getOutputSize(textLength); + + // prepare byte buffer contained AAD and plain text + int bufSize = AADLength + offset + outputLength; + byte[] AAD_and_Text = Helper.generateBytes(bufSize); + ByteBuffer AAD_and_Text_Buf = ByteBuffer.allocate(bufSize); + AAD_and_Text_Buf.put(AAD_and_Text, 0, AAD_and_Text.length); + + // do test + runGCMWithSameBuffer(Cipher.ENCRYPT_MODE, AAD_and_Text_Buf, offset, + textLength, params); + int tagLength = c.getParameters() + .getParameterSpec(GCMParameterSpec.class).getTLen() / 8; + AAD_and_Text_Buf.limit(AADLength + offset + textLength + tagLength); + runGCMWithSameBuffer(Cipher.DECRYPT_MODE, AAD_and_Text_Buf, offset, + textLength + tagLength, params); + + } + + /* + * Execute GCM encryption/decryption of a text placed in a byte array. + * AAD is placed in the separated byte array. + * Data are processed twice: + * - in a separately allocated buffer + * - in the text buffer + * Check if two results are equal + */ + private void runGCMWithSeparateArray(int mode, byte[] AAD, byte[] text, + int txtOffset, int lenght, int offset, AlgorithmParameters params) + throws Exception { + // first, generate the cipher text at an allocated buffer + Cipher cipher = createCipher(mode, params); + cipher.updateAAD(AAD); + byte[] outputText = cipher.doFinal(text, txtOffset, lenght); + + // new cipher for encrypt operation + Cipher anotherCipher = createCipher(mode, params); + anotherCipher.updateAAD(AAD); + + // next, generate cipher text again at the same buffer of plain text + int myoff = offset; + int off = anotherCipher.update(text, txtOffset, lenght, text, myoff); + anotherCipher.doFinal(text, myoff + off); + + // check if two resutls are equal + if (!isEqual(text, myoff, outputText, 0, outputText.length)) { + throw new RuntimeException("Two results not equal, mode:" + mode); + } + } + + /* + * Execute GCM encrption/decryption of a text. The AAD and text to process + * are placed in the same byte array. Data are processed twice: + * - in a separetly allocated buffer + * - in a buffer that shares content of the AAD_and_Text_BA + * Check if two results are equal + */ + private void runGCMWithSameArray(int mode, byte[] array, int txtOffset, + int length, AlgorithmParameters params) throws Exception { + // first, generate cipher text at an allocated buffer + Cipher cipher = createCipher(mode, params); + cipher.updateAAD(array, 0, AADLength); + byte[] outputText = cipher.doFinal(array, txtOffset, length); + + // new cipher for encrypt operation + Cipher anotherCipher = createCipher(mode, params); + anotherCipher.updateAAD(array, 0, AADLength); + + // next, generate cipher text again at the same buffer of plain text + int off = anotherCipher.update(array, txtOffset, length, + array, txtOffset); + anotherCipher.doFinal(array, txtOffset + off); + + // check if two results are equal or not + if (!isEqual(array, txtOffset, outputText, 0, + outputText.length)) { + throw new RuntimeException( + "Two results are not equal, mode:" + mode); + } + } + + /* + * Execute GCM encryption/decryption of textBB. AAD and text to process are + * placed in different byte buffers. Data are processed twice: + * - in a separately allocated buffer + * - in a buffer that shares content of the textBB + * Check if results are equal + */ + private void runGCMWithSeparateBuffers(int mode, ByteBuffer buffer, + ByteBuffer textBB, int txtOffset, int dataLength, + AlgorithmParameters params) throws Exception { + // take offset into account + textBB.position(txtOffset); + textBB.mark(); + + // first, generate the cipher text at an allocated buffer + Cipher cipher = createCipher(mode, params); + cipher.updateAAD(buffer); + buffer.flip(); + ByteBuffer outBB = ByteBuffer.allocateDirect( + cipher.getOutputSize(dataLength)); + + cipher.doFinal(textBB, outBB);// get cipher text in outBB + outBB.flip(); + + // restore positions + textBB.reset(); + + // next, generate cipher text again in a buffer that shares content + Cipher anotherCipher = createCipher(mode, params); + anotherCipher.updateAAD(buffer); + buffer.flip(); + ByteBuffer buf2 = textBB.duplicate(); // buf2 shares textBuf context + buf2.limit(txtOffset + anotherCipher.getOutputSize(dataLength)); + int dataProcessed2 = anotherCipher.doFinal(textBB, buf2); + buf2.position(txtOffset); + buf2.limit(txtOffset + dataProcessed2); + + if (!buf2.equals(outBB)) { + throw new RuntimeException( + "Two results are not equal, mode:" + mode); + } + } + + /* + * Execute GCM encryption/decryption of text. AAD and a text to process are + * placed in the same buffer. Data is processed twice: + * - in a separately allocated buffer + * - in a buffer that shares content of the AAD_and_Text_BB + */ + private void runGCMWithSameBuffer(int mode, ByteBuffer buffer, + int txtOffset, int length, AlgorithmParameters params) + throws Exception { + + // allocate a separate buffer + Cipher cipher = createCipher(mode, params); + ByteBuffer outBB = ByteBuffer.allocateDirect( + cipher.getOutputSize(length)); + + // first, generate the cipher text at an allocated buffer + buffer.flip(); + buffer.limit(AADLength); + cipher.updateAAD(buffer); + buffer.limit(AADLength + txtOffset + length); + buffer.position(AADLength + txtOffset); + cipher.doFinal(buffer, outBB); + outBB.flip(); // cipher text in outBB + + // next, generate cipherText again in the same buffer + Cipher anotherCipher = createCipher(mode, params); + buffer.flip(); + buffer.limit(AADLength); + anotherCipher.updateAAD(buffer); + buffer.limit(AADLength + txtOffset + length); + buffer.position(AADLength + txtOffset); + + // share textBuf context + ByteBuffer buf2 = buffer.duplicate(); + buf2.limit(AADLength + txtOffset + anotherCipher.getOutputSize(length)); + int dataProcessed2 = anotherCipher.doFinal(buffer, buf2); + buf2.position(AADLength + txtOffset); + buf2.limit(AADLength + txtOffset + dataProcessed2); + + if (!buf2.equals(outBB)) { + throw new RuntimeException( + "Two results are not equal, mode:" + mode); + } + } + + private boolean isEqual(byte[] A, int offsetA, byte[] B, int offsetB, + int bytesToCompare) { + System.out.println("offsetA: " + offsetA + " offsetB: " + offsetA + + " bytesToCompare: " + bytesToCompare); + for (int i = 0; i < bytesToCompare; i++) { + int setA = i + offsetA; + int setB = i + offsetB; + if (setA > A.length - 1 || setB > B.length - 1 + || A[setA] != B[setB]) { + return false; + } + } + + return true; + } + + /* + * Creates a Cipher object for testing: for encryption it creates new Cipher + * based on previously saved parameters (it is prohibited to use the same + * Cipher twice for encription during GCM mode), or returns initiated + * existing Cipher. + */ + private Cipher createCipher(int mode, AlgorithmParameters params) + throws Exception { + Cipher cipher = Cipher.getInstance(transformation, provider); + if (Cipher.ENCRYPT_MODE == mode) { + // initiate it with the saved parameters + if (params != null) { + cipher.init(Cipher.ENCRYPT_MODE, key, params); + } else { + // intiate the cipher and save parameters + cipher.init(Cipher.ENCRYPT_MODE, key); + } + } else if (cipher != null) { + cipher.init(Cipher.DECRYPT_MODE, key, params); + } else { + throw new RuntimeException("Can't create cipher"); + } + + return cipher; + } + +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java new file mode 100644 index 00000000000..6f5e8200e10 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/SealedObjectTest.java @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.AlgorithmParameters; +import java.util.Arrays; +import javax.crypto.SecretKey; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SealedObject; + +/* + * @test + * @bug 8048596 + * @summary Check if the seal/unseal feature works properly in AEAD/GCM mode. + */ +public class SealedObjectTest { + + private static final String AES = "AES"; + private static final String TRANSFORMATION = "AES/GCM/NoPadding"; + private static final String PROVIDER = "SunJCE"; + private static final int KEY_LENGTH = 128; + + public static void main(String[] args) throws Exception { + doTest(); + } + + /* + * Run the test: + * - init a cipher with AES/GCM/NoPadding transformation + * - seal an object + * - check if we can't seal it again with the same key/IV + * - unseal the object using different methods of SealedObject class + * - check if the original and sealed objects are equal + */ + static void doTest() throws Exception { + // init a secret Key + KeyGenerator kg = KeyGenerator.getInstance(AES, PROVIDER); + kg.init(KEY_LENGTH); + SecretKey key = kg.generateKey(); + + // initialization + Cipher cipher = Cipher.getInstance(TRANSFORMATION, PROVIDER); + cipher.init(Cipher.ENCRYPT_MODE, key); + AlgorithmParameters params = cipher.getParameters(); + + // seal an object + SealedObject so = new SealedObject(key, cipher); + try { + // check if we can't seal it again with the same key/IV + so = new SealedObject(key, cipher); + throw new RuntimeException( + "FAILED: expected IllegalStateException hasn't " + + "been thrown"); + } catch (IllegalStateException ise) { + System.out.println("Expected exception when seal it again with" + + " the same key/IV: " + ise); + } + + // unseal the object using getObject(Cipher) and compare + cipher.init(Cipher.DECRYPT_MODE, key, params); + SecretKey unsealedKey = (SecretKey) so.getObject(cipher); + assertKeysSame(unsealedKey, key, "SealedObject.getObject(Cipher)"); + + // unseal the object using getObject(Key) and compare + unsealedKey = (SecretKey) so.getObject(key); + assertKeysSame(unsealedKey, key, "SealedObject.getObject(Key)"); + + // unseal the object using getObject(Key, String) and compare + unsealedKey = (SecretKey) so.getObject(key, PROVIDER); + + assertKeysSame(unsealedKey, key, + "SealedObject.getObject(Key, String)"); + } + + /** + * Compare two SecretKey objects. + * + * @param key1 first key + * @param key2 second key + * @param meth method that was used for unsealing the SecretKey object + * @return true if key1 and key2 are the same, false otherwise. + */ + static void assertKeysSame(SecretKey key1, SecretKey key2, String meth) { + if (!Arrays.equals(key1.getEncoded(), key2.getEncoded())) { + throw new RuntimeException( + "FAILED: original and unsealed objects aren't the same for " + + meth); + } + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java new file mode 100644 index 00000000000..157a8bb329d --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AEAD/WrongAAD.java @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.AlgorithmParameters; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.util.Arrays; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; + +/* + * @test + * @bug 8048596 + * @summary Check if wrong or empty AAD is rejected + */ +public class WrongAAD { + + private static final String PROVIDER = "SunJCE"; + private static final String TRANSFORMATION = "AES/GCM/NoPadding"; + private static final int TEXT_SIZE = 800; + private static final int KEY_SIZE = 128; + private static final int AAD_SIZE = 128; + + private final SecretKey key; + private final byte[] plainText; + private final Cipher encryptCipher; + + public WrongAAD() throws Exception { + // init a secret key + KeyGenerator kg = KeyGenerator.getInstance("AES", PROVIDER); + kg.init(KEY_SIZE); + key = kg.generateKey(); + + // generate a plain text + plainText = Helper.generateBytes(TEXT_SIZE); + + // init AADs + byte[] AAD = Helper.generateBytes(AAD_SIZE); + + // init a cipher + encryptCipher = createCipher(Cipher.ENCRYPT_MODE, null); + encryptCipher.updateAAD(AAD); + } + + public static void main(String[] args) throws Exception { + WrongAAD test = new WrongAAD(); + test.decryptWithEmptyAAD(); + test.decryptWithWrongAAD(); + } + + /* + * Attempt to decrypt a cipher text using Cipher object + * initialized without AAD used for encryption. + */ + private void decryptWithEmptyAAD() throws Exception { + System.out.println("decryptWithEmptyAAD() started"); + // initialize it with empty AAD to get exception during decryption + Cipher decryptCipher = createCipher(Cipher.DECRYPT_MODE, + encryptCipher.getParameters()); + try (ByteArrayOutputStream baOutput = new ByteArrayOutputStream(); + CipherOutputStream ciOutput = new CipherOutputStream(baOutput, + decryptCipher)) { + if (decrypt(ciOutput, baOutput)) { + throw new RuntimeException( + "Decryption has been perfomed successfully in" + + " spite of the decrypt Cipher has NOT been" + + " initialized with AAD"); + } + } + System.out.println("decryptWithEmptyAAD() passed"); + } + + /* + * Attempt to decrypt the cipher text using Cipher object + * initialized with some fake AAD. + */ + private void decryptWithWrongAAD() throws Exception { + System.out.println("decrypt with wrong AAD"); + + // initialize it with wrong AAD to get an exception during decryption + Cipher decryptCipher = createCipher(Cipher.DECRYPT_MODE, + encryptCipher.getParameters()); + byte[] someAAD = Helper.generateBytes(AAD_SIZE + 1); + decryptCipher.updateAAD(someAAD); + + // init output stream + try (ByteArrayOutputStream baOutput = new ByteArrayOutputStream(); + CipherOutputStream ciOutput = new CipherOutputStream(baOutput, + decryptCipher);) { + if (decrypt(ciOutput, baOutput)) { + throw new RuntimeException( + "A decryption has been perfomed successfully in" + + " spite of the decrypt Cipher has been" + + " initialized with fake AAD"); + } + } + + System.out.println("Passed"); + } + + private boolean decrypt(CipherOutputStream ciOutput, + ByteArrayOutputStream baOutput) throws IOException { + try (ByteArrayInputStream baInput = new ByteArrayInputStream(plainText); + CipherInputStream ciInput = new CipherInputStream(baInput, + encryptCipher)) { + byte[] buffer = new byte[TEXT_SIZE]; + int len = ciInput.read(buffer); + + while (len != -1) { + ciOutput.write(buffer, 0, len); + len = ciInput.read(buffer); + } + ciOutput.flush(); + byte[] recoveredText = baOutput.toByteArray(); + System.out.println("recoveredText: " + new String(recoveredText)); + + /* + * See bug 8012900, AEADBadTagException is swalloed by CI/CO streams + * If recovered text is empty, than decryption failed + */ + if (recoveredText.length == 0) { + return false; + } + return Arrays.equals(plainText, recoveredText); + } catch (IllegalStateException e) { + System.out.println("Expected IllegalStateException: " + + e.getMessage()); + e.printStackTrace(System.out); + return false; + } + } + + private Cipher createCipher(int mode, AlgorithmParameters params) + throws NoSuchAlgorithmException, NoSuchProviderException, + NoSuchPaddingException, InvalidKeyException, + InvalidAlgorithmParameterException { + Cipher cipher = Cipher.getInstance(TRANSFORMATION, PROVIDER); + if (params != null) { + cipher.init(mode, key, params); + } else { + cipher.init(mode, key); + } + return cipher; + } +} From 29a79fc1a358eaaa6407a6a56d421a692ca4f4bb Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Mon, 27 Jul 2015 19:50:14 +0200 Subject: [PATCH 53/56] 8132374: AIX: fix value of os.version property Reviewed-by: alanb, rriggs --- .../unix/native/libjava/java_props_md.c | 15 +++- jdk/test/java/lang/System/OsVersionTest.java | 75 +++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 jdk/test/java/lang/System/OsVersionTest.java diff --git a/jdk/src/java.base/unix/native/libjava/java_props_md.c b/jdk/src/java.base/unix/native/libjava/java_props_md.c index df55fd32b5b..1d0ce61c823 100644 --- a/jdk/src/java.base/unix/native/libjava/java_props_md.c +++ b/jdk/src/java.base/unix/native/libjava/java_props_md.c @@ -503,8 +503,21 @@ GetJavaProperties(JNIEnv *env) struct utsname name; uname(&name); sprops.os_name = strdup(name.sysname); +#ifdef _AIX + { + char *os_version = malloc(strlen(name.version) + + strlen(name.release) + 2); + if (os_version != NULL) { + strcpy(os_version, name.version); + strcat(os_version, "."); + strcat(os_version, name.release); + } + sprops.os_version = os_version; + } +#else sprops.os_version = strdup(name.release); -#endif +#endif /* _AIX */ +#endif /* MACOSX */ sprops.os_arch = ARCHPROPNAME; diff --git a/jdk/test/java/lang/System/OsVersionTest.java b/jdk/test/java/lang/System/OsVersionTest.java new file mode 100644 index 00000000000..f5397cf533d --- /dev/null +++ b/jdk/test/java/lang/System/OsVersionTest.java @@ -0,0 +1,75 @@ +/* + * Copyright 2015 SAP SE. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import jdk.testlibrary.OutputAnalyzer; +import jdk.testlibrary.Platform; +import jdk.testlibrary.ProcessTools; + +/* + * @test + * @bug 8132374 + * @summary Check that the value of the os.version property is equal + * to the value of the corresponding OS provided tools. + * @library /lib/testlibrary + * @run main OsVersionTest + * @author Volker Simonis + */ +public class OsVersionTest { + + public static void main(String args[]) throws Throwable { + final String osVersion = System.getProperty("os.version"); + if (osVersion == null) { + throw new Error("Cant query 'os.version' property!"); + } + if (Platform.isLinux() || Platform.isSolaris()) { + OutputAnalyzer output = ProcessTools.executeProcess("uname", "-r"); + if (!osVersion.equals(output.getOutput().trim())) { + throw new Error(osVersion + " != " + output.getOutput().trim()); + } + } + else if (Platform.isOSX()) { + OutputAnalyzer output = ProcessTools.executeProcess("sw_vers", "-productVersion"); + if (!osVersion.equals(output.getOutput().trim())) { + throw new Error(osVersion + " != " + output.getOutput().trim()); + } + } + else if (Platform.isAix()) { + OutputAnalyzer output1 = ProcessTools.executeProcess("uname", "-v"); + OutputAnalyzer output2 = ProcessTools.executeProcess("uname", "-r"); + String version = output1.getOutput().trim() + "." + output2.getOutput().trim(); + if (!osVersion.equals(version)) { + throw new Error(osVersion + " != " + version); + } + } + else if (Platform.isWindows()) { + OutputAnalyzer output = ProcessTools.executeProcess("cmd", "/c", "ver"); + String version = output.firstMatch(".+\\[Version ([0-9.]+)\\]", 1); + if (version == null || !version.startsWith(osVersion)) { + throw new Error(osVersion + " != " + version); + } + } + else { + System.out.println("This test is currently not supported on " + + Platform.getOsName()); + } + } +} From 9a7441f204fa352b039d84cba954456f02d3a355 Mon Sep 17 00:00:00 2001 From: Michael Fang Date: Mon, 27 Jul 2015 16:49:10 -0700 Subject: [PATCH 54/56] 8131105: Header Template for nroff man pages *.1 files contains errors Reviewed-by: katleman --- jdk/src/bsd/doc/man/appletviewer.1 | 89 +- jdk/src/bsd/doc/man/idlj.1 | 89 +- jdk/src/bsd/doc/man/jar.1 | 89 +- jdk/src/bsd/doc/man/jarsigner.1 | 267 +- jdk/src/bsd/doc/man/java.1 | 5614 +++++++++++------ jdk/src/bsd/doc/man/javac.1 | 139 +- jdk/src/bsd/doc/man/javadoc.1 | 311 +- jdk/src/bsd/doc/man/javah.1 | 89 +- jdk/src/bsd/doc/man/javap.1 | 790 ++- jdk/src/bsd/doc/man/jcmd.1 | 288 +- jdk/src/bsd/doc/man/jconsole.1 | 89 +- jdk/src/bsd/doc/man/jdb.1 | 89 +- jdk/src/bsd/doc/man/jdeps.1 | 89 +- jdk/src/bsd/doc/man/jhat.1 | 89 +- jdk/src/bsd/doc/man/jinfo.1 | 89 +- jdk/src/bsd/doc/man/jjs.1 | 553 +- jdk/src/bsd/doc/man/jmap.1 | 89 +- jdk/src/bsd/doc/man/jps.1 | 89 +- jdk/src/bsd/doc/man/jrunscript.1 | 89 +- jdk/src/bsd/doc/man/jsadebugd.1 | 89 +- jdk/src/bsd/doc/man/jstack.1 | 89 +- jdk/src/bsd/doc/man/jstat.1 | 1271 ++-- jdk/src/bsd/doc/man/jstatd.1 | 89 +- jdk/src/bsd/doc/man/keytool.1 | 513 +- jdk/src/bsd/doc/man/orbd.1 | 89 +- jdk/src/bsd/doc/man/pack200.1 | 89 +- jdk/src/bsd/doc/man/policytool.1 | 95 +- jdk/src/bsd/doc/man/rmic.1 | 89 +- jdk/src/bsd/doc/man/rmid.1 | 89 +- jdk/src/bsd/doc/man/rmiregistry.1 | 89 +- jdk/src/bsd/doc/man/schemagen.1 | 89 +- jdk/src/bsd/doc/man/serialver.1 | 89 +- jdk/src/bsd/doc/man/servertool.1 | 89 +- jdk/src/bsd/doc/man/tnameserv.1 | 89 +- jdk/src/bsd/doc/man/unpack200.1 | 89 +- jdk/src/bsd/doc/man/wsgen.1 | 89 +- jdk/src/bsd/doc/man/wsimport.1 | 89 +- jdk/src/bsd/doc/man/xjc.1 | 89 +- jdk/src/linux/doc/man/appletviewer.1 | 89 +- jdk/src/linux/doc/man/idlj.1 | 89 +- jdk/src/linux/doc/man/ja/appletviewer.1 | 58 +- jdk/src/linux/doc/man/ja/idlj.1 | 572 +- jdk/src/linux/doc/man/ja/jar.1 | 401 +- jdk/src/linux/doc/man/ja/jarsigner.1 | 602 +- jdk/src/linux/doc/man/ja/java.1 | 1722 +++-- jdk/src/linux/doc/man/ja/javac.1 | 1267 ++-- jdk/src/linux/doc/man/ja/javadoc.1 | 3169 ++++++---- jdk/src/linux/doc/man/ja/javah.1 | 90 +- jdk/src/linux/doc/man/ja/javap.1 | 311 +- jdk/src/linux/doc/man/ja/javaws.1 | 120 +- jdk/src/linux/doc/man/ja/jcmd.1 | 76 +- jdk/src/linux/doc/man/ja/jconsole.1 | 72 +- jdk/src/linux/doc/man/ja/jdb.1 | 185 +- jdk/src/linux/doc/man/ja/jdeps.1 | 445 +- jdk/src/linux/doc/man/ja/jhat.1 | 82 +- jdk/src/linux/doc/man/ja/jinfo.1 | 82 +- jdk/src/linux/doc/man/ja/jjs.1 | 246 +- jdk/src/linux/doc/man/ja/jmap.1 | 90 +- jdk/src/linux/doc/man/ja/jps.1 | 131 +- jdk/src/linux/doc/man/ja/jrunscript.1 | 161 +- jdk/src/linux/doc/man/ja/jsadebugd.1 | 63 +- jdk/src/linux/doc/man/ja/jstack.1 | 89 +- jdk/src/linux/doc/man/ja/jstat.1 | 471 +- jdk/src/linux/doc/man/ja/jstatd.1 | 140 +- jdk/src/linux/doc/man/ja/jvisualvm.1 | 57 +- jdk/src/linux/doc/man/ja/keytool.1 | 2377 ++++--- jdk/src/linux/doc/man/ja/orbd.1 | 160 +- jdk/src/linux/doc/man/ja/pack200.1 | 256 +- jdk/src/linux/doc/man/ja/policytool.1 | 70 +- jdk/src/linux/doc/man/ja/rmic.1 | 161 +- jdk/src/linux/doc/man/ja/rmid.1 | 200 +- jdk/src/linux/doc/man/ja/rmiregistry.1 | 59 +- jdk/src/linux/doc/man/ja/schemagen.1 | 69 +- jdk/src/linux/doc/man/ja/serialver.1 | 66 +- jdk/src/linux/doc/man/ja/servertool.1 | 92 +- jdk/src/linux/doc/man/ja/tnameserv.1 | 537 +- jdk/src/linux/doc/man/ja/unpack200.1 | 82 +- jdk/src/linux/doc/man/ja/wsgen.1 | 112 +- jdk/src/linux/doc/man/ja/wsimport.1 | 139 +- jdk/src/linux/doc/man/ja/xjc.1 | 144 +- jdk/src/linux/doc/man/jar.1 | 89 +- jdk/src/linux/doc/man/jarsigner.1 | 267 +- jdk/src/linux/doc/man/java.1 | 5614 +++++++++++------ jdk/src/linux/doc/man/javac.1 | 139 +- jdk/src/linux/doc/man/javadoc.1 | 311 +- jdk/src/linux/doc/man/javah.1 | 89 +- jdk/src/linux/doc/man/javap.1 | 790 ++- jdk/src/linux/doc/man/jcmd.1 | 288 +- jdk/src/linux/doc/man/jconsole.1 | 89 +- jdk/src/linux/doc/man/jdb.1 | 89 +- jdk/src/linux/doc/man/jdeps.1 | 89 +- jdk/src/linux/doc/man/jhat.1 | 89 +- jdk/src/linux/doc/man/jinfo.1 | 89 +- jdk/src/linux/doc/man/jjs.1 | 553 +- jdk/src/linux/doc/man/jmap.1 | 89 +- jdk/src/linux/doc/man/jps.1 | 89 +- jdk/src/linux/doc/man/jrunscript.1 | 89 +- jdk/src/linux/doc/man/jsadebugd.1 | 89 +- jdk/src/linux/doc/man/jstack.1 | 89 +- jdk/src/linux/doc/man/jstat.1 | 1271 ++-- jdk/src/linux/doc/man/jstatd.1 | 89 +- jdk/src/linux/doc/man/keytool.1 | 513 +- jdk/src/linux/doc/man/orbd.1 | 89 +- jdk/src/linux/doc/man/pack200.1 | 89 +- jdk/src/linux/doc/man/policytool.1 | 95 +- jdk/src/linux/doc/man/rmic.1 | 89 +- jdk/src/linux/doc/man/rmid.1 | 89 +- jdk/src/linux/doc/man/rmiregistry.1 | 89 +- jdk/src/linux/doc/man/schemagen.1 | 89 +- jdk/src/linux/doc/man/serialver.1 | 89 +- jdk/src/linux/doc/man/servertool.1 | 89 +- jdk/src/linux/doc/man/tnameserv.1 | 89 +- jdk/src/linux/doc/man/unpack200.1 | 89 +- jdk/src/linux/doc/man/wsgen.1 | 89 +- jdk/src/linux/doc/man/wsimport.1 | 89 +- jdk/src/linux/doc/man/xjc.1 | 89 +- .../solaris/doc/sun/man/man1/appletviewer.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/idlj.1 | 89 +- .../doc/sun/man/man1/ja/appletviewer.1 | 58 +- jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 | 572 +- jdk/src/solaris/doc/sun/man/man1/ja/jar.1 | 401 +- .../solaris/doc/sun/man/man1/ja/jarsigner.1 | 602 +- jdk/src/solaris/doc/sun/man/man1/ja/java.1 | 1722 +++-- jdk/src/solaris/doc/sun/man/man1/ja/javac.1 | 1267 ++-- jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 | 3169 ++++++---- jdk/src/solaris/doc/sun/man/man1/ja/javah.1 | 90 +- jdk/src/solaris/doc/sun/man/man1/ja/javap.1 | 311 +- jdk/src/solaris/doc/sun/man/man1/ja/jcmd.1 | 76 +- .../solaris/doc/sun/man/man1/ja/jconsole.1 | 72 +- jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 | 185 +- jdk/src/solaris/doc/sun/man/man1/ja/jdeps.1 | 445 +- jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 | 82 +- jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 | 82 +- jdk/src/solaris/doc/sun/man/man1/ja/jjs.1 | 246 +- jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 | 90 +- jdk/src/solaris/doc/sun/man/man1/ja/jps.1 | 131 +- .../solaris/doc/sun/man/man1/ja/jrunscript.1 | 161 +- .../solaris/doc/sun/man/man1/ja/jsadebugd.1 | 63 +- jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 | 471 +- jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 | 140 +- .../solaris/doc/sun/man/man1/ja/jvisualvm.1 | 57 +- jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 | 2377 ++++--- jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 | 160 +- jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 | 256 +- .../solaris/doc/sun/man/man1/ja/policytool.1 | 70 +- jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 | 161 +- jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 | 200 +- .../solaris/doc/sun/man/man1/ja/rmiregistry.1 | 59 +- .../solaris/doc/sun/man/man1/ja/schemagen.1 | 69 +- .../solaris/doc/sun/man/man1/ja/serialver.1 | 66 +- .../solaris/doc/sun/man/man1/ja/servertool.1 | 92 +- .../solaris/doc/sun/man/man1/ja/tnameserv.1 | 537 +- .../solaris/doc/sun/man/man1/ja/unpack200.1 | 82 +- jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 | 112 +- .../solaris/doc/sun/man/man1/ja/wsimport.1 | 139 +- jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 | 144 +- jdk/src/solaris/doc/sun/man/man1/jar.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jarsigner.1 | 267 +- jdk/src/solaris/doc/sun/man/man1/java.1 | 5614 +++++++++++------ jdk/src/solaris/doc/sun/man/man1/javac.1 | 139 +- jdk/src/solaris/doc/sun/man/man1/javadoc.1 | 311 +- jdk/src/solaris/doc/sun/man/man1/javah.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/javap.1 | 790 ++- jdk/src/solaris/doc/sun/man/man1/jcmd.1 | 288 +- jdk/src/solaris/doc/sun/man/man1/jconsole.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jdb.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jdeps.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jhat.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jinfo.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jjs.1 | 553 +- jdk/src/solaris/doc/sun/man/man1/jmap.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jps.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jrunscript.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jstack.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/jstat.1 | 1271 ++-- jdk/src/solaris/doc/sun/man/man1/jstatd.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/keytool.1 | 513 +- jdk/src/solaris/doc/sun/man/man1/orbd.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/pack200.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/policytool.1 | 95 +- jdk/src/solaris/doc/sun/man/man1/rmic.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/rmid.1 | 89 +- .../solaris/doc/sun/man/man1/rmiregistry.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/schemagen.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/serialver.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/servertool.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/tnameserv.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/unpack200.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/wsgen.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/wsimport.1 | 89 +- jdk/src/solaris/doc/sun/man/man1/xjc.1 | 89 +- 193 files changed, 39089 insertions(+), 28242 deletions(-) diff --git a/jdk/src/bsd/doc/man/appletviewer.1 b/jdk/src/bsd/doc/man/appletviewer.1 index 71ccac3c664..87808bcb8fa 100644 --- a/jdk/src/bsd/doc/man/appletviewer.1 +++ b/jdk/src/bsd/doc/man/appletviewer.1 @@ -1,26 +1,25 @@ '\" t -.\" Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" +.\" Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" .\" Arch: generic .\" Software: JDK 8 .\" Date: 21 November 2013 @@ -29,25 +28,25 @@ .\" .if n .pl 99999 .TH appletviewer 1 "21 November 2013" "JDK 8" "Basic Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH NAME appletviewer \- Runs applets outside of a web browser\&. @@ -84,7 +83,7 @@ Specifies the input HTML file encoding name\&. .br Passes the string \f3javaoption\fR as a single argument to the Java interpreter, which runs the Applet Viewer\&. The argument should not contain spaces\&. Multiple argument words must all begin with the prefix \f3-J\fR\&. This is useful for adjusting the compiler\&'s execution environment or memory usage\&. .PP -.RE -.br -'pl 8.5i -'bp +.RE +.br +'pl 8.5i +'bp diff --git a/jdk/src/bsd/doc/man/idlj.1 b/jdk/src/bsd/doc/man/idlj.1 index 01130581906..936c1c35d85 100644 --- a/jdk/src/bsd/doc/man/idlj.1 +++ b/jdk/src/bsd/doc/man/idlj.1 @@ -1,26 +1,25 @@ '\" t -.\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" +.\" Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" .\" Arch: generic .\" Software: JDK 8 .\" Date: 21 November 2013 @@ -29,25 +28,25 @@ .\" .if n .pl 99999 .TH idlj 1 "21 November 2013" "JDK 8" "Java IDL and RMI-IIOP Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH NAME idlj \- Generates Java bindings for a specified Interface Definition Language (IDL) file\&. @@ -562,7 +561,7 @@ Escaped identifiers in the global scope cannot have the same spelling as IDL pri The \f3fixed\fR IDL type is not supported\&. .SH KNOWN\ PROBLEMS No import is generated for global identifiers\&. If you call an unexported local \f3impl\fR object, then you do get an exception, but it seems to be due to a \f3NullPointerException\fR in the \f3ServerDelegate\fR DSI code\&. -.RE -.br -'pl 8.5i -'bp +.RE +.br +'pl 8.5i +'bp diff --git a/jdk/src/bsd/doc/man/jar.1 b/jdk/src/bsd/doc/man/jar.1 index e559e47a160..c26d6b54e1e 100644 --- a/jdk/src/bsd/doc/man/jar.1 +++ b/jdk/src/bsd/doc/man/jar.1 @@ -1,26 +1,25 @@ '\" t -.\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" +.\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" .\" Arch: generic .\" Software: JDK 8 .\" Date: 21 November 2013 @@ -29,25 +28,25 @@ .\" .if n .pl 99999 .TH jar 1 "21 November 2013" "JDK 8" "Basic Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH NAME jar \- Manipulates Java Archive (JAR) files\&. @@ -479,7 +478,7 @@ pack200(1)\&. .TP 0.2i \(bu The JAR section of The Java Tutorials at http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.html -.RE -.br -'pl 8.5i -'bp +.RE +.br +'pl 8.5i +'bp diff --git a/jdk/src/bsd/doc/man/jarsigner.1 b/jdk/src/bsd/doc/man/jarsigner.1 index 9394a1079a9..803101ed533 100644 --- a/jdk/src/bsd/doc/man/jarsigner.1 +++ b/jdk/src/bsd/doc/man/jarsigner.1 @@ -1,26 +1,25 @@ '\" t -.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" +.\" Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" .\" Arch: generic .\" Software: JDK 8 .\" Date: 21 November 2013 @@ -29,25 +28,25 @@ .\" .if n .pl 99999 .TH jarsigner 1 "21 November 2013" "JDK 8" "Security Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH NAME jarsigner \- Signs and verifies Java Archive (JAR) files\&. @@ -308,11 +307,7 @@ When a JAR file is signed multiple times, there are multiple \f3\&.SF\fR and \f3 .nf \f3KEVIN\&.DSA\fP .fi -.nf -\f3\fR -.fi .sp -\fINote:\fR It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1\&.1 by the \f3javakey\fR command and others by \f3jarsigner\fR\&. The \f3jarsigner\fR command can be used to sign JAR files that are already signed with the \f3javakey\fR command\&. .SH OPTIONS The following sections describe the various \f3jarsigner\fR options\&. Be aware of the following standards: .TP 0.2i @@ -443,7 +438,7 @@ If this option is not specified, then \f3SHA256\fR is used\&. There must either .br If the \f3-certs\fR option appears on the command line with the \f3-verify\fR and \f3-verbose\fR options, then the output includes certificate information for each signer of the JAR file\&. This information includes the name of the type of certificate (stored in the \f3\&.DSA\fR file) that certifies the signer\&'s public key, and if the certificate is an X\&.509 certificate (an instance of the \f3java\&.security\&.cert\&.X509Certificate\fR), then the distinguished name of the signer\&. -The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. If the signer comes from a JDK 1\&.1 identity database instead of from a keystore, then the alias name displays in brackets instead of parentheses\&. +The keystore is also examined\&. If no keystore value is specified on the command line, then the default keystore file (if any) is checked\&. If the public key certificate for a signer matches an entry in the keystore, then the alias name for the keystore entry for that signer is displayed in parentheses\&. .TP -certchain \fIfile\fR .br @@ -797,178 +792,6 @@ If you specify the \f3-certs\fR option with the \f3-verify\fR and \f3-verbose\fR .fi .sp If the certificate for a signer is not an X\&.509 certificate, then there is no distinguished name information\&. In that case, just the certificate type and the alias are shown\&. For example, if the certificate is a PGP certificate, and the alias is \f3bob\fR, then you would get: \f3PGP, (bob)\fR\&. -.SS VERIFICATION\ THAT\ INCLUDES\ IDENTITY\ DATABASE\ SIGNERS -If a JAR file was signed with the JDK 1\&.1 \f3javakey\fR tool, and the signer is an alias in an identity database, then the verification output includes an \f3i\fR\&. If the JAR file was signed by both an alias in an identity database and an alias in a keystore, then both \f3k\fR and \f3i\fR appear\&. -.PP -When the \f3-certs\fR option is used, any identity database aliases are shown in brackets rather than the parentheses used for keystore aliases, for example: -.sp -.nf -\f3 jarsigner \-keystore /working/mystore \-verify \-verbose \-certs writeFile\&.jar\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 198 Fri Sep 26 16:14:06 PDT 1997 META\-INF/MANIFEST\&.MF\fP -.fi -.nf -\f3 199 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 26 16:22:10 PDT 1997 META\-INF/JANE\&.DSA\fP -.fi -.nf -\f3 199 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.SF\fP -.fi -.nf -\f3 1013 Fri Sep 27 12:22:30 PDT 1997 META\-INF/DUKE\&.DSA\fP -.fi -.nf -\f3 smki 2752 Fri Sep 26 16:12:30 PDT 1997 writeFile\&.html\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 X\&.509, CN=Jane Smith, OU=Java Software, O=Oracle, L=cup, S=ca, C=us (jane)\fP -.fi -.nf -\f3 X\&.509, CN=Duke, OU=Java Software, O=Oracle, L=cup, S=ca, C=us [duke]\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 s = signature was verified\fP -.fi -.nf -\f3 m = entry is listed in manifest\fP -.fi -.nf -\f3 k = at least one certificate was found in keystore\fP -.fi -.nf -\f3 i = at least one certificate was found in identity scope\fP -.fi -.nf -\f3\fR -.fi -.nf -\f3 jar verified\&.\fP -.fi -.nf -\f3\fR -.fi -.sp -\fINote:\fR The alias \f3duke\fR is in brackets to denote that it is an identity database alias, and not a keystore alias\&. -.SH JDK\ 1\&.1\ COMPATIBILITY -The \f3keytool\fR and \f3jarsigner\fR tools replace the \f3javakey\fR tool in JDK 1\&.1\&. These new tools provide more features than \f3javakey\fR, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them\&. -.PP -The new keystore architecture replaces the identity database that \f3javakey\fR created and managed\&. There is no backward compatibility between the keystore format and the database format used by \f3javakey\fR in JDK 1\&.1\&. However, be aware of the following: -.TP 0.2i -\(bu -It is possible to import the information from an identity database into a keystore through the \f3keytool -identitydb\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can sign JAR files that were signed with the \f3javakey\fR command\&. -.TP 0.2i -\(bu -The \f3jarsigner\fR command can verify JAR files signed with \f3javakey\fR\&. The \f3jarsigner\fR command recognizes and can work with signer aliases that are from a JDK 1\&.1 identity database rather than a JDK keystore\&. -.SS UNSIGNED\ JARS -Unsigned JARs have the default privileges that are granted to all code\&. -.SS SIGNED\ JARS -Signed JARs have the privilege configurations based on their JDK 1\&.1\&.\fIn\fR identity and policy file status as described\&. Only trusted identities can be imported into the JDK keystore\&. -.PP -Default Privileges Granted to All Code - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 3 in Notes Regarding Privileges of Signed JARs\&. -.PP - -.PP -Identity in 1\&.1 database: Yes/Untrusted -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 and 3 in Notes Regarding Privileges of Signed JARs\&. -.PP -Default Privileges and Policy File Privileges Granted - -Identity in 1\&.1 database: \fINo\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 2 in Notes Regarding Privileges of Signed JARs\&. -.PP -All Privileges Granted - -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.PP - -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fIYes\fR -.br -Policy file grants privileges to identity/alias: \fINo\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Identity in 1\&.1 database: \fIYes/Trusted\fR -.br -Trusted identity imported into Java keystore from 1\&.1\&. database: \fINo\fR -.br -Policy file grants privileges to identity/alias: \fIYes\fR -.br -See 1 in Notes Regarding Privileges of Signed JARs\&. -.PP -Notes Regarding Privileges of Signed JARs -.TP 0.4i -1\&. -If an identity or alias is mentioned in the policy file, then it must be imported into the keystore for the policy file to have any effect on privileges granted\&. -.TP 0.4i -2\&. -The policy file/keystore combination has precedence over a trusted identity in the identity database\&. -.TP 0.4i -3\&. -Untrusted identities are ignored in the Java platform\&. .SH SEE\ ALSO .TP 0.2i \(bu @@ -979,7 +802,7 @@ keytool(1) .TP 0.2i \(bu Trail: Security Features in Java SE at http://docs\&.oracle\&.com/javase/tutorial/security/index\&.html -.RE -.br -'pl 8.5i -'bp +.RE +.br +'pl 8.5i +'bp diff --git a/jdk/src/bsd/doc/man/java.1 b/jdk/src/bsd/doc/man/java.1 index 250396d33c4..4615bad506a 100644 --- a/jdk/src/bsd/doc/man/java.1 +++ b/jdk/src/bsd/doc/man/java.1 @@ -1,1991 +1,3801 @@ '\" t -.\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" -.\" Arch: generic -.\" Software: JDK 8 -.\" Date: 21 November 2013 -.\" SectDesc: Basic Tools -.\" Title: java.1 +.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" +.\" Title: java +.\" Language: English +.\" Date: 03 March 2015 +.\" SectDesc: Basic Tools +.\" Software: JDK 8 +.\" Arch: generic +.\" Part Number: E38207-04 +.\" Doc ID: JSSON .\" .if n .pl 99999 -.TH java 1 "21 November 2013" "JDK 8" "Basic Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- - -.SH NAME +.TH "java" "1" "03 March 2015" "JDK 8" "Basic Tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" java \- Launches a Java application\&. -.SH SYNOPSIS -.sp -.nf - +.SH "SYNOPSIS" +.sp +.if n \{\ +.RS 4 +.\} +.nf \fBjava\fR [\fIoptions\fR] \fIclassname\fR [\fIargs\fR] -.fi -.nf - +.fi +.if n \{\ +.RE +.\} +.sp +.if n \{\ +.RS 4 +.\} +.nf \fBjava\fR [\fIoptions\fR] \fB\-jar\fR \fIfilename\fR [\fIargs\fR] -.fi -.sp -.TP -\fIoptions\fR -Command-line options separated by spaces\&. See Options\&. -.TP -\fIclassname\fR -The name of the class to be launched\&. -.TP -\fIfilename\fR -The name of the Java Archive (JAR) file to be called\&. Used only with the \f3-jar\fR option\&. -.TP -\fIargs\fR -The arguments passed to the \f3main()\fR method separated by spaces\&. -.SH DESCRIPTION -The \f3java\fR command starts a Java application\&. It does this by starting the Java Runtime Environment (JRE), loading the specified class, and calling that class\&'s \f3main()\fR method\&. The method must be declared \fIpublic\fR and \fIstatic\fR, it must not return any value, and it must accept a \f3String\fR array as a parameter\&. The method declaration has the following form: -.sp -.nf -\f3public static void main(String[] args)\fP -.fi -.nf -\f3\fP -.fi -.sp -The \f3java\fR command can be used to launch a JavaFX application by loading a class that either has a \f3main()\fR method or that extends \f3javafx\&.application\&.Application\fR\&. In the latter case, the launcher constructs an instance of the \f3Application\fR class, calls its \f3init()\fR method, and then calls the \f3start(javafx\&.stage\&.Stage)\fR method\&. +.fi +.if n \{\ +.RE +.\} .PP -By default, the first argument that is not an option of the \f3java\fR command is the fully qualified name of the class to be called\&. If the \f3-jar\fR option is specified, its argument is the name of the JAR file containing class and resource files for the application\&. The startup class must be indicated by the \f3Main-Class\fR manifest header in its source code\&. +\fIoptions\fR +.RS 4 +Command\-line options separated by spaces\&. See Options\&. +.RE +.PP +\fIclassname\fR +.RS 4 +The name of the class to be launched\&. +.RE +.PP +\fIfilename\fR +.RS 4 +The name of the Java Archive (JAR) file to be called\&. Used only with the +\fB\-jar\fR +option\&. +.RE +.PP +\fIargs\fR +.RS 4 +The arguments passed to the +\fBmain()\fR +method separated by spaces\&. +.RE +.SH "DESCRIPTION" +.PP +The +\fBjava\fR +command starts a Java application\&. It does this by starting the Java Runtime Environment (JRE), loading the specified class, and calling that class\*(Aqs +\fBmain()\fR +method\&. The method must be declared +\fIpublic\fR +and +\fIstatic\fR, it must not return any value, and it must accept a +\fBString\fR +array as a parameter\&. The method declaration has the following form: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBpublic static void main(String[] args)\fR + +.fi +.if n \{\ +.RE +.\} +.PP +The +\fBjava\fR +command can be used to launch a JavaFX application by loading a class that either has a +\fBmain()\fR +method or that extends +\fBjavafx\&.application\&.Application\fR\&. In the latter case, the launcher constructs an instance of the +\fBApplication\fR +class, calls its +\fBinit()\fR +method, and then calls the +\fBstart(javafx\&.stage\&.Stage)\fR +method\&. +.PP +By default, the first argument that is not an option of the +\fBjava\fR +command is the fully qualified name of the class to be called\&. If the +\fB\-jar\fR +option is specified, its argument is the name of the JAR file containing class and resource files for the application\&. The startup class must be indicated by the +\fBMain\-Class\fR +manifest header in its source code\&. .PP The JRE searches for the startup class (and other classes used by the application) in three sets of locations: the bootstrap class path, the installed extensions, and the user\(cqs class path\&. .PP -Arguments after the class file name or the JAR file name are passed to the \f3main()\fR method\&. -.SH OPTIONS -The \f3java\fR command supports a wide range of options that can be divided into the following categories: -.TP 0.2i -\(bu +Arguments after the class file name or the JAR file name are passed to the +\fBmain()\fR +method\&. +.SH "OPTIONS" +.PP +The +\fBjava\fR +command supports a wide range of options that can be divided into the following categories: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Standard Options -.TP 0.2i -\(bu -Non-Standard Options -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Non\-Standard Options +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Advanced Runtime Options -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Advanced JIT Compiler Options -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Advanced Serviceability Options -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Advanced Garbage Collection Options +.RE .PP Standard options are guaranteed to be supported by all implementations of the Java Virtual Machine (JVM)\&. They are used for common actions, such as checking the version of the JRE, setting the class path, enabling verbose output, and so on\&. .PP -Non-standard options are general purpose options that are specific to the Java HotSpot Virtual Machine, so they are not guaranteed to be supported by all JVM implementations, and are subject to change\&. These options start with \f3-X\fR\&. +Non\-standard options are general purpose options that are specific to the Java HotSpot Virtual Machine, so they are not guaranteed to be supported by all JVM implementations, and are subject to change\&. These options start with +\fB\-X\fR\&. .PP -Advanced options are not recommended for casual use\&. These are developer options used for tuning specific areas of the Java HotSpot Virtual Machine operation that often have specific system requirements and may require privileged access to system configuration parameters\&. They are also not guaranteed to be supported by all JVM implementations, and are subject to change\&. Advanced options start with \f3-XX\fR\&. +Advanced options are not recommended for casual use\&. These are developer options used for tuning specific areas of the Java HotSpot Virtual Machine operation that often have specific system requirements and may require privileged access to system configuration parameters\&. They are also not guaranteed to be supported by all JVM implementations, and are subject to change\&. Advanced options start with +\fB\-XX\fR\&. .PP To keep track of the options that were deprecated or removed in the latest release, there is a section named Deprecated and Removed Options at the end of the document\&. .PP -Boolean options are used to either enable a feature that is disabled by default or disable a feature that is enabled by default\&. Such options do not require a parameter\&. Boolean \f3-XX\fR options are enabled using the plus sign (\f3-XX:+\fR\fIOptionName\fR) and disabled using the minus sign (\f3-XX:-\fR\fIOptionName\fR)\&. +Boolean options are used to either enable a feature that is disabled by default or disable a feature that is enabled by default\&. Such options do not require a parameter\&. Boolean +\fB\-XX\fR +options are enabled using the plus sign (\fB\-XX:+\fR\fIOptionName\fR) and disabled using the minus sign (\fB\-XX:\-\fR\fIOptionName\fR)\&. +.PP +For options that require an argument, the argument may be separated from the option name by a space, a colon (:), or an equal sign (=), or the argument may directly follow the option (the exact syntax differs for each option)\&. If you are expected to specify the size in bytes, you can use no suffix, or use the suffix +\fBk\fR +or +\fBK\fR +for kilobytes (KB), +\fBm\fR +or +\fBM\fR +for megabytes (MB), +\fBg\fR +or +\fBG\fR +for gigabytes (GB)\&. For example, to set the size to 8 GB, you can specify either +\fB8g\fR, +\fB8192m\fR, +\fB8388608k\fR, or +\fB8589934592\fR +as the argument\&. If you are expected to specify the percentage, use a number from 0 to 1 (for example, specify +\fB0\&.25\fR +for 25%)\&. +.SS "Standard Options" .PP -For options that require an argument, the argument may be separated from the option name by a space, a colon (:), or an equal sign (=), or the argument may directly follow the option (the exact syntax differs for each option)\&. If you are expected to specify the size in bytes, you can use no suffix, or use the suffix \f3k\fR or \f3K\fR for kilobytes (KB), \f3m\fR or \f3M\fR for megabytes (MB), \f3g\fR or \f3G\fR for gigabytes (GB)\&. For example, to set the size to 8 GB, you can specify either \f38g\fR, \f38192m\fR, \f38388608k\fR, or \f38589934592\fR as the argument\&. If you are expected to specify the percentage, use a number from 0 to 1 (for example, specify \f30\&.25\fR for 25%)\&. -.SS STANDARD\ OPTIONS These are the most commonly used options that are supported by all implementations of the JVM\&. -.TP --agentlib:\fIlibname\fR[=\fIoptions\fR] -.br -Loads the specified native agent library\&. After the library name, a comma-separated list of options specific to the library can be used\&. - -If the option \f3-agentlib:foo\fR is specified, then the JVM attempts to load the library named \f3libfoo\&.so\fR in the location specified by the \f3LD_LIBRARY_PATH\fR system variable (on OS X this variable is \f3DYLD_LIBRARY_PATH\fR)\&. - +.PP +\-agentlib:\fIlibname\fR[=\fIoptions\fR] +.RS 4 +Loads the specified native agent library\&. After the library name, a comma\-separated list of options specific to the library can be used\&. +.sp +If the option +\fB\-agentlib:foo\fR +is specified, then the JVM attempts to load the library named +\fBlibfoo\&.so\fR +in the location specified by the +\fBLD_LIBRARY_PATH\fR +system variable (on OS X this variable is +\fBDYLD_LIBRARY_PATH\fR)\&. +.sp The following example shows how to load the heap profiling tool (HPROF) library and get sample CPU information every 20 ms, with a stack depth of 3: -.sp -.nf -\f3\-agentlib:hprof=cpu=samples,interval=20,depth=3\fP -.fi -.nf -\f3\fP -.fi -.sp - - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-agentlib:hprof=cpu=samples,interval=20,depth=3\fR + +.fi +.if n \{\ +.RE +.\} The following example shows how to load the Java Debug Wire Protocol (JDWP) library and listen for the socket connection on port 8000, suspending the JVM before the main class loads: -.sp -.nf -\f3\-agentlib:jdwp=transport=dt_socket,server=y,address=8000\fP -.fi -.nf -\f3\fP -.fi -.sp - - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-agentlib:jdwp=transport=dt_socket,server=y,address=8000\fR + +.fi +.if n \{\ +.RE +.\} For more information about the native agent libraries, refer to the following: -.RS -.TP 0.2i -\(bu -The \f3java\&.lang\&.instrument\fR package description at http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package-summary\&.html -.TP 0.2i -\(bu +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The +\fBjava\&.lang\&.instrument\fR +package description at http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.html +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Agent Command Line Options in the JVM Tools Interface guide at http://docs\&.oracle\&.com/javase/8/docs/platform/jvmti/jvmti\&.html#starting -.RE - -.TP --agentpath:\fIpathname\fR[=\fIoptions\fR] +.RE +.RE +.PP +\-agentpath:\fIpathname\fR[=\fIoptions\fR] +.RS 4 +Loads the native agent library specified by the absolute path name\&. This option is equivalent to +\fB\-agentlib\fR +but uses the full path and file name of the library\&. +.RE +.PP +\-client +.RS 4 +Selects the Java HotSpot Client VM\&. The 64\-bit version of the Java SE Development Kit (JDK) currently ignores this option and instead uses the Server JVM\&. +.sp +For default JVM selection, see Server\-Class Machine Detection at +http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.html +.RE +.PP +\-D\fIproperty\fR=\fIvalue\fR +.RS 4 +Sets a system property value\&. The +\fIproperty\fR +variable is a string with no spaces that represents the name of the property\&. The +\fIvalue\fR +variable is a string that represents the value of the property\&. If +\fIvalue\fR +is a string with spaces, then enclose it in quotation marks (for example +\fB\-Dfoo="foo bar"\fR)\&. +.RE +.PP +\-d32 +.RS 4 +Runs the application in a 32\-bit environment\&. If a 32\-bit environment is not installed or is not supported, then an error will be reported\&. By default, the application is run in a 32\-bit environment unless a 64\-bit system is used\&. +.RE +.PP +\-d64 +.RS 4 +Runs the application in a 64\-bit environment\&. If a 64\-bit environment is not installed or is not supported, then an error will be reported\&. By default, the application is run in a 32\-bit environment unless a 64\-bit system is used\&. +.sp +Currently only the Java HotSpot Server VM supports 64\-bit operation, and the +\fB\-server\fR +option is implicit with the use of +\fB\-d64\fR\&. The +\fB\-client\fR +option is ignored with the use of +\fB\-d64\fR\&. This is subject to change in a future release\&. +.RE +.PP +\-disableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR] .br -Loads the native agent library specified by the absolute path name\&. This option is equivalent to \f3-agentlib\fR but uses the full path and file name of the library\&. -.TP --client -.br -Selects the Java HotSpot Client VM\&. The 64-bit version of the Java SE Development Kit (JDK) currently ignores this option and instead uses the Server JVM\&. - -For default JVM selection, see Server-Class Machine Detection at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server-class\&.html -.TP --D\fIproperty\fR=\fIvalue\fR -.br -Sets a system property value\&. The \fIproperty\fR variable is a string with no spaces that represents the name of the property\&. The \fIvalue\fR variable is a string that represents the value of the property\&. If \fIvalue\fR is a string with spaces, then enclose it in quotation marks (for example \f3-Dfoo="foo bar"\fR)\&. -.TP --d32 -.br -Runs the application in a 32-bit environment\&. If a 32-bit environment is not installed or is not supported, then an error will be reported\&. By default, the application is run in a 32-bit environment unless a 64-bit system is used\&. -.TP --d64 -.br -Runs the application in a 64-bit environment\&. If a 64-bit environment is not installed or is not supported, then an error will be reported\&. By default, the application is run in a 32-bit environment unless a 64-bit system is used\&. - -Currently only the Java HotSpot Server VM supports 64-bit operation, and the \f3-server\fR option is implicit with the use of \f3-d64\fR\&. The \f3-client\fR option is ignored with the use of \f3-d64\fR\&. This is subject to change in a future release\&. -.TP -.nf --disableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR], -da[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR] -.br -.fi +\-da[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR] +.RS 4 Disables assertions\&. By default, assertions are disabled in all packages and classes\&. - -With no arguments, \f3-disableassertions\fR (\f3-da\fR) disables assertions in all packages and classes\&. With the \fIpackagename\fR argument ending in \f3\&.\&.\&.\fR, the switch disables assertions in the specified package and any subpackages\&. If the argument is simply \f3\&.\&.\&.\fR, then the switch disables assertions in the unnamed package in the current working directory\&. With the \fIclassname\fR argument\f3\fR, the switch disables assertions in the specified class\&. - -The \f3-disableassertions\fR (\f3-da\fR) option applies to all class loaders and to system classes (which do not have a class loader)\&. There is one exception to this rule: if the option is provided with no arguments, then it does not apply to system classes\&. This makes it easy to disable assertions in all classes except for system classes\&. The \f3-disablesystemassertions\fR option enables you to disable assertions in all system classes\&. - -To explicitly enable assertions in specific packages or classes, use the \f3-enableassertions\fR (\f3-ea\fR) option\&. Both options can be used at the same time\&. For example, to run the \f3MyClass\fR application with assertions enabled in package \f3com\&.wombat\&.fruitbat\fR (and any subpackages) but disabled in class \f3com\&.wombat\&.fruitbat\&.Brickbat\fR, use the following command: -.sp -.nf -\f3java \-ea:com\&.wombat\&.fruitbat\&.\&.\&. \-da:com\&.wombat\&.fruitbat\&.Brickbat MyClass\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --disablesystemassertions, -dsa +.sp +With no arguments, +\fB\-disableassertions\fR +(\fB\-da\fR) disables assertions in all packages and classes\&. With the +\fIpackagename\fR +argument ending in +\fB\&.\&.\&.\fR, the switch disables assertions in the specified package and any subpackages\&. If the argument is simply +\fB\&.\&.\&.\fR, then the switch disables assertions in the unnamed package in the current working directory\&. With the +\fIclassname\fR +argument, the switch disables assertions in the specified class\&. +.sp +The +\fB\-disableassertions\fR +(\fB\-da\fR) option applies to all class loaders and to system classes (which do not have a class loader)\&. There is one exception to this rule: if the option is provided with no arguments, then it does not apply to system classes\&. This makes it easy to disable assertions in all classes except for system classes\&. The +\fB\-disablesystemassertions\fR +option enables you to disable assertions in all system classes\&. +.sp +To explicitly enable assertions in specific packages or classes, use the +\fB\-enableassertions\fR +(\fB\-ea\fR) option\&. Both options can be used at the same time\&. For example, to run the +\fBMyClass\fR +application with assertions enabled in package +\fBcom\&.wombat\&.fruitbat\fR +(and any subpackages) but disabled in class +\fBcom\&.wombat\&.fruitbat\&.Brickbat\fR, use the following command: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBjava \-ea:com\&.wombat\&.fruitbat\&.\&.\&. \-da:com\&.wombat\&.fruitbat\&.Brickbat MyClass\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-disablesystemassertions .br +\-dsa +.RS 4 Disables assertions in all system classes\&. -.TP -.nf --enableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR], -ea[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR] +.RE +.PP +\-enableassertions[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR] .br -.fi +\-ea[:[\fIpackagename\fR]\&.\&.\&.|:\fIclassname\fR] +.RS 4 Enables assertions\&. By default, assertions are disabled in all packages and classes\&. - -With no arguments, \f3-enableassertions\fR (\f3-ea\fR) enables assertions in all packages and classes\&. With the \fIpackagename\fR argument ending in \f3\&.\&.\&.\fR, the switch enables assertions in the specified package and any subpackages\&. If the argument is simply \f3\&.\&.\&.\fR, then the switch enables assertions in the unnamed package in the current working directory\&. With the \fIclassname\fR argument\f3\fR, the switch enables assertions in the specified class\&. - -The \f3-enableassertions\fR (\f3-ea\fR) option applies to all class loaders and to system classes (which do not have a class loader)\&. There is one exception to this rule: if the option is provided with no arguments, then it does not apply to system classes\&. This makes it easy to enable assertions in all classes except for system classes\&. The \f3-enablesystemassertions\fR option provides a separate switch to enable assertions in all system classes\&. - -To explicitly disable assertions in specific packages or classes, use the \f3-disableassertions\fR (\f3-da\fR) option\&. If a single command contains multiple instances of these switches, then they are processed in order before loading any classes\&. For example, to run the \f3MyClass\fR application with assertions enabled only in package \f3com\&.wombat\&.fruitbat\fR (and any subpackages) but disabled in class \f3com\&.wombat\&.fruitbat\&.Brickbat\fR, use the following command: -.sp -.nf -\f3java \-ea:com\&.wombat\&.fruitbat\&.\&.\&. \-da:com\&.wombat\&.fruitbat\&.Brickbat MyClass\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --enablesystemassertions, -esa -.br -Enables assertions in all system classes\&. -.TP --help, -? -.br -Displays usage information for the \f3java\fR command without actually running the JVM\&. -.TP --jar \fIfilename\fR -.br -Executes a program encapsulated in a JAR file\&. The \fIfilename\fR argument is the name of a JAR file with a manifest that contains a line in the form \f3Main-Class:\fR\fIclassname\fR that defines the class with the \f3public static void main(String[] args)\fR method that serves as your application\&'s starting point\&. - -When you use the \f3-jar\fR option, the specified JAR file is the source of all user classes, and other class path settings are ignored\&. - -For more information about JAR files, see the following resources: -.RS -.TP 0.2i -\(bu -jar(1) -.TP 0.2i -\(bu -The Java Archive (JAR) Files guide at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jar/index\&.html -.TP 0.2i -\(bu -Lesson: Packaging Programs in JAR Files at http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.html -.RE - -.TP --javaagent:\fIjarpath\fR[=\fIoptions\fR] -.br -Loads the specified Java programming language agent\&. For more information about instrumenting Java applications, see the \f3java\&.lang\&.instrument\fR package description in the Java API documentation at http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package-summary\&.html -.TP --jre-restrict-search -.br -Includes user-private JREs in the version search\&. -.TP --no-jre-restrict-search -.br -Excludes user-private JREs from the version search\&. -.TP --server -.br -Selects the Java HotSpot Server VM\&. The 64-bit version of the JDK supports only the Server VM, so in that case the option is implicit\&. - -For default JVM selection, see Server-Class Machine Detection at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server-class\&.html -.TP --showversion -.br -Displays version information and continues execution of the application\&. This option is equivalent to the \f3-version\fR option except that the latter instructs the JVM to exit after displaying version information\&. -.TP --splash:\fIimgname\fR -.br -Shows the splash screen with the image specified by \fIimgname\fR\&. For example, to show the \f3splash\&.gif\fR file from the \f3images\fR directory when starting your application, use the following option: -.sp -.nf -\f3\-splash:images/splash\&.gif\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --verbose:class -.br -Displays information about each loaded class\&. -.TP --verbose:gc -.br -Displays information about each garbage collection (GC) event\&. -.TP --verbose:jni -.br -Displays information about the use of native methods and other Java Native Interface (JNI) activity\&. -.TP --version -.br -Displays version information and then exits\&. This option is equivalent to the \f3-showversion\fR option except that the latter does not instruct the JVM to exit after displaying version information\&. -.TP --version:\fIrelease\fR -.br -Specifies the release version to be used for running the application\&. If the version of the \f3java\fR command called does not meet this specification and an appropriate implementation is found on the system, then the appropriate implementation will be used\&. - -The \fIrelease\fR argument specifies either the exact version string, or a list of version strings and ranges separated by spaces\&. A \fIversion string\fR is the developer designation of the version number in the following form: \f31\&.\fR\fIx\fR\f3\&.0_\fR\fIu\fR (where \fIx\fR is the major version number, and \fIu\fR is the update version number)\&. A \fIversion range\fR is made up of a version string followed by a plus sign (\f3+\fR) to designate this version or later, or a part of a version string followed by an asterisk (\f3*\fR) to designate any version string with a matching prefix\&. Version strings and ranges can be combined using a space for a logical \fIOR\fR combination, or an ampersand (\f3&\fR) for a logical \fIAND\fR combination of two version strings/ranges\&. For example, if running the class or JAR file requires either JRE 6u13 (1\&.6\&.0_13), or any JRE 6 starting from 6u10 (1\&.6\&.0_10), specify the following: -.sp -.nf -\f3\-version:"1\&.6\&.0_13 1\&.6* & 1\&.6\&.0_10+"\fP -.fi -.nf -\f3\fP -.fi -.sp - - -Quotation marks are necessary only if there are spaces in the \fIrelease\fR parameter\&. - -For JAR files, the preference is to specify version requirements in the JAR file manifest rather than on the command line\&. -.SS NON-STANDARD\ OPTIONS -These options are general purpose options that are specific to the Java HotSpot Virtual Machine\&. -.TP --X -.br -Displays help for all available \f3-X\fR options\&. -.TP --Xbatch -.br -Disables background compilation\&. By default, the JVM compiles the method as a background task, running the method in interpreter mode until the background compilation is finished\&. The \f3-Xbatch\fR flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed\&. - -This option is equivalent to \f3-XX:-BackgroundCompilation\fR\&. -.TP --Xbootclasspath:\fIpath\fR -.br -Specifies a list of directories, JAR files, and ZIP archives separated by colons (:) to search for boot class files\&. These are used in place of the boot class files included in the JDK\&. - -\fI\fRDo not deploy applications that use this option to override a class in \f3rt\&.jar\fR, because this violates the JRE binary code license\&. -.TP --Xbootclasspath/a:\fIpath\fR -.br -Specifies a list of directories, JAR files, and ZIP archives separated by colons (:) to append to the end of the default bootstrap class path\&. - -Do not deploy applications that use this option to override a class in \f3rt\&.jar\fR, because this violates the JRE binary code license\&. -.TP --Xbootclasspath/p:\fIpath\fR -.br -Specifies a list of directories, JAR files, and ZIP archives separated by colons (:) to prepend to the front of the default bootstrap class path\&. - -Do not deploy applications that use this option to override a class in \f3rt\&.jar\fR, because this violates the JRE binary code license\&. -.TP --Xboundthreads -.br -Binds user-level threads to kernel threads\&. -.TP --Xcheck:jni -.br -Performs additional checks for Java Native Interface (JNI) functions\&. Specifically, it validates the parameters passed to the JNI function and the runtime environment data before processing the JNI request\&. Any invalid data encountered indicates a problem in the native code, and the JVM will terminate with an irrecoverable error in such cases\&. Expect a performance degradation when this option is used\&. -.TP --Xcomp -.br -Disables interpretation of Java code and compile methods on first invocation\&. By default, the JIT compiler performs 10,000 interpreted method invocations to gather information for efficient compilation\&. To increase compilation performance at the expense of efficiency, use the \f3-Xcomp\fR flag to disable interpreted method invocations\&. - -You can also change the number of interpreted method invocations before compilation using the \f3-XX:CompileThreshold\fR option\&. -.TP --Xdebug -.br -Does nothing\&. Provided for backward compatibility\&. -.TP --Xdiag -.br -Shows additional diagnostic messages\&. -.TP --Xfuture -.br -Enables strict class-file format checks that enforce close conformance to the class-file format specification\&. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases\&. -.TP --Xincgc -.br -Enables incremental GC\&. -.TP --Xint -.br -Runs the application in interpreted-only mode\&. Compilation to native code is disabled, and all bytecode is executed by the interpreter\&. The performance benefits offered by the just in time (JIT) compiler are not present in this mode\&. -.TP --Xinternalversion -.br -Displays more detailed JVM version information than the \f3-version\fR option, and then exits\&. -.TP --Xloggc:\fIfilename\fR -.br -Sets the file to which verbose GC events information should be redirected for logging\&. The information written to this file is similar to the output of \f3-verbose:gc\fR with the time elapsed since the first GC event preceding each logged event\&. The \f3-Xloggc\fR option overrides \f3-verbose:gc\fR if both are given with the same \f3java\fR command\&. - -Example: -.sp -.nf -\f3\-Xloggc:garbage\-collection\&.log\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --Xmaxjitcodesize=\fIsize\fR -.br -Specifies the maximum code cache size (in bytes) for JIT-compiled code\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. By default, the value is set to 48 MB: -.sp -.nf -\f3\-Xmaxjitcodesize=48m\fP -.fi -.nf -\f3\fP -.fi -.sp - - -This option is equivalent to \f3-XX:ReservedCodeCacheSize\fR\&. -.TP --Xmixed -.br -Executes all bytecode by the interpreter except for hot methods, which are compiled to native code\&. -.TP --Xmn\fIsize\fR -.br -Sets the initial and maximum size (in bytes) of the heap for the young generation (nursery)\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. - -The young generation region of the heap is used for new objects\&. GC is performed in this region more often than in other regions\&. If the size for the young generation is too small, then a lot of minor garbage collections will be performed\&. If the size is too large, then only full garbage collections will be performed, which can take a long time to complete\&. Oracle recommends that you keep the size for the young generation between a half and a quarter of the overall heap size\&. - -The following examples show how to set the initial and maximum size of young generation to 256 MB using various units: -.sp -.nf -\f3\-Xmn256m\fP -.fi -.nf -\f3\-Xmn262144k\fP -.fi -.nf -\f3\-Xmn268435456\fP -.fi -.nf -\f3\fP -.fi -.sp - - -Instead of the \f3-Xmn\fR option to set both the initial and maximum size of the heap for the young generation, you can use \f3-XX:NewSize\fR to set the initial size and \f3-XX:MaxNewSize\fR to set the maximum size\&. -.TP --Xms\fIsize\fR -.br -Sets the initial size (in bytes) of the heap\&. This value must be a multiple of 1024 and greater than 1 MB\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. - -The following examples show how to set the size of allocated memory to 6 MB using various units: -.sp -.nf -\f3\-Xms6291456\fP -.fi -.nf -\f3\-Xms6144k\fP -.fi -.nf -\f3\-Xms6m\fP -.fi -.nf -\f3\fP -.fi -.sp - - -If you do not set this option, then the initial size will be set as the sum of the sizes allocated for the old generation and the young generation\&. The initial size of the heap for the young generation can be set using the \f3-Xmn\fR option or the \f3-XX:NewSize\fR option\&. -.TP --Xmx\fIsize\fR -.br -Specifies the maximum size (in bytes) of the memory allocation pool in bytes\&. This value must be a multiple of 1024 and greater than 2 MB\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. The default value is chosen at runtime based on system configuration\&. For server deployments, \f3-Xms\fR and \f3-Xmx\fR are often set to the same value\&. For more information, see Garbage Collector Ergonomics at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc-ergonomics\&.html - -The following examples show how to set the maximum allowed size of allocated memory to 80 MB using various units: -.sp -.nf -\f3\-Xmx83886080\fP -.fi -.nf -\f3\-Xmx81920k\fP -.fi -.nf -\f3\-Xmx80m\fP -.fi -.nf -\f3\fP -.fi -.sp - - -The \f3-Xmx\fR option is equivalent to \f3-XX:MaxHeapSize\fR\&. -.TP --Xnoclassgc -.br -Disables garbage collection (GC) of classes\&. This can save some GC time, which shortens interruptions during the application run\&. - -When you specify \f3-Xnoclassgc\fR at startup, the class objects in the application will be left untouched during GC and will always be considered live\&. This can result in more memory being permanently occupied which, if not used carefully, will throw an out of memory exception\&. -.TP --Xprof -.br -Profiles the running program and sends profiling data to standard output\&. This option is provided as a utility that is useful in program development and is not intended to be used in production systems\&. -.TP --Xrs -.br -Reduces the use of operating system signals by the JVM\&. - -Shutdown hooks enable orderly shutdown of a Java application by running user cleanup code (such as closing database connections) at shutdown, even if the JVM terminates abruptly\&. - -The JVM catches signals to implement shutdown hooks for unexpected termination\&. The JVM uses \f3SIGHUP\fR, \f3SIGINT\fR, and \f3SIGTERM\fR to initiate the running of shutdown hooks\&. - -The JVM uses a similar mechanism to implement the feature of dumping thread stacks for debugging purposes\&. The JVM uses \f3SIGQUIT\fR to perform thread dumps\&. - -Applications embedding the JVM frequently need to trap signals such as \f3SIGINT\fR or \f3SIGTERM\fR, which can lead to interference with the JVM signal handlers\&. The \f3-Xrs\fR option is available to address this issue\&. When \f3-Xrs\fR is used, the signal masks for \f3SIGINT\fR, \f3SIGTERM\fR, \f3SIGHUP\fR, and \f3SIGQUIT\fR are not changed by the JVM, and signal handlers for these signals are not installed\&. - -There are two consequences of specifying \f3-Xrs\fR: -.RS -.TP 0.2i -\(bu -\f3SIGQUIT\fR thread dumps are not available\&. -.TP 0.2i -\(bu -User code is responsible for causing shutdown hooks to run, for example, by calling \f3System\&.exit()\fR when the JVM is to be terminated\&. -.RE - -.TP --Xshare:\fImode\fR -.br -Sets the class data sharing mode\&. Possible \fImode\fR arguments for this option include the following: -.RS -.TP -auto -Use shared class data if possible\&. This is the default value for Java HotSpot 32-Bit Client VM\&. -.TP -on -Require the use of class data sharing\&. Print an error message and exit if class data sharing cannot be used\&. -.TP -off -Do not use shared class data\&. This is the default value for Java HotSpot 32-Bit Server VM, Java HotSpot 64-Bit Client VM, and Java HotSpot 64-Bit Server VM\&. -.TP -dump -Manually generate the class data sharing archive\&. -.RE - -.TP --XshowSettings:\fIcategory\fR -.br -Shows settings and continues\&. Possible \fIcategory\fR arguments for this option include the following: -.RS -.TP -all -Shows all categories of settings\&. This is the default value\&. -.TP -locale -Shows settings related to locale\&. -.TP -properties -Shows settings related to system properties\&. -.TP -vm -Shows the settings of the JVM\&. -.RE - -.TP --Xss\fIsize\fR -.br -Sets the thread stack size (in bytes)\&. Append the letter \f3k\fR or \f3K\fR to indicate KB, \f3m\fR or \f3M\fR to indicate MB, \f3g\fR or \f3G\fR to indicate GB\&. The default value depends on the platform: -.RS -.TP 0.2i -\(bu -Linux/ARM (32-bit): 320 KB -.TP 0.2i -\(bu -Linux/i386 (32-bit): 320 KB -.TP 0.2i -\(bu -Linux/x64 (64-bit): 1024 KB -.TP 0.2i -\(bu -OS X (64-bit): 1024 KB -.TP 0.2i -\(bu -Oracle Solaris/i386 (32-bit): 320 KB -.TP 0.2i -\(bu -Oracle Solaris/x64 (64-bit): 1024 KB -.TP 0.2i -\(bu -Windows: depends on virtual memory -.RE -.RS -The following examples set the thread stack size to 1024 KB in different units: -.sp -.nf -\f3\-Xss1m\fP -.fi -.nf -\f3\-Xss1024k\fP -.fi -.nf -\f3\-Xss1048576\fP -.fi -.nf -\f3\fP -.fi -.sp - - -This option is equivalent to \f3-XX:ThreadStackSize\fR\&. - -.RE -.TP --Xusealtsigs -.br -Use alternative signals instead of \f3SIGUSR1\fR and \f3SIGUSR2\fR for JVM internal signals\&. This option is equivalent to \f3-XX:+UseAltSigs\fR\&. -.TP --Xverify:\fImode\fR -.br -Sets the mode of the bytecode verifier\&. Bytecode verification helps to troubleshoot some problems, but it also adds overhead to the running application\&. Possible \fImode\fR arguments for this option include the following: -.RS -.TP -none -Do not verify the bytecode\&. This reduces startup time and also reduces the protection provided by Java\&. -.TP -remote -Verify only those classes that are loaded remotely over the network\&. This is the default behavior if you do not specify the \f3-Xverify\fR option\&. -.TP -all -Verify all classes\&. -.RE - -.SS ADVANCED\ RUNTIME\ OPTIONS -These options control the runtime behavior of the Java HotSpot VM\&. -.TP --XX:+DisableAttachMechanism -.br -Enables the option that disables the mechanism that lets tools attach to the JVM\&. By default, this option is disabled, meaning that the attach mechanism is enabled and you can use tools such as \f3jcmd\fR, \f3jstack\fR, \f3jmap\fR, and \f3jinfo\fR\&. -.TP --XX:ErrorFile=\fIfilename\fR -.br -Specifies the path and file name to which error data is written when an irrecoverable error occurs\&. By default, this file is created in the current working directory and named \f3hs_err_pid\fR\fIpid\fR\f3\&.log\fR where \fIpid\fR is the identifier of the process that caused the error\&. The following example shows how to set the default log file (note that the identifier of the process is specified as \f3%p\fR): -.sp -.nf -\f3\-XX:ErrorFile=\&./hs_err_pid%p\&.log\fP -.fi -.nf -\f3\fP -.fi -.sp - - -The following example shows how to set the error log to \f3/var/log/java/java_error\&.log\fR: -.sp -.nf -\f3\-XX:ErrorFile=/var/log/java/java_error\&.log\fP -.fi -.nf -\f3\fP -.fi -.sp - - -If the file cannot be created in the specified directory (due to insufficient space, permission problem, or another issue), then the file is created in the temporary directory for the operating system\&. The temporary directory is \f3/tmp\fR\&. -.TP --XX:LargePageSizeInBytes=\fIsize\fR -.br -Sets the maximum size (in bytes) for large pages used for Java heap\&. The \fIsize\fR argument must be a power of 2 (2, 4, 8, 16, \&.\&.\&.)\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. By default, the size is set to 0, meaning that the JVM chooses the size for large pages automatically\&. - -The following example illustrates how to set the large page size to 4 megabytes (MB): -.sp -.nf -\f3\-XX:LargePageSizeInBytes=4m\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxDirectMemorySize=\fIsize\fR -.br -Sets the maximum total size (in bytes) of the New I/O (the \f3java\&.nio\fR package) direct-buffer allocations\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. By default, the size is set to 0, meaning that the JVM chooses the size for NIO direct-buffer allocations automatically\&. - -The following examples illustrate how to set the NIO size to 1024 KB in different units: -.sp -.nf -\f3\-XX:MaxDirectMemorySize=1m\fP -.fi -.nf -\f3\-XX:MaxDirectMemorySize=1024k\fP -.fi -.nf -\f3\-XX:MaxDirectMemorySize=1048576\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:NativeMemoryTracking=\fImode\fR -.br -Specifies the mode for tracking JVM native memory usage\&. Possible \fImode\fR arguments for this option include the following: -.RS -.TP -off -Do not track JVM native memory usage\&. This is the default behavior if you do not specify the \f3-XX:NativeMemoryTracking\fR option\&. -.TP -summary -Only track memory usage by JVM subsystems, such as Java heap, class, code, and thread\&. -.TP -detail -In addition to tracking memory usage by JVM subsystems, track memory usage by individual \f3CallSite\fR, individual virtual memory region and its committed regions\&. -.RE - -.TP --XX:OnError=\fIstring\fR -.br -Sets a custom command or a series of semicolon-separated commands to run when an irrecoverable error occurs\&. If the string contains spaces, then it must be enclosed in quotation marks\&. - -\fI\fRThe following example shows how the \f3-XX:OnError\fR option can be used to run the \f3gcore\fR command to create the core image, and the debugger is started to attach to the process in case of an irrecoverable error (the \f3%p\fR designates the current process): -.sp -.nf -\f3\-XX:OnError="gcore %p;dbx \- %p"\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:OnOutOfMemoryError=\fIstring\fR -.br -Sets a custom command or a series of semicolon-separated commands to run when an \f3OutOfMemoryError\fR exception is first thrown\&. If the string contains spaces, then it must be enclosed in quotation marks\&. For an example of a command string, see the description of the \f3-XX:OnError\fR option\&. -.TP --XX:+PrintCommandLineFlags -.br -Enables printing of ergonomically selected JVM flags that appeared on the command line\&. It can be useful to know the ergonomic values set by the JVM, such as the heap space size and the selected garbage collector\&. By default, this option is disabled and flags are not printed\&. -.TP --XX:+PrintNMTStatistics -.br -Enables printing of collected native memory tracking data at JVM exit when native memory tracking is enabled (see \f3-XX:NativeMemoryTracking\fR)\&. By default, this option is disabled and native memory tracking data is not printed\&. -.TP --XX:+ShowMessageBoxOnError -.br -Enables displaying of a dialog box when the JVM experiences an irrecoverable error\&. This prevents the JVM from exiting and keeps the process active so that you can attach a debugger to it to investigate the cause of the error\&. By default, this option is disabled\&. -.TP --XX:ThreadStackSize=\fIsize\fR -.br -Sets the thread stack size (in bytes)\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. The default value depends on the platform: -.RS -.TP 0.2i -\(bu -Linux/ARM (32-bit): 320 KB -.TP 0.2i -\(bu -Linux/i386 (32-bit): 320 KB -.TP 0.2i -\(bu -Linux/x64 (64-bit): 1024 KB -.TP 0.2i -\(bu -OS X (64-bit): 1024 KB -.TP 0.2i -\(bu -Oracle Solaris/i386 (32-bit): 320 KB -.TP 0.2i -\(bu -Oracle Solaris/x64 (64-bit): 1024 KB -.TP 0.2i -\(bu -Windows: depends on virtual memory -.RE -.RS -The following examples show how to set the thread stack size to 1024 KB in different units: -.sp -.nf -\f3\-XX:ThreadStackSize=1m\fP -.fi -.nf -\f3\-XX:ThreadStackSize=1024k\fP -.fi -.nf -\f3\-XX:ThreadStackSize=1048576\fP -.fi -.nf -\f3\fP -.fi -.sp - - -This option is equivalent to \f3-Xss\fR\&. - -.RE -.TP --XX:+TraceClassLoading -.br -Enables tracing of classes as they are loaded\&. By default, this option is disabled and classes are not traced\&. -.TP --XX:+TraceClassLoadingPreorder -.br -Enables tracing of all loaded classes in the order in which they are referenced\&. By default, this option is disabled and classes are not traced\&. -.TP --XX:+TraceClassResolution -.br -Enables tracing of constant pool resolutions\&. By default, this option is disabled and constant pool resolutions are not traced\&. -.TP --XX:+TraceClassUnloading -.br -Enables tracing of classes as they are unloaded\&. By default, this option is disabled and classes are not traced\&. -.TP --XX:+TraceLoaderConstraints -.br -Enables tracing of the loader constraints recording\&. By default, this option is disabled and loader constraints recoding is not traced\&. -.TP --XX:+UseAltSigs -.br -Enables the use of alternative signals instead of \f3SIGUSR1\fR and \f3SIGUSR2\fR for JVM internal signals\&. By default, this option is disabled and alternative signals are not used\&. This option is equivalent to \f3-Xusealtsigs\fR\&. -.TP --XX:+UseBiasedLocking -.br -Enables the use of biased locking\&. Some applications with significant amounts of uncontended synchronization may attain significant speedups with this flag enabled, whereas applications with certain patterns of locking may see slowdowns\&. For more information about the biased locking technique, see the example in Java Tuning White Paper at http://www\&.oracle\&.com/technetwork/java/tuning-139912\&.html#section4\&.2\&.5 - -By default, this option is disabled and biased locking is not used\&. -.TP --XX:+UseCompressedOops -.br -Enables the use of compressed pointers\&. When this option is enabled, object references are represented as 32-bit offsets instead of 64-bit pointers, which typically increases performance when running the application with Java heap sizes less than 32 GB\&. This option works only for 64-bit JVMs\&. - -By default, this option is disabled and compressed pointers are not used\&. -.TP --XX:+UseLargePages -.br -Enables the use of large page memory\&. This option is enabled by default\&. To disable the use of large page memory, specify \f3-XX:-UseLargePages\fR\&. - -For more information, see Java Support for Large Memory Pages at http://www\&.oracle\&.com/technetwork/java/javase/tech/largememory-jsp-137182\&.html -.TP --XX:+UseMembar -.br -Enables issuing of membars on thread state transitions\&. This option is disabled by default on all platforms except Power PC and ARM servers, where it is enabled\&. To disable issuing of membars on thread state transitions for Power PC and ARM, specify \f3-XX:-UseMembar\fR\&. -.TP --XX:+UsePerfData -.br -Enables the \f3perfdata\fR feature\&. This option is enabled by default to allow JVM monitoring and performance testing\&. Disabling it suppresses the creation of the \f3hsperfdata_userid\fR directories\&. To disable the \f3perfdata\fR feature, specify \f3-XX:-UsePerfData\fR\&. -.TP --XX:+AllowUserSignalHandlers -.br -Enables installation of signal handlers by the application\&. By default, this option is disabled and the application is not allowed to install signal handlers\&. -.SS ADVANCED\ JIT\ COMPILER\ OPTIONS -These options control the dynamic just-in-time (JIT) compilation performed by the Java HotSpot VM\&. -.TP --XX:+AggressiveOpts -.br -Enables the use of aggressive performance optimization features, which are expected to become default in upcoming releases\&. By default, this option is disabled and experimental performance features are not used\&. -.TP --XX:AllocateInstancePrefetchLines=\fIlines\fR -.br -Sets the number of lines to prefetch ahead of the instance allocation pointer\&. By default, the number of lines to prefetch is set to 1: -.sp -.nf -\f3\-XX:AllocateInstancePrefetchLines=1\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:AllocatePrefetchInstr=\fIinstruction\fR -.br -Sets the prefetch instruction to prefetch ahead of the allocation pointer\&. Possible values are from 0 to 3\&. The actual instructions behind the values depend on the platform\&. By default, the prefetch instruction is set to 0: -.sp -.nf -\f3\-XX:AllocatePrefetchInstr=0\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:AllocatePrefetchStepSize=\fIsize\fR -.br -Sets the step size (in bytes) for sequential prefetch instructions\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. By default, the step size is set to 16 bytes: -.sp -.nf -\f3\-XX:AllocatePrefetchStepSize=16\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+BackgroundCompilation -.br -Enables background compilation\&. This option is enabled by default\&. To disable background compilation, specify \f3-XX:-BackgroundCompilation\fR (this is equivalent to specifying \f3-Xbatch\fR)\&. -.TP --XX:CICompilerCount=\fIthreads\fR -.br -Sets the number of compiler threads to use for compilation\&. By default, the number of threads is set to 2 for the server JVM, to 1 for the client JVM, and it scales to the number of cores if tiered compilation is used\&. The following example shows how to set the number of threads to 2: -.sp -.nf -\f3\-XX:CICompilerCount=2\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:CodeCacheMinimumFreeSpace=\fIsize\fR -.br -Sets the minimum free space (in bytes) required for compilation\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. When less than the minimum free space remains, compiling stops\&. By default, this option is set to 500 KB\&. The following example shows how to set the minimum free space to 1024 MB: -.sp -.nf -\f3\-XX:CodeCacheMinimumFreeSpace=1024m\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP +.sp +With no arguments, +\fB\-enableassertions\fR +(\fB\-ea\fR) enables assertions in all packages and classes\&. With the +\fIpackagename\fR +argument ending in +\fB\&.\&.\&.\fR, the switch enables assertions in the specified package and any subpackages\&. If the argument is simply +\fB\&.\&.\&.\fR, then the switch enables assertions in the unnamed package in the current working directory\&. With the +\fIclassname\fR +argument, the switch enables assertions in the specified class\&. +.sp +The +\fB\-enableassertions\fR +(\fB\-ea\fR) option applies to all class loaders and to system classes (which do not have a class loader)\&. There is one exception to this rule: if the option is provided with no arguments, then it does not apply to system classes\&. This makes it easy to enable assertions in all classes except for system classes\&. The +\fB\-enablesystemassertions\fR +option provides a separate switch to enable assertions in all system classes\&. +.sp +To explicitly disable assertions in specific packages or classes, use the +\fB\-disableassertions\fR +(\fB\-da\fR) option\&. If a single command contains multiple instances of these switches, then they are processed in order before loading any classes\&. For example, to run the +\fBMyClass\fR +application with assertions enabled only in package +\fBcom\&.wombat\&.fruitbat\fR +(and any subpackages) but disabled in class +\fBcom\&.wombat\&.fruitbat\&.Brickbat\fR, use the following command: +.sp +.if n \{\ +.RS 4 +.\} .nf --XX:CompileCommand=\fIcommand\fR,\fIclass\fR\&.\fImethod\fR[,\fIoption\fR] -.br +\fBjava \-ea:com\&.wombat\&.fruitbat\&.\&.\&. \-da:com\&.wombat\&.fruitbat\&.Brickbat MyClass\fR + .fi -Attaches a line to the \f3\&.hotspot_compiler\fR file with the command for the specific method of the class\&. For example, to exclude the \f3indexOf()\fR method of the \f3String\fR class from being compiled, use the following: -.sp -.nf -\f3\-XX:CompileCommand=exclude,java/lang/String\&.indexOf\fP -.fi -.nf -\f3\fP -.fi -.sp - - -Note that you must specify the full class name, including all packages and subpackages separated by a slash (\f3/\fR)\&. - -To add several commands, either specify this option multiple times, or separate each argument with the newline separator (\f3\en\fR)\&. To better understand the syntax of the JVM compiler commands, refer to the description of the \f3-XX:CompileCommandFile\fR option, which enables you to specify the file from which to read compiler commands\&. Notice how the syntax of the command file differs rom the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. To pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you can enclose the argument in quotation marks: -.sp -.nf -\f3\-XX:CompileCommand="exclude java/lang/String indexOf"\fP -.fi -.nf -\f3\fP -.fi -.sp - - -For easier cut and paste operations, it is also possible to use the method name format produced by the \f3-XX:+PrintCompilation\fR and \f3-XX:+LogCompilation\fR options: -.sp -.nf -\f3\-XX:CompileCommand="exclude java\&.lang\&.String::indexOf"\fP -.fi -.nf -\f3\fP -.fi -.sp - - -The following commands are available: -.RS -.TP -break -Set a breakpoint when debugging the JVM to stop at the beginning of compilation of the specified method\&. -.TP -compileonly -Exclude all methods from compilation except for the specified method\&. -.TP -dontinline -Prevent inlining of the specified method\&. -.TP -exclude -Exclude the specified method from compilation\&. -.TP -help -Print a help message for the \f3-XX:CompileCommand\fR option\&. -.TP -inline -Attempt to inline the specified method\&. -.TP -log -Exclude compilation logging (with the \f3-XX:+LogCompilation\fR option) for all methods except for the specified method\&. By default, logging is performed for all compiled methods\&. -.TP -print -Print generated assembler code after compilation of the specified method\&. -.TP -quiet -Do not print the compile commands\&. By default, the commands that you specify with the -\f3XX:CompileCommand\fR option are printed; for example, if you exclude from compilation the \f3indexOf()\fR method of the \f3String\fR class, then the following will be printed to standard output: -.sp -.nf -\f3CompilerOracle: exclude java/lang/String\&.indexOf\fP -.fi -.nf -\f3\fP -.fi -.sp - - -You can suppress this by specifying the \f3-XX:CompileCommand=quiet\fR option before other \f3-XX:CompileCommand\fR options\&. -.RE - - -.RS -The optional last argument (\fIoption\fR) can be used to pass a JIT compilation option to the specified method\&. The compilation option is set at the end, after the method name\&. For example, to enable the \f3BlockLayoutByFrequency\fR option for the \f3append()\fR method of the \f3StringBuffer\fR class, use the following: -.sp -.nf -\f3\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fP -.fi -.nf -\f3\fP -.fi -.sp - - +.if n \{\ .RE -.TP --XX:CompileCommandFile=\fIfilename\fR +.\} +.RE +.PP +\-enablesystemassertions .br -Sets the file from which compiler commands are read\&. By default, the \f3\&.hotspot_compiler\fR file is used to store commands performed by the JVM compiler\&. - -Each line in the command file represents a command, a class name, and a method name for which the command is used (all three parts are separated by spaces)\&. For example, this line prints assembly code for the \f3toString()\fR method of the \f3String\fR class: -.sp -.nf -\f3print java/lang/String toString\fP -.fi -.nf -\f3\fP -.fi -.sp - - -To add commands to the beginning of the \f3\&.hotspot_compiler\fR file, use the \f3-XX:CompileCommand\fR option\&. Note how the syntax of the command file is different from the syntax of the argument for the \f3-XX:CompileCommand\fR option\&. The commas and periods in the argument are aliases for spaces in the command file, making it easier to pass compiler commands through a shell\&. Although it is possible to pass arguments to \f3-XX:CompileCommand\fR with the same syntax as that used in the command file, you would have to enclose the string argument in quotation marks\&. -.TP --XX:CompileOnly=\fImethods\fR -.br -Sets the list of methods (separated by commas) to which compilation should be restricted\&. Only the specified methods will be compiled\&. Specify each method with the full class name (including the packages and subpackages)\&. For example, to compile only the \f3length()\fR method of the \f3String\fR class and the \f3size()\fR method of the \f3List\fR class, use the following: -.sp -.nf -\f3\-XX:CompileOnly=java/lang/String\&.length,java/util/List\&.size\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:CompileThreshold=\fIinvocations\fR -.br -Sets the number of interpreted method invocations before compilation\&. By default, in the server JVM, the JIT compiler performs 10,000 interpreted method invocations to gather information for efficient compilation\&. For the client JVM, the default setting is 1,500 invocations\&. The following example shows how to set the number of interpreted method invocations to 5,000: -.sp -.nf -\f3\-XX:CompileThreshold=5000\fP -.fi -.nf -\f3\fP -.fi -.sp - - -You can completely disable interpretation of Java methods before compilation by specifying the \f3-Xcomp\fR option\&. -.TP --XX:+DoEscapeAnalysis -.br -Enables the use of escape analysis\&. This option is enabled by default\&. To disable the use of escape analysis, specify \f3-XX:-DoEscapeAnalysis\fR\&. -.TP --XX:+FailOverToOldVerifier -.br -Enables automatic failover to the old verifier when the new type checker fails\&. By default, this option is disabled and it is ignored (that is, treated as disabled) for classes with a recent bytecode version\&. You can enable it for classes with older versions of the bytecode\&. -.TP --XX:InitialCodeCacheSize=\fIsize\fR -.br -Sets the initial code cache size (in bytes)\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. The default value is set to 500 KB\&. The following example shows how to set the initial code cache size to 32 KB: -.sp -.nf -\f3\-XX:InitialCodeCacheSize=32k\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+Inline -.br -Enables method inlining\&. This option is enabled by default to increase performance\&. To disable method inlining, specify \f3-XX:-Inline\fR\&. -.TP --XX:InlineSmallCode=\fIsize\fR -.br -Sets the maximum code size (in bytes) for compiled methods that should be inlined\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. Only compiled methods with the size smaller than the specified size will be inlined\&. By default, the maximum code size is set to 1000 bytes: -.sp -.nf -\f3\-XX:InlineSmallCode=1000\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+LogCompilation -.br -Enables logging of compilation activity to a file named \f3hotspot\&.log\fR in the current working directory\&. You can specify a different log file path and name using the \f3-XX:LogFile\fR option\&. - -By default, this option is disabled and compilation activity is not logged\&. The \f3-XX:+LogCompilation\fR option has to be used together with the \f3-XX:UnlockDiagnosticVMOptions\fR option that unlocks diagnostic JVM options\&. - -You can enable verbose diagnostic output with a message printed to the console every time a method is compiled by using the \f3-XX:+PrintCompilation\fR option\&. -.TP --XX:MaxInlineSize=\fIsize\fR -.br -Sets the maximum bytecode size (in bytes) of a method to be inlined\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. By default, the maximum bytecode size is set to 35 bytes: -.sp -.nf -\f3\-XX:MaxInlineSize=35\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxNodeLimit=\fInodes\fR -.br -Sets the maximum number of nodes to be used during single method compilation\&. By default, the maximum number of nodes is set to 65,000: -.sp -.nf -\f3\-XX:MaxNodeLimit=65000\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxTrivialSize=\fIsize\fR -.br -Sets the maximum bytecode size (in bytes) of a trivial method to be inlined\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. By default, the maximum bytecode size of a trivial method is set to 6 bytes: -.sp -.nf -\f3\-XX:MaxTrivialSize=6\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+OptimizeStringConcat -.br -Enables the optimization of \f3String\fR concatenation operations\&. This option is enabled by default\&. To disable the optimization of \f3String\fR concatenation operations, specify \f3-XX:-OptimizeStringConcat\fR\&. -.TP --XX:+PrintAssembly -.br -Enables printing of assembly code for bytecoded and native methods by using the external \f3disassembler\&.so\fR library\&. This enables you to see the generated code, which may help you to diagnose performance issues\&. - -By default, this option is disabled and assembly code is not printed\&. The \f3-XX:+PrintAssembly\fR option has to be used together with the \f3-XX:UnlockDiagnosticVMOptions\fR option that unlocks diagnostic JVM options\&. -.TP --XX:+PrintCompilation -.br -Enables verbose diagnostic output from the JVM by printing a message to the console every time a method is compiled\&. This enables you to see which methods actually get compiled\&. By default, this option is disabled and diagnostic output is not printed\&. - -You can also log compilation activity to a file by using the \f3-XX:+LogCompilation\fR option\&. -.TP --XX:+PrintInlining -.br -Enables printing of inlining decisions\&. This enables you to see which methods are getting inlined\&. - -By default, this option is disabled and inlining information is not printed\&. The \f3-XX:+PrintInlining\fR option has to be used together with the \f3-XX:+UnlockDiagnosticVMOptions\fR option that unlocks diagnostic JVM options\&. -.TP --XX:+RelaxAccessControlCheck -.br -Decreases the amount of access control checks in the verifier\&. By default, this option is disabled, and it is ignored (that is, treated as disabled) for classes with a recent bytecode version\&. You can enable it for classes with older versions of the bytecode\&. -.TP --XX:ReservedCodeCacheSize=\fIsize\fR -.br -Sets the maximum code cache size (in bytes) for JIT-compiled code\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. This option is equivalent to \f3-Xmaxjitcodesize\fR\&. -.TP --XX:+TieredCompilation -.br -Enables the use of tiered compilation\&. By default, this option is disabled and tiered compilation is not used\&. -.TP --XX:+UseCodeCacheFlushing -.br -Enables flushing of the code cache before shutting down the compiler\&. This option is enabled by default\&. To disable flushing of the code cache before shutting down the compiler, specify \f3-XX:-UseCodeCacheFlushing\fR\&. -.TP --XX:+UseCondCardMark -.br -Enables checking of whether the card is already marked before updating the card table\&. This option is disabled by default and should only be used on machines with multiple sockets, where it will increase performance of Java applications that rely heavily on concurrent operations\&. -.TP --XX:+UseSuperWord -.br -Enables the transformation of scalar operations into superword operations\&. This option is enabled by default\&. To disable the transformation of scalar operations into superword operations, specify \f3-XX:-UseSuperWord\fR\&. -.SS ADVANCED\ SERVICEABILITY\ OPTIONS -These options provide the ability to gather system information and perform extensive debugging\&. -.TP --XX:+ExtendedDTraceProbes -.br -Enables additional \f3dtrace\fR tool probes that impact the performance\&. By default, this option is disabled and \f3dtrace\fR performs only standard probes\&. -.TP --XX:+HeapDumpOnOutOfMemory -.br -Enables the dumping of the Java heap to a file in the current directory by using the heap profiler (HPROF) when a \f3java\&.lang\&.OutOfMemoryError\fR exception is thrown\&. You can explicitly set the heap dump file path and name using the \f3-XX:HeapDumpPath\fR option\&. By default, this option is disabled and the heap is not dumped when an \f3OutOfMemoryError\fR exception is thrown\&. -.TP --XX:HeapDumpPath=\fIpath\fR -.br -Sets the path and file name for writing the heap dump provided by the heap profiler (HPROF) when the \f3-XX:+HeapDumpOnOutOfMemoryError\fR option is set\&. By default, the file is created in the current working directory, and it is named \f3java_pid\fR\fIpid\fR\f3\&.hprof\fR where \fIpid\fR is the identifier of the process that caused the error\&. The following example shows how to set the default file explicitly (\f3%p\fR represents the current process identificator): -.sp -.nf -\f3\-XX:HeapDumpPath=\&./java_pid%p\&.hprof\fP -.fi -.nf -\f3\fP -.fi -.sp - - -\fI\fRThe following example shows how to set the heap dump file to \f3/var/log/java/java_heapdump\&.hprof\fR: -.sp -.nf -\f3\-XX:HeapDumpPath=/var/log/java/java_heapdump\&.hprof\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:LogFile=\fIpath\fR -.br -Sets the path and file name where log data is written\&. By default, the file is created in the current working directory, and it is named \f3hotspot\&.log\fR\&. - -\fI\fRThe following example shows how to set the log file to \f3/var/log/java/hotspot\&.log\fR: -.sp -.nf -\f3\-XX:LogFile=/var/log/java/hotspot\&.log\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+PrintClassHistogram -.br -\fI\fREnables printing of a class instance histogram after a \f3Control+C\fR event (\f3SIGTERM\fR)\&. By default, this option is disabled\&. - -Setting this option is equivalent to running the \f3jmap -histo\fR command, or the \f3jcmd\fR\fIpid\fR\f3GC\&.class_histogram\fR command, where \fIpid\fR is the current Java process identifier\&. -.TP --XX:+PrintConcurrentLocks - - -Enables printing of j\f3ava\&.util\&.concurrent\fR locks after a \f3Control+C\fR event (\f3SIGTERM\fR)\&. By default, this option is disabled\&. - -Setting this option is equivalent to running the \f3jstack -l\fR command or the \f3jcmd\fR\fIpid\fR\f3Thread\&.print -l\fR command, where \fIpid\fR is the current Java process identifier\&. -.TP --XX:+UnlockDiagnosticVMOptions -.br -Unlocks the options intended for diagnosing the JVM\&. By default, this option is disabled and diagnostic options are not available\&. -.SS ADVANCED\ GARBAGE\ COLLECTION\ OPTIONS -These options control how garbage collection (GC) is performed by the Java HotSpot VM\&. -.TP --XX:+AggressiveHeap -.br -Enables Java heap optimization\&. This sets various parameters to be optimal for long-running jobs with intensive memory allocation, based on the configuration of the computer (RAM and CPU)\&. By default, the option is disabled and the heap is not optimized\&. -.TP --XX:AllocatePrefetchDistance=\fIsize\fR -.br -Sets the size (in bytes) of the prefetch distance for object allocation\&. Memory about to be written with the value of new objects is prefetched up to this distance starting from the address of the last allocated object\&. Each Java thread has its own allocation point\&. - -Negative values denote that prefetch distance is chosen based on the platform\&. Positive values are bytes to prefetch\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. The default value is set to -1\&. - -The following example shows how to set the prefetch distance to 1024 bytes: -.sp -.nf -\f3\-XX:AllocatePrefetchDistance=1024\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:AllocatePrefetchLines=\fIlines\fR -.br -Sets the number of cache lines to load after the last object allocation by using the prefetch instructions generated in compiled code\&. The default value is 1 if the last allocated object was an instance, and 3 if it was an array\&. - -The following example shows how to set the number of loaded cache lines to 5: -.sp -.nf -\f3\-XX:AllocatePrefetchLines=5\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:AllocatePrefetchStyle=\fIstyle\fR -.br -Sets the generated code style for prefetch instructions\&. The \fIstyle\fR argument is an integer from 0 to 3: -.RS -.TP -0 -Do not generate prefetch instructions\&. -.TP -1 -Execute prefetch instructions after each allocation\&. This is the default parameter\&. -.TP -2 -Use the thread-local allocation block (TLAB) watermark pointer to determine when prefetch instructions are executed\&. -.TP -3 -Use BIS instruction on SPARC for allocation prefetch\&. -.RE - -.TP --XX:+AlwaysPreTouch -.br -Enables touching of every page on the Java heap during JVM initialization\&. This gets all pages into the memory before entering the \f3main()\fR method\&. The option can be used in testing to simulate a long-running system with all virtual memory mapped to physical memory\&. By default, this option is disabled and all pages are committed as JVM heap space fills\&. -.TP --XX:+CMSClassUnloadingEnabled -.br -Enables class unloading when using the concurrent mark-sweep (CMS) garbage collector\&. This option is enabled by default\&. To disable class unloading for the CMS garbage collector, specify \f3-XX:-CMSClassUnloadingEnabled\fR\&. -.TP --XX:CMSExpAvgFactor=\fIpercent\fR -.br -Sets the percentage of time (0 to 100) used to weight the current sample when computing exponential averages for the concurrent collection statistics\&. By default, the exponential averages factor is set to 25%\&. The following example shows how to set the factor to 15%: -.sp -.nf -\f3\-XX:CMSExpAvgFactor=15\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:CMSIncrementalDutyCycle=\fIpercent\fR -.br -Sets the percentage of time (0 to 100) between minor collections that the concurrent collector is allowed to run\&. When \f3-XX:+CMSIncrementalPacing\fR is enabled, the duty cycle is set automatically, and this option sets only the initial value\&. - -By default, the duty cycle is set to 10%\&. The following example shows how to set the duty cycle to 20%: -.sp -.nf -\f3\-XX:CMSIncrementalDutyCycle=20\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:CMSIncrementalDutyCycleMin=\fIpercent\fR -.br -Sets the percentage of time (0 to 100) between minor collections that is the lower bound for the duty cycle when \f3-XX:+CMSIncrementalPacing\fR is enabled\&. By default, the lower bound for the duty cycle is set to 0%\&. The following example shows how to set the lower bound to 10%: -.sp -.nf -\f3\-XX:CMSIncrementalDutyCycleMin=10\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+CMSIncrementalMode -.br -Enables the incremental mode for the CMS collector\&. This option is disabled by default and should only be enabled for configurations with no more than two GC threads\&. All options that start with \f3CMSIncremental\fR apply only when this option is enabled\&. -.TP --XX:CMSIncrementalOffset=\fIpercent\fR -.br -Sets the percentage of time (0 to 100) by which the incremental mode duty cycle is shifted to the right within the period between minor collections\&. By default, the offset is set to 0%\&. The following example shows how to set the duty cycle offset to 25%: -.sp -.nf -\f3\-XX:CMSIncrementalOffset=25\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+CMSIncrementalPacing -.br -Enables automatic adjustment of the incremental mode duty cycle based on statistics collected while the JVM is running\&. This option is enabled by default\&. To disable automatic adjustment of the incremental mode duty cycle, specify \f3-XX:-CMSIncrementalPacing\fR\&. -.TP --XX:CMSIncrementalSafetyFactor=\fIpercent\fR -.br -Sets the percentage of time (0 to 100) used to add conservatism when computing the duty cycle\&. By default, the safety factor is set to 10%\&. The example below shows how to set the safety factor to 5%: -.sp -.nf -\f3\-XX:CMSIncrementalSafetyFactor=5\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:CMSInitiatingOccupancyFraction=\fIpercent\fR -.br -Sets the percentage of the old generation occupancy (0 to 100) at which to start a CMS collection cycle\&. The default value is set to -1\&. Any negative value (including the default) implies that \f3-XX:CMSTriggerRatio\fR is used to define the value of the initiating occupancy fraction\&. - -The following example shows how to set the occupancy fraction to 20%: -.sp -.nf -\f3\-XX:CMSInitiatingOccupancyFraction=20\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+CMSScavengeBeforeRemark -.br -Enables scavenging attempts before the CMS remark step\&. By default, this option is disabled\&. -.TP --XX:CMSTriggerRatio=\fIpercent\fR -.br -Sets the percentage (0 to 100) of the value specified by \f3-XX:MinHeapFreeRatio\fR that is allocated before a CMS collection cycle commences\&. The default value is set to 80%\&. - -The following example shows how to set the occupancy fraction to 75%: -.sp -.nf -\f3\-XX:CMSTriggerRatio=75\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:ConcGCThreads=\fIthreads\fR -.br -Sets the number of threads used for concurrent GC\&. The default value depends on the number of CPUs available to the JVM\&. - -For example, to set the number of threads for concurrent GC to 2, specify the following option: -.sp -.nf -\f3\-XX:ConcGCThreads=2\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+DisableExplicitGC -.br -Enables the option that disables processing of calls to \f3System\&.gc()\fR\&. This option is disabled by default, meaning that calls to \f3System\&.gc()\fR are processed\&. If processing of calls to \f3System\&.gc()\fR is disabled, the JVM still performs GC when necessary\&. -.TP --XX:+ExplicitGCInvokesConcurrent -.br -Enables invoking of concurrent GC by using the \f3System\&.gc()\fR request\&. This option is disabled by default and can be enabled only together with the \f3-XX:+UseConcMarkSweepGC\fR option\&. -.TP --XX:+ExplicitGCInvokesConcurrentAndUnloadsClasses -.br -Enables invoking of concurrent GC by using the \f3System\&.gc()\fR request and unloading of classes during the concurrent GC cycle\&. This option is disabled by default and can be enabled only together with the \f3-XX:+UseConcMarkSweepGC\fR option\&. -.TP --XX:G1HeapRegionSize=\fIsize\fR -.br -Sets the size of the regions into which the Java heap is subdivided when using the garbage-first (G1) collector\&. The value can be between 1 MB and 32 MB\&. The default region size is determined ergonomically based on the heap size\&. - -The following example shows how to set the size of the subdivisions to 16 MB: -.sp -.nf -\f3\-XX:G1HeapRegionSize=16m\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+G1PrintHeapRegions -.br -Enables the printing of information about which regions are allocated and which are reclaimed by the G1 collector\&. By default, this option is disabled\&. -.TP --XX:G1ReservePercent=\fIpercent\fR -.br -Sets the percentage of the heap (0 to 50) that is reserved as a false ceiling to reduce the possibility of promotion failure for the G1 collector\&. By default, this option is set to 10%\&. - -The following example shows how to set the reserved heap to 20%: -.sp -.nf -\f3\-XX:G1ReservePercent=20\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:InitialHeapSize=\fIsize\fR -.br -Sets the initial size (in bytes) of the memory allocation pool\&. This value must be either 0, or a multiple of 1024 and greater than 1 MB\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. The default value is chosen at runtime based on system configuration\&. For more information, see Garbage Collector Ergonomics at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc-ergonomics\&.html +\-esa +.RS 4 +Enables assertions in all system classes\&. +.RE +.PP +\-help +.br +\-? +.RS 4 +Displays usage information for the +\fBjava\fR +command without actually running the JVM\&. +.RE +.PP +\-jar \fIfilename\fR +.RS 4 +Executes a program encapsulated in a JAR file\&. The +\fIfilename\fR +argument is the name of a JAR file with a manifest that contains a line in the form +\fBMain\-Class:\fR\fIclassname\fR +that defines the class with the +\fBpublic static void main(String[] args)\fR +method that serves as your application\*(Aqs starting point\&. +.sp +When you use the +\fB\-jar\fR +option, the specified JAR file is the source of all user classes, and other class path settings are ignored\&. +.sp +For more information about JAR files, see the following resources: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +jar(1) +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The Java Archive (JAR) Files guide at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/jar/index\&.html +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Lesson: Packaging Programs in JAR Files at +http://docs\&.oracle\&.com/javase/tutorial/deployment/jar/index\&.html +.RE +.RE +.PP +\-javaagent:\fIjarpath\fR[=\fIoptions\fR] +.RS 4 +Loads the specified Java programming language agent\&. For more information about instrumenting Java applications, see the +\fBjava\&.lang\&.instrument\fR +package description in the Java API documentation at http://docs\&.oracle\&.com/javase/8/docs/api/java/lang/instrument/package\-summary\&.html +.RE +.PP +\-jre\-restrict\-search +.RS 4 +Includes user\-private JREs in the version search\&. +.RE +.PP +\-no\-jre\-restrict\-search +.RS 4 +Excludes user\-private JREs from the version search\&. +.RE +.PP +\-server +.RS 4 +Selects the Java HotSpot Server VM\&. The 64\-bit version of the JDK supports only the Server VM, so in that case the option is implicit\&. +.sp +For default JVM selection, see Server\-Class Machine Detection at +http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/server\-class\&.html +.RE +.PP +\-showversion +.RS 4 +Displays version information and continues execution of the application\&. This option is equivalent to the +\fB\-version\fR +option except that the latter instructs the JVM to exit after displaying version information\&. +.RE +.PP +\-splash:\fIimgname\fR +.RS 4 +Shows the splash screen with the image specified by +\fIimgname\fR\&. For example, to show the +\fBsplash\&.gif\fR +file from the +\fBimages\fR +directory when starting your application, use the following option: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-splash:images/splash\&.gif\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-verbose:class +.RS 4 +Displays information about each loaded class\&. +.RE +.PP +\-verbose:gc +.RS 4 +Displays information about each garbage collection (GC) event\&. +.RE +.PP +\-verbose:jni +.RS 4 +Displays information about the use of native methods and other Java Native Interface (JNI) activity\&. +.RE +.PP +\-version +.RS 4 +Displays version information and then exits\&. This option is equivalent to the +\fB\-showversion\fR +option except that the latter does not instruct the JVM to exit after displaying version information\&. +.RE +.PP +\-version:\fIrelease\fR +.RS 4 +Specifies the release version to be used for running the application\&. If the version of the +\fBjava\fR +command called does not meet this specification and an appropriate implementation is found on the system, then the appropriate implementation will be used\&. +.sp +The +\fIrelease\fR +argument specifies either the exact version string, or a list of version strings and ranges separated by spaces\&. A +\fIversion string\fR +is the developer designation of the version number in the following form: +\fB1\&.\fR\fIx\fR\fB\&.0_\fR\fIu\fR +(where +\fIx\fR +is the major version number, and +\fIu\fR +is the update version number)\&. A +\fIversion range\fR +is made up of a version string followed by a plus sign (\fB+\fR) to designate this version or later, or a part of a version string followed by an asterisk (\fB*\fR) to designate any version string with a matching prefix\&. Version strings and ranges can be combined using a space for a logical +\fIOR\fR +combination, or an ampersand (\fB&\fR) for a logical +\fIAND\fR +combination of two version strings/ranges\&. For example, if running the class or JAR file requires either JRE 6u13 (1\&.6\&.0_13), or any JRE 6 starting from 6u10 (1\&.6\&.0_10), specify the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-version:"1\&.6\&.0_13 1\&.6* & 1\&.6\&.0_10+"\fR + +.fi +.if n \{\ +.RE +.\} +Quotation marks are necessary only if there are spaces in the +\fIrelease\fR +parameter\&. +.sp +For JAR files, the preference is to specify version requirements in the JAR file manifest rather than on the command line\&. +.RE +.SS "Non\-Standard Options" +.PP +These options are general purpose options that are specific to the Java HotSpot Virtual Machine\&. +.PP +\-X +.RS 4 +Displays help for all available +\fB\-X\fR +options\&. +.RE +.PP +\-Xbatch +.RS 4 +Disables background compilation\&. By default, the JVM compiles the method as a background task, running the method in interpreter mode until the background compilation is finished\&. The +\fB\-Xbatch\fR +flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed\&. +.sp +This option is equivalent to +\fB\-XX:\-BackgroundCompilation\fR\&. +.RE +.PP +\-Xbootclasspath:\fIpath\fR +.RS 4 +Specifies a list of directories, JAR files, and ZIP archives separated by colons (:) to search for boot class files\&. These are used in place of the boot class files included in the JDK\&. +.sp +Do not deploy applications that use this option to override a class in +\fBrt\&.jar\fR, because this violates the JRE binary code license\&. +.RE +.PP +\-Xbootclasspath/a:\fIpath\fR +.RS 4 +Specifies a list of directories, JAR files, and ZIP archives separated by colons (:) to append to the end of the default bootstrap class path\&. +.sp +Do not deploy applications that use this option to override a class in +\fBrt\&.jar\fR, because this violates the JRE binary code license\&. +.RE +.PP +\-Xbootclasspath/p:\fIpath\fR +.RS 4 +Specifies a list of directories, JAR files, and ZIP archives separated by colons (:) to prepend to the front of the default bootstrap class path\&. +.sp +Do not deploy applications that use this option to override a class in +\fBrt\&.jar\fR, because this violates the JRE binary code license\&. +.RE +.PP +\-Xcheck:jni +.RS 4 +Performs additional checks for Java Native Interface (JNI) functions\&. Specifically, it validates the parameters passed to the JNI function and the runtime environment data before processing the JNI request\&. Any invalid data encountered indicates a problem in the native code, and the JVM will terminate with an irrecoverable error in such cases\&. Expect a performance degradation when this option is used\&. +.RE +.PP +\-Xcomp +.RS 4 +Forces compilation of methods on first invocation\&. By default, the Client VM (\fB\-client\fR) performs 1,000 interpreted method invocations and the Server VM (\fB\-server\fR) performs 10,000 interpreted method invocations to gather information for efficient compilation\&. Specifying the +\fB\-Xcomp\fR +option disables interpreted method invocations to increase compilation performance at the expense of efficiency\&. +.sp +You can also change the number of interpreted method invocations before compilation using the +\fB\-XX:CompileThreshold\fR +option\&. +.RE +.PP +\-Xdebug +.RS 4 +Does nothing\&. Provided for backward compatibility\&. +.RE +.PP +\-Xdiag +.RS 4 +Shows additional diagnostic messages\&. +.RE +.PP +\-Xfuture +.RS 4 +Enables strict class\-file format checks that enforce close conformance to the class\-file format specification\&. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases\&. +.RE +.PP +\-Xint +.RS 4 +Runs the application in interpreted\-only mode\&. Compilation to native code is disabled, and all bytecode is executed by the interpreter\&. The performance benefits offered by the just in time (JIT) compiler are not present in this mode\&. +.RE +.PP +\-Xinternalversion +.RS 4 +Displays more detailed JVM version information than the +\fB\-version\fR +option, and then exits\&. +.RE +.PP +\-Xloggc:\fIfilename\fR +.RS 4 +Sets the file to which verbose GC events information should be redirected for logging\&. The information written to this file is similar to the output of +\fB\-verbose:gc\fR +with the time elapsed since the first GC event preceding each logged event\&. The +\fB\-Xloggc\fR +option overrides +\fB\-verbose:gc\fR +if both are given with the same +\fBjava\fR +command\&. +.sp +Example: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-Xloggc:garbage\-collection\&.log\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-Xmaxjitcodesize=\fIsize\fR +.RS 4 +Specifies the maximum code cache size (in bytes) for JIT\-compiled code\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default maximum code cache size is 240 MB; if you disable tiered compilation with the option +\fB\-XX:\-TieredCompilation\fR, then the default size is 48 MB: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-Xmaxjitcodesize=240m\fR + +.fi +.if n \{\ +.RE +.\} +This option is equivalent to +\fB\-XX:ReservedCodeCacheSize\fR\&. +.RE +.PP +\-Xmixed +.RS 4 +Executes all bytecode by the interpreter except for hot methods, which are compiled to native code\&. +.RE +.PP +\-Xmn\fIsize\fR +.RS 4 +Sets the initial and maximum size (in bytes) of the heap for the young generation (nursery)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. +.sp +The young generation region of the heap is used for new objects\&. GC is performed in this region more often than in other regions\&. If the size for the young generation is too small, then a lot of minor garbage collections will be performed\&. If the size is too large, then only full garbage collections will be performed, which can take a long time to complete\&. Oracle recommends that you keep the size for the young generation between a half and a quarter of the overall heap size\&. +.sp +The following examples show how to set the initial and maximum size of young generation to 256 MB using various units: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-Xmn256m\fR +\fB\-Xmn262144k\fR +\fB\-Xmn268435456\fR + +.fi +.if n \{\ +.RE +.\} +Instead of the +\fB\-Xmn\fR +option to set both the initial and maximum size of the heap for the young generation, you can use +\fB\-XX:NewSize\fR +to set the initial size and +\fB\-XX:MaxNewSize\fR +to set the maximum size\&. +.RE +.PP +\-Xms\fIsize\fR +.RS 4 +Sets the initial size (in bytes) of the heap\&. This value must be a multiple of 1024 and greater than 1 MB\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. +.sp The following examples show how to set the size of allocated memory to 6 MB using various units: -.sp -.nf -\f3\-XX:InitialHeapSize=6291456\fP -.fi -.nf -\f3\-XX:InitialHeapSize=6144k\fP -.fi -.nf -\f3\-XX:InitialHeapSize=6m\fP -.fi -.nf -\f3\fP -.fi -.sp - - -If you set this option to 0, then the initial size will be set as the sum of the sizes allocated for the old generation and the young generation\&. The size of the heap for the young generation can be set using the \f3-XX:NewSize\fR option\&. -.TP --XX:InitialSurvivorRatio=\fIratio\fR -.br -Sets the initial survivor space ratio used by the throughput garbage collector (which is enabled by the \f3-XX:+UseParallelGC\fR and/or -\f3XX:+UseParallelOldGC\fR options)\&. Adaptive sizing is enabled by default with the throughput garbage collector by using the \f3-XX:+UseParallelGC\fR and \f3-XX:+UseParallelOldGC\fR options, and survivor space is resized according to the application behavior, starting with the initial value\&. If adaptive sizing is disabled (using the \f3-XX:-UseAdaptiveSizePolicy\fR option), then the \f3-XX:SurvivorRatio\fR option should be used to set the size of the survivor space for the entire execution of the application\&. - -The following formula can be used to calculate the initial size of survivor space (S) based on the size of the young generation (Y), and the initial survivor space ratio (R): -.sp -.nf -\f3S=Y/(R+2)\fP -.fi -.nf -\f3\fP -.fi -.sp - - -The 2 in the equation denotes two survivor spaces\&. The larger the value specified as the initial survivor space ratio, the smaller the initial survivor space size\&. - -By default, the initial survivor space ratio is set to 8\&. If the default value for the young generation space size is used (2 MB), the initial size of the survivor space will be 0\&.2 MB\&. - -The following example shows how to set the initial survivor space ratio to 4: -.sp -.nf -\f3\-XX:InitialSurvivorRatio=4\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:InitiatingHeapOccupancyPercent=\fIpercent\fR -.br -Sets the percentage of the heap occupancy (0 to 100) at which to start a concurrent GC cycle\&. It is used by garbage collectors that trigger a concurrent GC cycle based on the occupancy of the entire heap, not just one of the generations (for example, the G1 garbage collector)\&. - -By default, the initiating value is set to 45%\&. A value of 0 implies nonstop GC cycles\&. The following example shows how to set the initiating heap occupancy to 75%: -.sp -.nf -\f3\-XX:InitiatingHeapOccupancyPercent=75\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxGCPauseMillis=\fItime\fR -.br -Sets a target for the maximum GC pause time (in milliseconds)\&. This is a soft goal, and the JVM will make its best effort to achieve it\&. By default, there is no maximum pause time value\&. - -The following example shows how to set the maximum target pause time to 500 ms: -.sp -.nf -\f3\-XX:MaxGCPauseMillis=500\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxHeapSize=\fIsize\fR -.br -Sets the maximum size (in byes) of the memory allocation pool\&. This value must be a multiple of 1024 and greater than 2 MB\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. The default value is chosen at runtime based on system configuration\&. For server deployments, \f3-XX:InitialHeapSize\fR and \f3-XX:MaxHeapSize\fR are often set to the same value\&. For more information, see Garbage Collector Ergonomics at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gc-ergonomics\&.html - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-Xms6291456\fR +\fB\-Xms6144k\fR +\fB\-Xms6m\fR + +.fi +.if n \{\ +.RE +.\} +If you do not set this option, then the initial size will be set as the sum of the sizes allocated for the old generation and the young generation\&. The initial size of the heap for the young generation can be set using the +\fB\-Xmn\fR +option or the +\fB\-XX:NewSize\fR +option\&. +.RE +.PP +\-Xmx\fIsize\fR +.RS 4 +Specifies the maximum size (in bytes) of the memory allocation pool in bytes\&. This value must be a multiple of 1024 and greater than 2 MB\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default value is chosen at runtime based on system configuration\&. For server deployments, +\fB\-Xms\fR +and +\fB\-Xmx\fR +are often set to the same value\&. See the section "Ergonomics" in +\fIJava SE HotSpot Virtual Machine Garbage Collection Tuning Guide\fR +at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gctuning/index\&.html\&. +.sp The following examples show how to set the maximum allowed size of allocated memory to 80 MB using various units: -.sp -.nf -\f3\-XX:MaxHeapSize=83886080\fP -.fi -.nf -\f3\-XX:MaxHeapSize=81920k\fP -.fi -.nf -\f3\-XX:MaxHeapSize=80m\fP -.fi -.nf -\f3\fP -.fi -.sp - - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-Xmx83886080\fR +\fB\-Xmx81920k\fR +\fB\-Xmx80m\fR + +.fi +.if n \{\ +.RE +.\} +The +\fB\-Xmx\fR +option is equivalent to +\fB\-XX:MaxHeapSize\fR\&. +.RE +.PP +\-Xnoclassgc +.RS 4 +Disables garbage collection (GC) of classes\&. This can save some GC time, which shortens interruptions during the application run\&. +.sp +When you specify +\fB\-Xnoclassgc\fR +at startup, the class objects in the application will be left untouched during GC and will always be considered live\&. This can result in more memory being permanently occupied which, if not used carefully, will throw an out of memory exception\&. +.RE +.PP +\-Xprof +.RS 4 +Profiles the running program and sends profiling data to standard output\&. This option is provided as a utility that is useful in program development and is not intended to be used in production systems\&. +.RE +.PP +\-Xrs +.RS 4 +Reduces the use of operating system signals by the JVM\&. +.sp +Shutdown hooks enable orderly shutdown of a Java application by running user cleanup code (such as closing database connections) at shutdown, even if the JVM terminates abruptly\&. +.sp +The JVM catches signals to implement shutdown hooks for unexpected termination\&. The JVM uses +\fBSIGHUP\fR, +\fBSIGINT\fR, and +\fBSIGTERM\fR +to initiate the running of shutdown hooks\&. +.sp +The JVM uses a similar mechanism to implement the feature of dumping thread stacks for debugging purposes\&. The JVM uses +\fBSIGQUIT\fR +to perform thread dumps\&. +.sp +Applications embedding the JVM frequently need to trap signals such as +\fBSIGINT\fR +or +\fBSIGTERM\fR, which can lead to interference with the JVM signal handlers\&. The +\fB\-Xrs\fR +option is available to address this issue\&. When +\fB\-Xrs\fR +is used, the signal masks for +\fBSIGINT\fR, +\fBSIGTERM\fR, +\fBSIGHUP\fR, and +\fBSIGQUIT\fR +are not changed by the JVM, and signal handlers for these signals are not installed\&. +.sp +There are two consequences of specifying +\fB\-Xrs\fR: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBSIGQUIT\fR +thread dumps are not available\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +User code is responsible for causing shutdown hooks to run, for example, by calling +\fBSystem\&.exit()\fR +when the JVM is to be terminated\&. +.RE +.RE +.PP +\-Xshare:\fImode\fR +.RS 4 +Sets the class data sharing (CDS) mode\&. Possible +\fImode\fR +arguments for this option include the following: +.PP +auto +.RS 4 +Use CDS if possible\&. This is the default value for Java HotSpot 32\-Bit Client VM\&. +.RE +.PP +on +.RS 4 +Require the use of CDS\&. Print an error message and exit if class data sharing cannot be used\&. +.RE +.PP +off +.RS 4 +Do not use CDS\&. This is the default value for Java HotSpot 32\-Bit Server VM, Java HotSpot 64\-Bit Client VM, and Java HotSpot 64\-Bit Server VM\&. +.RE +.PP +dump +.RS 4 +Manually generate the CDS archive\&. Specify the application class path as described in "Setting the Class Path "\&. +.sp +You should regenerate the CDS archive with each new JDK release\&. +.RE +.RE +.PP +\-XshowSettings:\fIcategory\fR +.RS 4 +Shows settings and continues\&. Possible +\fIcategory\fR +arguments for this option include the following: +.PP +all +.RS 4 +Shows all categories of settings\&. This is the default value\&. +.RE +.PP +locale +.RS 4 +Shows settings related to locale\&. +.RE +.PP +properties +.RS 4 +Shows settings related to system properties\&. +.RE +.PP +vm +.RS 4 +Shows the settings of the JVM\&. +.RE +.RE +.PP +\-Xss\fIsize\fR +.RS 4 +Sets the thread stack size (in bytes)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate KB, +\fBm\fR +or +\fBM\fR +to indicate MB, +\fBg\fR +or +\fBG\fR +to indicate GB\&. The default value depends on the platform: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Linux/ARM (32\-bit): 320 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Linux/i386 (32\-bit): 320 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Linux/x64 (64\-bit): 1024 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +OS X (64\-bit): 1024 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Oracle Solaris/i386 (32\-bit): 320 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Oracle Solaris/x64 (64\-bit): 1024 KB +.RE +.sp +The following examples set the thread stack size to 1024 KB in different units: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-Xss1m\fR +\fB\-Xss1024k\fR +\fB\-Xss1048576\fR + +.fi +.if n \{\ +.RE +.\} +This option is equivalent to +\fB\-XX:ThreadStackSize\fR\&. +.RE +.PP +\-Xusealtsigs +.RS 4 +Use alternative signals instead of +\fBSIGUSR1\fR +and +\fBSIGUSR2\fR +for JVM internal signals\&. This option is equivalent to +\fB\-XX:+UseAltSigs\fR\&. +.RE +.PP +\-Xverify:\fImode\fR +.RS 4 +Sets the mode of the bytecode verifier\&. Bytecode verification helps to troubleshoot some problems, but it also adds overhead to the running application\&. Possible +\fImode\fR +arguments for this option include the following: +.PP +none +.RS 4 +Do not verify the bytecode\&. This reduces startup time and also reduces the protection provided by Java\&. +.RE +.PP +remote +.RS 4 +Verify those classes that are not loaded by the bootstrap class loader\&. This is the default behavior if you do not specify the +\fB\-Xverify\fR +option\&. +.RE +.PP +all +.RS 4 +Verify all classes\&. +.RE +.RE +.SS "Advanced Runtime Options" +.PP +These options control the runtime behavior of the Java HotSpot VM\&. +.PP +\-XX:+CheckEndorsedAndExtDirs +.RS 4 +Enables the option to prevent the +\fBjava\fR +command from running a Java application if it uses the endorsed\-standards override mechanism or the extension mechanism\&. This option checks if an application is using one of these mechanisms by checking the following: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The +\fBjava\&.ext\&.dirs\fR +or +\fBjava\&.endorsed\&.dirs\fR +system property is set\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The +\fBlib/endorsed\fR +directory exists and is not empty\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The +\fBlib/ext\fR +directory contains any JAR files other than those of the JDK\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The system\-wide platform\-specific extension directory contains any JAR files\&. +.RE +.RE +.PP +\-XX:+DisableAttachMechanism +.RS 4 +Enables the option that disables the mechanism that lets tools attach to the JVM\&. By default, this option is disabled, meaning that the attach mechanism is enabled and you can use tools such as +\fBjcmd\fR, +\fBjstack\fR, +\fBjmap\fR, and +\fBjinfo\fR\&. +.RE +.PP +\-XX:ErrorFile=\fIfilename\fR +.RS 4 +Specifies the path and file name to which error data is written when an irrecoverable error occurs\&. By default, this file is created in the current working directory and named +\fBhs_err_pid\fR\fIpid\fR\fB\&.log\fR +where +\fIpid\fR +is the identifier of the process that caused the error\&. The following example shows how to set the default log file (note that the identifier of the process is specified as +\fB%p\fR): +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:ErrorFile=\&./hs_err_pid%p\&.log\fR + +.fi +.if n \{\ +.RE +.\} +The following example shows how to set the error log to +\fB/var/log/java/java_error\&.log\fR: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:ErrorFile=/var/log/java/java_error\&.log\fR + +.fi +.if n \{\ +.RE +.\} +If the file cannot be created in the specified directory (due to insufficient space, permission problem, or another issue), then the file is created in the temporary directory for the operating system\&. The temporary directory is +\fB/tmp\fR\&. +.RE +.PP +\-XX:+FailOverToOldVerifier +.RS 4 +Enables automatic failover to the old verifier when the new type checker fails\&. By default, this option is disabled and it is ignored (that is, treated as disabled) for classes with a recent bytecode version\&. You can enable it for classes with older versions of the bytecode\&. +.RE +.PP +\-XX:LargePageSizeInBytes=\fIsize\fR +.RS 4 +On Solaris, sets the maximum size (in bytes) for large pages used for Java heap\&. The +\fIsize\fR +argument must be a power of 2 (2, 4, 8, 16, \&.\&.\&.)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. By default, the size is set to 0, meaning that the JVM chooses the size for large pages automatically\&. +.sp +The following example illustrates how to set the large page size to 4 megabytes (MB): +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:LargePageSizeInBytes=4m\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxDirectMemorySize=\fIsize\fR +.RS 4 +Sets the maximum total size (in bytes) of the New I/O (the +\fBjava\&.nio\fR +package) direct\-buffer allocations\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. By default, the size is set to 0, meaning that the JVM chooses the size for NIO direct\-buffer allocations automatically\&. +.sp +The following examples illustrate how to set the NIO size to 1024 KB in different units: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxDirectMemorySize=1m\fR +\fB\-XX:MaxDirectMemorySize=1024k\fR +\fB\-XX:MaxDirectMemorySize=1048576\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:NativeMemoryTracking=\fImode\fR +.RS 4 +Specifies the mode for tracking JVM native memory usage\&. Possible +\fImode\fR +arguments for this option include the following: +.PP +off +.RS 4 +Do not track JVM native memory usage\&. This is the default behavior if you do not specify the +\fB\-XX:NativeMemoryTracking\fR +option\&. +.RE +.PP +summary +.RS 4 +Only track memory usage by JVM subsystems, such as Java heap, class, code, and thread\&. +.RE +.PP +detail +.RS 4 +In addition to tracking memory usage by JVM subsystems, track memory usage by individual +\fBCallSite\fR, individual virtual memory region and its committed regions\&. +.RE +.RE +.PP +\-XX:ObjectAlignmentInBytes=\fIalignment\fR +.RS 4 +Sets the memory alignment of Java objects (in bytes)\&. By default, the value is set to 8 bytes\&. The specified value should be a power of two, and must be within the range of 8 and 256 (inclusive)\&. This option makes it possible to use compressed pointers with large Java heap sizes\&. +.sp +The heap size limit in bytes is calculated as: +.sp +\fB4GB * ObjectAlignmentInBytes\fR +.sp +Note: As the alignment value increases, the unused space between objects will also increase\&. As a result, you may not realize any benefits from using compressed pointers with large Java heap sizes\&. +.RE +.PP +\-XX:OnError=\fIstring\fR +.RS 4 +Sets a custom command or a series of semicolon\-separated commands to run when an irrecoverable error occurs\&. If the string contains spaces, then it must be enclosed in quotation marks\&. +.sp +The following example shows how the +\fB\-XX:OnError\fR +option can be used to run the +\fBgcore\fR +command to create the core image, and the debugger is started to attach to the process in case of an irrecoverable error (the +\fB%p\fR +designates the current process): +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:OnError="gcore %p;dbx \- %p"\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:OnOutOfMemoryError=\fIstring\fR +.RS 4 +Sets a custom command or a series of semicolon\-separated commands to run when an +\fBOutOfMemoryError\fR +exception is first thrown\&. If the string contains spaces, then it must be enclosed in quotation marks\&. For an example of a command string, see the description of the +\fB\-XX:OnError\fR +option\&. +.RE +.PP +\-XX:+PerfDataSaveToFile +.RS 4 +If enabled, saves +jstat(1) binary data when the Java application exits\&. This binary data is saved in a file named +\fBhsperfdata_\fR\fI\fR, where +\fI\fR +is the process identifier of the Java application you ran\&. Use +\fBjstat\fR +to display the performance data contained in this file as follows: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBjstat \-class file:///\fR\fB\fI\fR\fR\fB/hsperfdata_\fR\fB\fI\fR\fR +\fBjstat \-gc file:///\fR\fB\fI\fR\fR\fB/hsperfdata_\fR\fB\fI\fR\fR +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+PrintCommandLineFlags +.RS 4 +Enables printing of ergonomically selected JVM flags that appeared on the command line\&. It can be useful to know the ergonomic values set by the JVM, such as the heap space size and the selected garbage collector\&. By default, this option is disabled and flags are not printed\&. +.RE +.PP +\-XX:+PrintNMTStatistics +.RS 4 +Enables printing of collected native memory tracking data at JVM exit when native memory tracking is enabled (see +\fB\-XX:NativeMemoryTracking\fR)\&. By default, this option is disabled and native memory tracking data is not printed\&. +.RE +.PP +\-XX:+RelaxAccessControlCheck +.RS 4 +Decreases the amount of access control checks in the verifier\&. By default, this option is disabled, and it is ignored (that is, treated as disabled) for classes with a recent bytecode version\&. You can enable it for classes with older versions of the bytecode\&. +.RE +.PP +\-XX:+ShowMessageBoxOnError +.RS 4 +Enables displaying of a dialog box when the JVM experiences an irrecoverable error\&. This prevents the JVM from exiting and keeps the process active so that you can attach a debugger to it to investigate the cause of the error\&. By default, this option is disabled\&. +.RE +.PP +\-XX:ThreadStackSize=\fIsize\fR +.RS 4 +Sets the thread stack size (in bytes)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default value depends on the platform: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Linux/ARM (32\-bit): 320 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Linux/i386 (32\-bit): 320 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Linux/x64 (64\-bit): 1024 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +OS X (64\-bit): 1024 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Oracle Solaris/i386 (32\-bit): 320 KB +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Oracle Solaris/x64 (64\-bit): 1024 KB +.RE +.sp +The following examples show how to set the thread stack size to 1024 KB in different units: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:ThreadStackSize=1m\fR +\fB\-XX:ThreadStackSize=1024k\fR +\fB\-XX:ThreadStackSize=1048576\fR + +.fi +.if n \{\ +.RE +.\} +This option is equivalent to +\fB\-Xss\fR\&. +.RE +.PP +\-XX:+TraceClassLoading +.RS 4 +Enables tracing of classes as they are loaded\&. By default, this option is disabled and classes are not traced\&. +.RE +.PP +\-XX:+TraceClassLoadingPreorder +.RS 4 +Enables tracing of all loaded classes in the order in which they are referenced\&. By default, this option is disabled and classes are not traced\&. +.RE +.PP +\-XX:+TraceClassResolution +.RS 4 +Enables tracing of constant pool resolutions\&. By default, this option is disabled and constant pool resolutions are not traced\&. +.RE +.PP +\-XX:+TraceClassUnloading +.RS 4 +Enables tracing of classes as they are unloaded\&. By default, this option is disabled and classes are not traced\&. +.RE +.PP +\-XX:+TraceLoaderConstraints +.RS 4 +Enables tracing of the loader constraints recording\&. By default, this option is disabled and loader constraints recording is not traced\&. +.RE +.PP +\-XX:+UseAltSigs +.RS 4 +Enables the use of alternative signals instead of +\fBSIGUSR1\fR +and +\fBSIGUSR2\fR +for JVM internal signals\&. By default, this option is disabled and alternative signals are not used\&. This option is equivalent to +\fB\-Xusealtsigs\fR\&. +.RE +.PP +\-XX:\-UseBiasedLocking +.RS 4 +Disables the use of biased locking\&. Some applications with significant amounts of uncontended synchronization may attain significant speedups with this flag enabled, whereas applications with certain patterns of locking may see slowdowns\&. For more information about the biased locking technique, see the example in Java Tuning White Paper at http://www\&.oracle\&.com/technetwork/java/tuning\-139912\&.html#section4\&.2\&.5 +.sp +By default, this option is enabled\&. +.RE +.PP +\-XX:\-UseCompressedOops +.RS 4 +Disables the use of compressed pointers\&. By default, this option is enabled, and compressed pointers are used when Java heap sizes are less than 32 GB\&. When this option is enabled, object references are represented as 32\-bit offsets instead of 64\-bit pointers, which typically increases performance when running the application with Java heap sizes less than 32 GB\&. This option works only for 64\-bit JVMs\&. +.sp +It is also possible to use compressed pointers when Java heap sizes are greater than 32GB\&. See the +\fB\-XX:ObjectAlignmentInBytes\fR +option\&. +.RE +.PP +\-XX:+UseHugeTLBFS +.RS 4 +This option for Linux is the equivalent of specifying +\fB\-XX:+UseLargePages\fR\&. This option is disabled by default\&. This option pre\-allocates all large pages up\-front, when memory is reserved; consequently the JVM cannot dynamically grow or shrink large pages memory areas; see +\fB\-XX:UseTransparentHugePages\fR +if you want this behavior\&. +.sp +For more information, see "Large Pages"\&. +.RE +.PP +\-XX:+UseLargePages +.RS 4 +Enables the use of large page memory\&. By default, this option is disabled and large page memory is not used\&. +.sp +For more information, see "Large Pages"\&. +.RE +.PP +\-XX:+UseMembar +.RS 4 +Enables issuing of membars on thread state transitions\&. This option is disabled by default on all platforms except ARM servers, where it is enabled\&. (It is recommended that you do not disable this option on ARM servers\&.) +.RE +.PP +\-XX:+UsePerfData +.RS 4 +Enables the +\fBperfdata\fR +feature\&. This option is enabled by default to allow JVM monitoring and performance testing\&. Disabling it suppresses the creation of the +\fBhsperfdata_userid\fR +directories\&. To disable the +\fBperfdata\fR +feature, specify +\fB\-XX:\-UsePerfData\fR\&. +.RE +.PP +\-XX:+UseTransparentHugePages +.RS 4 +On Linux, enables the use of large pages that can dynamically grow or shrink\&. This option is disabled by default\&. You may encounter performance problems with transparent huge pages as the OS moves other pages around to create huge pages; this option is made available for experimentation\&. +.sp +For more information, see "Large Pages"\&. +.RE +.PP +\-XX:+AllowUserSignalHandlers +.RS 4 +Enables installation of signal handlers by the application\&. By default, this option is disabled and the application is not allowed to install signal handlers\&. +.RE +.SS "Advanced JIT Compiler Options" +.PP +These options control the dynamic just\-in\-time (JIT) compilation performed by the Java HotSpot VM\&. +.PP +\-XX:+AggressiveOpts +.RS 4 +Enables the use of aggressive performance optimization features, which are expected to become default in upcoming releases\&. By default, this option is disabled and experimental performance features are not used\&. +.RE +.PP +\-XX:AllocateInstancePrefetchLines=\fIlines\fR +.RS 4 +Sets the number of lines to prefetch ahead of the instance allocation pointer\&. By default, the number of lines to prefetch is set to 1: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:AllocateInstancePrefetchLines=1\fR + +.fi +.if n \{\ +.RE +.\} +Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:AllocatePrefetchDistance=\fIsize\fR +.RS 4 +Sets the size (in bytes) of the prefetch distance for object allocation\&. Memory about to be written with the value of new objects is prefetched up to this distance starting from the address of the last allocated object\&. Each Java thread has its own allocation point\&. +.sp +Negative values denote that prefetch distance is chosen based on the platform\&. Positive values are bytes to prefetch\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default value is set to \-1\&. +.sp +The following example shows how to set the prefetch distance to 1024 bytes: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:AllocatePrefetchDistance=1024\fR + +.fi +.if n \{\ +.RE +.\} +Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:AllocatePrefetchInstr=\fIinstruction\fR +.RS 4 +Sets the prefetch instruction to prefetch ahead of the allocation pointer\&. Only the Java HotSpot Server VM supports this option\&. Possible values are from 0 to 3\&. The actual instructions behind the values depend on the platform\&. By default, the prefetch instruction is set to 0: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:AllocatePrefetchInstr=0\fR + +.fi +.if n \{\ +.RE +.\} +Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:AllocatePrefetchLines=\fIlines\fR +.RS 4 +Sets the number of cache lines to load after the last object allocation by using the prefetch instructions generated in compiled code\&. The default value is 1 if the last allocated object was an instance, and 3 if it was an array\&. +.sp +The following example shows how to set the number of loaded cache lines to 5: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:AllocatePrefetchLines=5\fR + +.fi +.if n \{\ +.RE +.\} +Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:AllocatePrefetchStepSize=\fIsize\fR +.RS 4 +Sets the step size (in bytes) for sequential prefetch instructions\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. By default, the step size is set to 16 bytes: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:AllocatePrefetchStepSize=16\fR + +.fi +.if n \{\ +.RE +.\} +Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:AllocatePrefetchStyle=\fIstyle\fR +.RS 4 +Sets the generated code style for prefetch instructions\&. The +\fIstyle\fR +argument is an integer from 0 to 3: +.PP +0 +.RS 4 +Do not generate prefetch instructions\&. +.RE +.PP +1 +.RS 4 +Execute prefetch instructions after each allocation\&. This is the default parameter\&. +.RE +.PP +2 +.RS 4 +Use the thread\-local allocation block (TLAB) watermark pointer to determine when prefetch instructions are executed\&. +.RE +.PP +3 +.RS 4 +Use BIS instruction on SPARC for allocation prefetch\&. +.RE +.sp +Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:+BackgroundCompilation +.RS 4 +Enables background compilation\&. This option is enabled by default\&. To disable background compilation, specify +\fB\-XX:\-BackgroundCompilation\fR +(this is equivalent to specifying +\fB\-Xbatch\fR)\&. +.RE +.PP +\-XX:CICompilerCount=\fIthreads\fR +.RS 4 +Sets the number of compiler threads to use for compilation\&. By default, the number of threads is set to 2 for the server JVM, to 1 for the client JVM, and it scales to the number of cores if tiered compilation is used\&. The following example shows how to set the number of threads to 2: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CICompilerCount=2\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:CodeCacheMinimumFreeSpace=\fIsize\fR +.RS 4 +Sets the minimum free space (in bytes) required for compilation\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. When less than the minimum free space remains, compiling stops\&. By default, this option is set to 500 KB\&. The following example shows how to set the minimum free space to 1024 MB: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CodeCacheMinimumFreeSpace=1024m\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:CompileCommand=\fIcommand\fR,\fImethod\fR[,\fIoption\fR] +.RS 4 +Specifies a command to perform on a method\&. For example, to exclude the +\fBindexOf()\fR +method of the +\fBString\fR +class from being compiled, use the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileCommand=exclude,java/lang/String\&.indexOf\fR + +.fi +.if n \{\ +.RE +.\} +Note that the full class name is specified, including all packages and subpackages separated by a slash (\fB/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the +\fB\-XX:+PrintCompilation\fR +and +\fB\-XX:+LogCompilation\fR +options: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileCommand=exclude,java\&.lang\&.String::indexOf\fR + +.fi +.if n \{\ +.RE +.\} +If the method is specified without the signature, the command will be applied to all methods with the specified name\&. However, you can also specify the signature of the method in the class file format\&. In this case, you should enclose the arguments in quotation marks, because otherwise the shell treats the semicolon as command end\&. For example, if you want to exclude only the +\fBindexOf(String)\fR +method of the +\fBString\fR +class from being compiled, use the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileCommand="exclude,java/lang/String\&.indexOf,(Ljava/lang/String;)I"\fR + +.fi +.if n \{\ +.RE +.\} +You can also use the asterisk (*) as a wildcard for class and method names\&. For example, to exclude all +\fBindexOf()\fR +methods in all classes from being compiled, use the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileCommand=exclude,*\&.indexOf\fR + +.fi +.if n \{\ +.RE +.\} +The commas and periods are aliases for spaces, making it easier to pass compiler commands through a shell\&. You can pass arguments to +\fB\-XX:CompileCommand\fR +using spaces as separators by enclosing the argument in quotation marks: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileCommand="exclude java/lang/String indexOf"\fR + +.fi +.if n \{\ +.RE +.\} +Note that after parsing the commands passed on the command line using the +\fB\-XX:CompileCommand\fR +options, the JIT compiler then reads commands from the +\fB\&.hotspot_compiler\fR +file\&. You can add commands to this file or specify a different file using the +\fB\-XX:CompileCommandFile\fR +option\&. +.sp +To add several commands, either specify the +\fB\-XX:CompileCommand\fR +option multiple times, or separate each argument with the newline separator (\fB\en\fR)\&. The following commands are available: +.PP +break +.RS 4 +Set a breakpoint when debugging the JVM to stop at the beginning of compilation of the specified method\&. +.RE +.PP +compileonly +.RS 4 +Exclude all methods from compilation except for the specified method\&. As an alternative, you can use the +\fB\-XX:CompileOnly\fR +option, which allows to specify several methods\&. +.RE +.PP +dontinline +.RS 4 +Prevent inlining of the specified method\&. +.RE +.PP +exclude +.RS 4 +Exclude the specified method from compilation\&. +.RE +.PP +help +.RS 4 +Print a help message for the +\fB\-XX:CompileCommand\fR +option\&. +.RE +.PP +inline +.RS 4 +Attempt to inline the specified method\&. +.RE +.PP +log +.RS 4 +Exclude compilation logging (with the +\fB\-XX:+LogCompilation\fR +option) for all methods except for the specified method\&. By default, logging is performed for all compiled methods\&. +.RE +.PP +option +.RS 4 +This command can be used to pass a JIT compilation option to the specified method in place of the last argument (\fIoption\fR)\&. The compilation option is set at the end, after the method name\&. For example, to enable the +\fBBlockLayoutByFrequency\fR +option for the +\fBappend()\fR +method of the +\fBStringBuffer\fR +class, use the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileCommand=option,java/lang/StringBuffer\&.append,BlockLayoutByFrequency\fR + +.fi +.if n \{\ +.RE +.\} +You can specify multiple compilation options, separated by commas or spaces\&. +.RE +.PP +print +.RS 4 +Print generated assembler code after compilation of the specified method\&. +.RE +.PP +quiet +.RS 4 +Do not print the compile commands\&. By default, the commands that you specify with the \-\fBXX:CompileCommand\fR +option are printed; for example, if you exclude from compilation the +\fBindexOf()\fR +method of the +\fBString\fR +class, then the following will be printed to standard output: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBCompilerOracle: exclude java/lang/String\&.indexOf\fR + +.fi +.if n \{\ +.RE +.\} +You can suppress this by specifying the +\fB\-XX:CompileCommand=quiet\fR +option before other +\fB\-XX:CompileCommand\fR +options\&. +.RE +.RE +.PP +\-XX:CompileCommandFile=\fIfilename\fR +.RS 4 +Sets the file from which JIT compiler commands are read\&. By default, the +\fB\&.hotspot_compiler\fR +file is used to store commands performed by the JIT compiler\&. +.sp +Each line in the command file represents a command, a class name, and a method name for which the command is used\&. For example, this line prints assembly code for the +\fBtoString()\fR +method of the +\fBString\fR +class: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBprint java/lang/String toString\fR + +.fi +.if n \{\ +.RE +.\} +For more information about specifying the commands for the JIT compiler to perform on methods, see the +\fB\-XX:CompileCommand\fR +option\&. +.RE +.PP +\-XX:CompileOnly=\fImethods\fR +.RS 4 +Sets the list of methods (separated by commas) to which compilation should be restricted\&. Only the specified methods will be compiled\&. Specify each method with the full class name (including the packages and subpackages)\&. For example, to compile only the +\fBlength()\fR +method of the +\fBString\fR +class and the +\fBsize()\fR +method of the +\fBList\fR +class, use the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileOnly=java/lang/String\&.length,java/util/List\&.size\fR + +.fi +.if n \{\ +.RE +.\} +Note that the full class name is specified, including all packages and subpackages separated by a slash (\fB/\fR)\&. For easier cut and paste operations, it is also possible to use the method name format produced by the +\fB\-XX:+PrintCompilation\fR +and +\fB\-XX:+LogCompilation\fR +options: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileOnly=java\&.lang\&.String::length,java\&.util\&.List::size\fR + +.fi +.if n \{\ +.RE +.\} +Although wildcards are not supported, you can specify only the class or package name to compile all methods in that class or package, as well as specify just the method to compile methods with this name in any class: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileOnly=java/lang/String\fR +\fB\-XX:CompileOnly=java/lang\fR +\fB\-XX:CompileOnly=\&.length\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:CompileThreshold=\fIinvocations\fR +.RS 4 +Sets the number of interpreted method invocations before compilation\&. By default, in the server JVM, the JIT compiler performs 10,000 interpreted method invocations to gather information for efficient compilation\&. For the client JVM, the default setting is 1,500 invocations\&. This option is ignored when tiered compilation is enabled; see the option +\fB\-XX:+TieredCompilation\fR\&. The following example shows how to set the number of interpreted method invocations to 5,000: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CompileThreshold=5000\fR + +.fi +.if n \{\ +.RE +.\} +You can completely disable interpretation of Java methods before compilation by specifying the +\fB\-Xcomp\fR +option\&. +.RE +.PP +\-XX:+DoEscapeAnalysis +.RS 4 +Enables the use of escape analysis\&. This option is enabled by default\&. To disable the use of escape analysis, specify +\fB\-XX:\-DoEscapeAnalysis\fR\&. Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:InitialCodeCacheSize=\fIsize\fR +.RS 4 +Sets the initial code cache size (in bytes)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default value is set to 500 KB\&. The initial code cache size should be not less than the system\*(Aqs minimal memory page size\&. The following example shows how to set the initial code cache size to 32 KB: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:InitialCodeCacheSize=32k\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+Inline +.RS 4 +Enables method inlining\&. This option is enabled by default to increase performance\&. To disable method inlining, specify +\fB\-XX:\-Inline\fR\&. +.RE +.PP +\-XX:InlineSmallCode=\fIsize\fR +.RS 4 +Sets the maximum code size (in bytes) for compiled methods that should be inlined\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. Only compiled methods with the size smaller than the specified size will be inlined\&. By default, the maximum code size is set to 1000 bytes: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:InlineSmallCode=1000\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+LogCompilation +.RS 4 +Enables logging of compilation activity to a file named +\fBhotspot\&.log\fR +in the current working directory\&. You can specify a different log file path and name using the +\fB\-XX:LogFile\fR +option\&. +.sp +By default, this option is disabled and compilation activity is not logged\&. The +\fB\-XX:+LogCompilation\fR +option has to be used together with the +\fB\-XX:UnlockDiagnosticVMOptions\fR +option that unlocks diagnostic JVM options\&. +.sp +You can enable verbose diagnostic output with a message printed to the console every time a method is compiled by using the +\fB\-XX:+PrintCompilation\fR +option\&. +.RE +.PP +\-XX:MaxInlineSize=\fIsize\fR +.RS 4 +Sets the maximum bytecode size (in bytes) of a method to be inlined\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. By default, the maximum bytecode size is set to 35 bytes: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxInlineSize=35\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxNodeLimit=\fInodes\fR +.RS 4 +Sets the maximum number of nodes to be used during single method compilation\&. By default, the maximum number of nodes is set to 65,000: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxNodeLimit=65000\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxTrivialSize=\fIsize\fR +.RS 4 +Sets the maximum bytecode size (in bytes) of a trivial method to be inlined\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. By default, the maximum bytecode size of a trivial method is set to 6 bytes: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxTrivialSize=6\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+OptimizeStringConcat +.RS 4 +Enables the optimization of +\fBString\fR +concatenation operations\&. This option is enabled by default\&. To disable the optimization of +\fBString\fR +concatenation operations, specify +\fB\-XX:\-OptimizeStringConcat\fR\&. Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:+PrintAssembly +.RS 4 +Enables printing of assembly code for bytecoded and native methods by using the external +\fBdisassembler\&.so\fR +library\&. This enables you to see the generated code, which may help you to diagnose performance issues\&. +.sp +By default, this option is disabled and assembly code is not printed\&. The +\fB\-XX:+PrintAssembly\fR +option has to be used together with the +\fB\-XX:UnlockDiagnosticVMOptions\fR +option that unlocks diagnostic JVM options\&. +.RE +.PP +\-XX:+PrintCompilation +.RS 4 +Enables verbose diagnostic output from the JVM by printing a message to the console every time a method is compiled\&. This enables you to see which methods actually get compiled\&. By default, this option is disabled and diagnostic output is not printed\&. +.sp +You can also log compilation activity to a file by using the +\fB\-XX:+LogCompilation\fR +option\&. +.RE +.PP +\-XX:+PrintInlining +.RS 4 +Enables printing of inlining decisions\&. This enables you to see which methods are getting inlined\&. +.sp +By default, this option is disabled and inlining information is not printed\&. The +\fB\-XX:+PrintInlining\fR +option has to be used together with the +\fB\-XX:+UnlockDiagnosticVMOptions\fR +option that unlocks diagnostic JVM options\&. +.RE +.PP +\-XX:ReservedCodeCacheSize=\fIsize\fR +.RS 4 +Sets the maximum code cache size (in bytes) for JIT\-compiled code\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default maximum code cache size is 240 MB; if you disable tiered compilation with the option +\fB\-XX:\-TieredCompilation\fR, then the default size is 48 MB\&. This option has a limit of 2 GB; otherwise, an error is generated\&. The maximum code cache size should not be less than the initial code cache size; see the option +\fB\-XX:InitialCodeCacheSize\fR\&. This option is equivalent to +\fB\-Xmaxjitcodesize\fR\&. +.RE +.PP +\-XX:RTMAbortRatio=\fIabort_ratio\fR +.RS 4 +The RTM abort ratio is specified as a percentage (%) of all executed RTM transactions\&. If a number of aborted transactions becomes greater than this ratio, then the compiled code will be deoptimized\&. This ratio is used when the +\fB\-XX:+UseRTMDeopt\fR +option is enabled\&. The default value of this option is 50\&. This means that the compiled code will be deoptimized if 50% of all transactions are aborted\&. +.RE +.PP +\-XX:RTMRetryCount=\fInumber_of_retries\fR +.RS 4 +RTM locking code will be retried, when it is aborted or busy, the number of times specified by this option before falling back to the normal locking mechanism\&. The default value for this option is 5\&. The +\fB\-XX:UseRTMLocking\fR +option must be enabled\&. +.RE +.PP +\-XX:\-TieredCompilation +.RS 4 +Disables the use of tiered compilation\&. By default, this option is enabled\&. Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:+UseAES +.RS 4 +Enables hardware\-based AES intrinsics for Intel, AMD, and SPARC hardware\&. Intel Westmere (2010 and newer), AMD Bulldozer (2011 and newer), and SPARC (T4 and newer) are the supported hardware\&. UseAES is used in conjunction with UseAESIntrinsics\&. +.RE +.PP +\-XX:+UseAESIntrinsics +.RS 4 +UseAES and UseAESIntrinsics flags are enabled by default and are supported only for Java HotSpot Server VM 32\-bit and 64\-bit\&. To disable hardware\-based AES intrinsics, specify +\fB\-XX:\-UseAES \-XX:\-UseAESIntrinsics\fR\&. For example, to enable hardware AES, use the following flags: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:+UseAES \-XX:+UseAESIntrinsics\fR + +.fi +.if n \{\ +.RE +.\} +To support UseAES and UseAESIntrinsics flags for 32\-bit and 64\-bit use +\fB\-server\fR +option to choose Java HotSpot Server VM\&. These flags are not supported on Client VM\&. +.RE +.PP +\-XX:+UseCodeCacheFlushing +.RS 4 +Enables flushing of the code cache before shutting down the compiler\&. This option is enabled by default\&. To disable flushing of the code cache before shutting down the compiler, specify +\fB\-XX:\-UseCodeCacheFlushing\fR\&. +.RE +.PP +\-XX:+UseCondCardMark +.RS 4 +Enables checking of whether the card is already marked before updating the card table\&. This option is disabled by default and should only be used on machines with multiple sockets, where it will increase performance of Java applications that rely heavily on concurrent operations\&. Only the Java HotSpot Server VM supports this option\&. +.RE +.PP +\-XX:+UseRTMDeopt +.RS 4 +Auto\-tunes RTM locking depending on the abort ratio\&. This ratio is specified by +\fB\-XX:RTMAbortRatio\fR +option\&. If the number of aborted transactions exceeds the abort ratio, then the method containing the lock will be deoptimized and recompiled with all locks as normal locks\&. This option is disabled by default\&. The +\fB\-XX:+UseRTMLocking\fR +option must be enabled\&. +.RE +.PP +\-XX:+UseRTMLocking +.RS 4 +Generate Restricted Transactional Memory (RTM) locking code for all inflated locks, with the normal locking mechanism as the fallback handler\&. This option is disabled by default\&. Options related to RTM are only available for the Java HotSpot Server VM on x86 CPUs that support Transactional Synchronization Extensions (TSX)\&. +.sp +RTM is part of Intel\*(Aqs TSX, which is an x86 instruction set extension and facilitates the creation of multithreaded applications\&. RTM introduces the new instructions +\fBXBEGIN\fR, +\fBXABORT\fR, +\fBXEND\fR, and +\fBXTEST\fR\&. The +\fBXBEGIN\fR +and +\fBXEND\fR +instructions enclose a set of instructions to run as a transaction\&. If no conflict is found when running the transaction, the memory and register modifications are committed together at the +\fBXEND\fR +instruction\&. The +\fBXABORT\fR +instruction can be used to explicitly abort a transaction and the +\fBXEND\fR +instruction to check if a set of instructions are being run in a transaction\&. +.sp +A lock on a transaction is inflated when another thread tries to access the same transaction, thereby blocking the thread that did not originally request access to the transaction\&. RTM requires that a fallback set of operations be specified in case a transaction aborts or fails\&. An RTM lock is a lock that has been delegated to the TSX\*(Aqs system\&. +.sp +RTM improves performance for highly contended locks with low conflict in a critical region (which is code that must not be accessed by more than one thread concurrently)\&. RTM also improves the performance of coarse\-grain locking, which typically does not perform well in multithreaded applications\&. (Coarse\-grain locking is the strategy of holding locks for long periods to minimize the overhead of taking and releasing locks, while fine\-grained locking is the strategy of trying to achieve maximum parallelism by locking only when necessary and unlocking as soon as possible\&.) Also, for lightly contended locks that are used by different threads, RTM can reduce false cache line sharing, also known as cache line ping\-pong\&. This occurs when multiple threads from different processors are accessing different resources, but the resources share the same cache line\&. As a result, the processors repeatedly invalidate the cache lines of other processors, which forces them to read from main memory instead of their cache\&. +.RE +.PP +\-XX:+UseSHA +.RS 4 +Enables hardware\-based intrinsics for SHA crypto hash functions for SPARC hardware\&. +\fBUseSHA\fR +is used in conjunction with the +\fBUseSHA1Intrinsics\fR, +\fBUseSHA256Intrinsics\fR, and +\fBUseSHA512Intrinsics\fR +options\&. +.sp +The +\fBUseSHA\fR +and +\fBUseSHA*Intrinsics\fR +flags are enabled by default, and are supported only for Java HotSpot Server VM 64\-bit on SPARC T4 and newer\&. +.sp +This feature is only applicable when using the +\fBsun\&.security\&.provider\&.Sun\fR +provider for SHA operations\&. +.sp +To disable all hardware\-based SHA intrinsics, specify +\fB\-XX:\-UseSHA\fR\&. To disable only a particular SHA intrinsic, use the appropriate corresponding option\&. For example: +\fB\-XX:\-UseSHA256Intrinsics\fR\&. +.RE +.PP +\-XX:+UseSHA1Intrinsics +.RS 4 +Enables intrinsics for SHA\-1 crypto hash function\&. +.RE +.PP +\-XX:+UseSHA256Intrinsics +.RS 4 +Enables intrinsics for SHA\-224 and SHA\-256 crypto hash functions\&. +.RE +.PP +\-XX:+UseSHA512Intrinsics +.RS 4 +Enables intrinsics for SHA\-384 and SHA\-512 crypto hash functions\&. +.RE +.PP +\-XX:+UseSuperWord +.RS 4 +Enables the transformation of scalar operations into superword operations\&. This option is enabled by default\&. To disable the transformation of scalar operations into superword operations, specify +\fB\-XX:\-UseSuperWord\fR\&. Only the Java HotSpot Server VM supports this option\&. +.RE +.SS "Advanced Serviceability Options" +.PP +These options provide the ability to gather system information and perform extensive debugging\&. +.PP +\-XX:+ExtendedDTraceProbes +.RS 4 +Enables additional +\fBdtrace\fR +tool probes that impact the performance\&. By default, this option is disabled and +\fBdtrace\fR +performs only standard probes\&. +.RE +.PP +\-XX:+HeapDumpOnOutOfMemory +.RS 4 +Enables the dumping of the Java heap to a file in the current directory by using the heap profiler (HPROF) when a +\fBjava\&.lang\&.OutOfMemoryError\fR +exception is thrown\&. You can explicitly set the heap dump file path and name using the +\fB\-XX:HeapDumpPath\fR +option\&. By default, this option is disabled and the heap is not dumped when an +\fBOutOfMemoryError\fR +exception is thrown\&. +.RE +.PP +\-XX:HeapDumpPath=\fIpath\fR +.RS 4 +Sets the path and file name for writing the heap dump provided by the heap profiler (HPROF) when the +\fB\-XX:+HeapDumpOnOutOfMemoryError\fR +option is set\&. By default, the file is created in the current working directory, and it is named +\fBjava_pid\fR\fIpid\fR\fB\&.hprof\fR +where +\fIpid\fR +is the identifier of the process that caused the error\&. The following example shows how to set the default file explicitly (\fB%p\fR +represents the current process identificator): +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:HeapDumpPath=\&./java_pid%p\&.hprof\fR + +.fi +.if n \{\ +.RE +.\} +The following example shows how to set the heap dump file to +\fB/var/log/java/java_heapdump\&.hprof\fR: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:HeapDumpPath=/var/log/java/java_heapdump\&.hprof\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:LogFile=\fIpath\fR +.RS 4 +Sets the path and file name where log data is written\&. By default, the file is created in the current working directory, and it is named +\fBhotspot\&.log\fR\&. +.sp +The following example shows how to set the log file to +\fB/var/log/java/hotspot\&.log\fR: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:LogFile=/var/log/java/hotspot\&.log\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+PrintClassHistogram +.RS 4 +Enables printing of a class instance histogram after a +\fBControl+C\fR +event (\fBSIGTERM\fR)\&. By default, this option is disabled\&. +.sp +Setting this option is equivalent to running the +\fBjmap \-histo\fR +command, or the +\fBjcmd \fR\fIpid\fR\fB GC\&.class_histogram\fR +command, where +\fIpid\fR +is the current Java process identifier\&. +.RE +.PP +\-XX:+PrintConcurrentLocks +.RS 4 +Enables printing of locks after a event\&. By default, this option is disabled\&. +.sp +Enables printing of +\fBjava\&.util\&.concurrent\fR +locks after a +\fBControl+C\fR +event (\fBSIGTERM\fR)\&. By default, this option is disabled\&. +.sp +Setting this option is equivalent to running the +\fBjstack \-l\fR +command or the +\fBjcmd \fR\fIpid\fR\fB Thread\&.print \-l\fR +command, where +\fIpid\fR +is the current Java process identifier\&. +.RE +.PP +\-XX:+UnlockDiagnosticVMOptions +.RS 4 +Unlocks the options intended for diagnosing the JVM\&. By default, this option is disabled and diagnostic options are not available\&. +.RE +.SS "Advanced Garbage Collection Options" +.PP +These options control how garbage collection (GC) is performed by the Java HotSpot VM\&. +.PP +\-XX:+AggressiveHeap +.RS 4 +Enables Java heap optimization\&. This sets various parameters to be optimal for long\-running jobs with intensive memory allocation, based on the configuration of the computer (RAM and CPU)\&. By default, the option is disabled and the heap is not optimized\&. +.RE +.PP +\-XX:+AlwaysPreTouch +.RS 4 +Enables touching of every page on the Java heap during JVM initialization\&. This gets all pages into the memory before entering the +\fBmain()\fR +method\&. The option can be used in testing to simulate a long\-running system with all virtual memory mapped to physical memory\&. By default, this option is disabled and all pages are committed as JVM heap space fills\&. +.RE +.PP +\-XX:+CMSClassUnloadingEnabled +.RS 4 +Enables class unloading when using the concurrent mark\-sweep (CMS) garbage collector\&. This option is enabled by default\&. To disable class unloading for the CMS garbage collector, specify +\fB\-XX:\-CMSClassUnloadingEnabled\fR\&. +.RE +.PP +\-XX:CMSExpAvgFactor=\fIpercent\fR +.RS 4 +Sets the percentage of time (0 to 100) used to weight the current sample when computing exponential averages for the concurrent collection statistics\&. By default, the exponential averages factor is set to 25%\&. The following example shows how to set the factor to 15%: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CMSExpAvgFactor=15\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:CMSInitiatingOccupancyFraction=\fIpercent\fR +.RS 4 +Sets the percentage of the old generation occupancy (0 to 100) at which to start a CMS collection cycle\&. The default value is set to \-1\&. Any negative value (including the default) implies that +\fB\-XX:CMSTriggerRatio\fR +is used to define the value of the initiating occupancy fraction\&. +.sp +The following example shows how to set the occupancy fraction to 20%: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CMSInitiatingOccupancyFraction=20\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+CMSScavengeBeforeRemark +.RS 4 +Enables scavenging attempts before the CMS remark step\&. By default, this option is disabled\&. +.RE +.PP +\-XX:CMSTriggerRatio=\fIpercent\fR +.RS 4 +Sets the percentage (0 to 100) of the value specified by +\fB\-XX:MinHeapFreeRatio\fR +that is allocated before a CMS collection cycle commences\&. The default value is set to 80%\&. +.sp +The following example shows how to set the occupancy fraction to 75%: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:CMSTriggerRatio=75\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:ConcGCThreads=\fIthreads\fR +.RS 4 +Sets the number of threads used for concurrent GC\&. The default value depends on the number of CPUs available to the JVM\&. +.sp +For example, to set the number of threads for concurrent GC to 2, specify the following option: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:ConcGCThreads=2\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+DisableExplicitGC +.RS 4 +Enables the option that disables processing of calls to +\fBSystem\&.gc()\fR\&. This option is disabled by default, meaning that calls to +\fBSystem\&.gc()\fR +are processed\&. If processing of calls to +\fBSystem\&.gc()\fR +is disabled, the JVM still performs GC when necessary\&. +.RE +.PP +\-XX:+ExplicitGCInvokesConcurrent +.RS 4 +Enables invoking of concurrent GC by using the +\fBSystem\&.gc()\fR +request\&. This option is disabled by default and can be enabled only together with the +\fB\-XX:+UseConcMarkSweepGC\fR +option\&. +.RE +.PP +\-XX:+ExplicitGCInvokesConcurrentAndUnloadsClasses +.RS 4 +Enables invoking of concurrent GC by using the +\fBSystem\&.gc()\fR +request and unloading of classes during the concurrent GC cycle\&. This option is disabled by default and can be enabled only together with the +\fB\-XX:+UseConcMarkSweepGC\fR +option\&. +.RE +.PP +\-XX:G1HeapRegionSize=\fIsize\fR +.RS 4 +Sets the size of the regions into which the Java heap is subdivided when using the garbage\-first (G1) collector\&. The value can be between 1 MB and 32 MB\&. The default region size is determined ergonomically based on the heap size\&. +.sp +The following example shows how to set the size of the subdivisions to 16 MB: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:G1HeapRegionSize=16m\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+G1PrintHeapRegions +.RS 4 +Enables the printing of information about which regions are allocated and which are reclaimed by the G1 collector\&. By default, this option is disabled\&. +.RE +.PP +\-XX:G1ReservePercent=\fIpercent\fR +.RS 4 +Sets the percentage of the heap (0 to 50) that is reserved as a false ceiling to reduce the possibility of promotion failure for the G1 collector\&. By default, this option is set to 10%\&. +.sp +The following example shows how to set the reserved heap to 20%: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:G1ReservePercent=20\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:InitialHeapSize=\fIsize\fR +.RS 4 +Sets the initial size (in bytes) of the memory allocation pool\&. This value must be either 0, or a multiple of 1024 and greater than 1 MB\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default value is chosen at runtime based on system configuration\&. See the section "Ergonomics" in +\fIJava SE HotSpot Virtual Machine Garbage Collection Tuning Guide\fR +at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gctuning/index\&.html\&. +.sp +The following examples show how to set the size of allocated memory to 6 MB using various units: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:InitialHeapSize=6291456\fR +\fB\-XX:InitialHeapSize=6144k\fR +\fB\-XX:InitialHeapSize=6m\fR + +.fi +.if n \{\ +.RE +.\} +If you set this option to 0, then the initial size will be set as the sum of the sizes allocated for the old generation and the young generation\&. The size of the heap for the young generation can be set using the +\fB\-XX:NewSize\fR +option\&. +.RE +.PP +\-XX:InitialSurvivorRatio=\fIratio\fR +.RS 4 +Sets the initial survivor space ratio used by the throughput garbage collector (which is enabled by the +\fB\-XX:+UseParallelGC\fR +and/or \-\fBXX:+UseParallelOldGC\fR +options)\&. Adaptive sizing is enabled by default with the throughput garbage collector by using the +\fB\-XX:+UseParallelGC\fR +and +\fB\-XX:+UseParallelOldGC\fR +options, and survivor space is resized according to the application behavior, starting with the initial value\&. If adaptive sizing is disabled (using the +\fB\-XX:\-UseAdaptiveSizePolicy\fR +option), then the +\fB\-XX:SurvivorRatio\fR +option should be used to set the size of the survivor space for the entire execution of the application\&. +.sp +The following formula can be used to calculate the initial size of survivor space (S) based on the size of the young generation (Y), and the initial survivor space ratio (R): +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBS=Y/(R+2)\fR + +.fi +.if n \{\ +.RE +.\} +The 2 in the equation denotes two survivor spaces\&. The larger the value specified as the initial survivor space ratio, the smaller the initial survivor space size\&. +.sp +By default, the initial survivor space ratio is set to 8\&. If the default value for the young generation space size is used (2 MB), the initial size of the survivor space will be 0\&.2 MB\&. +.sp +The following example shows how to set the initial survivor space ratio to 4: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:InitialSurvivorRatio=4\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:InitiatingHeapOccupancyPercent=\fIpercent\fR +.RS 4 +Sets the percentage of the heap occupancy (0 to 100) at which to start a concurrent GC cycle\&. It is used by garbage collectors that trigger a concurrent GC cycle based on the occupancy of the entire heap, not just one of the generations (for example, the G1 garbage collector)\&. +.sp +By default, the initiating value is set to 45%\&. A value of 0 implies nonstop GC cycles\&. The following example shows how to set the initiating heap occupancy to 75%: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:InitiatingHeapOccupancyPercent=75\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxGCPauseMillis=\fItime\fR +.RS 4 +Sets a target for the maximum GC pause time (in milliseconds)\&. This is a soft goal, and the JVM will make its best effort to achieve it\&. By default, there is no maximum pause time value\&. +.sp +The following example shows how to set the maximum target pause time to 500 ms: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxGCPauseMillis=500\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxHeapSize=\fIsize\fR +.RS 4 +Sets the maximum size (in byes) of the memory allocation pool\&. This value must be a multiple of 1024 and greater than 2 MB\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. The default value is chosen at runtime based on system configuration\&. For server deployments, +\fB\-XX:InitialHeapSize\fR +and +\fB\-XX:MaxHeapSize\fR +are often set to the same value\&. See the section "Ergonomics" in +\fIJava SE HotSpot Virtual Machine Garbage Collection Tuning Guide\fR +at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/vm/gctuning/index\&.html\&. +.sp +The following examples show how to set the maximum allowed size of allocated memory to 80 MB using various units: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxHeapSize=83886080\fR +\fB\-XX:MaxHeapSize=81920k\fR +\fB\-XX:MaxHeapSize=80m\fR + +.fi +.if n \{\ +.RE +.\} On Oracle Solaris 7 and Oracle Solaris 8 SPARC platforms, the upper limit for this value is approximately 4,000 MB minus overhead amounts\&. On Oracle Solaris 2\&.6 and x86 platforms, the upper limit is approximately 2,000 MB minus overhead amounts\&. On Linux platforms, the upper limit is approximately 2,000 MB minus overhead amounts\&. - -The \f3-XX:MaxHeapSize\fR option is equivalent to \f3-Xmx\fR\&. -.TP --XX:MaxHeapFreeRatio=\fIpercent\fR -.br +.sp +The +\fB\-XX:MaxHeapSize\fR +option is equivalent to +\fB\-Xmx\fR\&. +.RE +.PP +\-XX:MaxHeapFreeRatio=\fIpercent\fR +.RS 4 Sets the maximum allowed percentage of free heap space (0 to 100) after a GC event\&. If free heap space expands above this value, then the heap will be shrunk\&. By default, this value is set to 70%\&. - +.sp The following example shows how to set the maximum free heap ratio to 75%: -.sp -.nf -\f3\-XX:MaxHeapFreeRatio=75\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxMetaspaceSize=\fIsize\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxHeapFreeRatio=75\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxMetaspaceSize=\fIsize\fR +.RS 4 Sets the maximum amount of native memory that can be allocated for class metadata\&. By default, the size is not limited\&. The amount of metadata for an application depends on the application itself, other running applications, and the amount of memory available on the system\&. - +.sp The following example shows how to set the maximum class metadata size to 256 MB: -.sp -.nf -\f3\-XX:MaxMetaspaceSize=256m\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MaxNewSize=\fIsize\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxMetaspaceSize=256m\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MaxNewSize=\fIsize\fR +.RS 4 Sets the maximum size (in bytes) of the heap for the young generation (nursery)\&. The default value is set ergonomically\&. -.TP --XX:MaxTenuringThreshold=\fIthreshold\fR -.br +.RE +.PP +\-XX:MaxTenuringThreshold=\fIthreshold\fR +.RS 4 Sets the maximum tenuring threshold for use in adaptive GC sizing\&. The largest value is 15\&. The default value is 15 for the parallel (throughput) collector, and 6 for the CMS collector\&. - +.sp The following example shows how to set the maximum tenuring threshold to 10: -.sp -.nf -\f3\-XX:MaxTenuringThreshold=10\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:MetaspaceSize=\fIsize\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MaxTenuringThreshold=10\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:MetaspaceSize=\fIsize\fR +.RS 4 Sets the size of the allocated class metadata space that will trigger a garbage collection the first time it is exceeded\&. This threshold for a garbage collection is increased or decreased depending on the amount of metadata used\&. The default size depends on the platform\&. -.TP --XX:MinHeapFreeRatio=\fIpercent\fR -.br +.RE +.PP +\-XX:MinHeapFreeRatio=\fIpercent\fR +.RS 4 Sets the minimum allowed percentage of free heap space (0 to 100) after a GC event\&. If free heap space falls below this value, then the heap will be expanded\&. By default, this value is set to 40%\&. - +.sp The following example shows how to set the minimum free heap ratio to 25%: -.sp -.nf -\f3\-XX:MinHeapFreeRatio=25\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:NewRatio=\fIratio\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:MinHeapFreeRatio=25\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:NewRatio=\fIratio\fR +.RS 4 Sets the ratio between young and old generation sizes\&. By default, this option is set to 2\&. The following example shows how to set the young/old ratio to 1: -.sp -.nf -\f3\-XX:NewRatio=1\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:NewSize=\fIsize\fR -.br -Sets the initial size (in bytes) of the heap for the young generation (nursery)\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:NewRatio=1\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:NewSize=\fIsize\fR +.RS 4 +Sets the initial size (in bytes) of the heap for the young generation (nursery)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. +.sp The young generation region of the heap is used for new objects\&. GC is performed in this region more often than in other regions\&. If the size for the young generation is too low, then a large number of minor GCs will be performed\&. If the size is too high, then only full GCs will be performed, which can take a long time to complete\&. Oracle recommends that you keep the size for the young generation between a half and a quarter of the overall heap size\&. - +.sp The following examples show how to set the initial size of young generation to 256 MB using various units: -.sp -.nf -\f3\-XX:NewSize=256m\fP -.fi -.nf -\f3\-XX:NewSize=262144k\fP -.fi -.nf -\f3\-XX:NewSize=268435456\fP -.fi -.nf -\f3\fP -.fi -.sp - - -The \f3-XX:NewSize\fR option is equivalent to \f3-Xmn\fR\&. -.TP --XX:ParallelGCThreads=\fIthreads\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:NewSize=256m\fR +\fB\-XX:NewSize=262144k\fR +\fB\-XX:NewSize=268435456\fR + +.fi +.if n \{\ +.RE +.\} +The +\fB\-XX:NewSize\fR +option is equivalent to +\fB\-Xmn\fR\&. +.RE +.PP +\-XX:ParallelGCThreads=\fIthreads\fR +.RS 4 Sets the number of threads used for parallel garbage collection in the young and old generations\&. The default value depends on the number of CPUs available to the JVM\&. - +.sp For example, to set the number of threads for parallel GC to 2, specify the following option: -.sp -.nf -\f3\-XX:ParallelGCThreads=2\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+ParallelRefProcEnabled -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:ParallelGCThreads=2\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+ParallelRefProcEnabled +.RS 4 Enables parallel reference processing\&. By default, this option is disabled\&. -.TP --XX:+PrintAdaptiveSizePolicy -.br +.RE +.PP +\-XX:+PrintAdaptiveSizePolicy +.RS 4 Enables printing of information about adaptive generation sizing\&. By default, this option is disabled\&. -.TP --XX:+PrintGC -.br +.RE +.PP +\-XX:+PrintGC +.RS 4 Enables printing of messages at every GC\&. By default, this option is disabled\&. -.TP --XX:+PrintGCApplicationConcurrentTime -.br +.RE +.PP +\-XX:+PrintGCApplicationConcurrentTime +.RS 4 Enables printing of how much time elapsed since the last pause (for example, a GC pause)\&. By default, this option is disabled\&. -.TP --XX:+PrintGCApplicationStoppedTime -.br +.RE +.PP +\-XX:+PrintGCApplicationStoppedTime +.RS 4 Enables printing of how much time the pause (for example, a GC pause) lasted\&. By default, this option is disabled\&. -.TP --XX+PrintGCDateStamp -.br +.RE +.PP +\-XX:+PrintGCDateStamps +.RS 4 Enables printing of a date stamp at every GC\&. By default, this option is disabled\&. -.TP --XX:+PrintGCDetails -.br +.RE +.PP +\-XX:+PrintGCDetails +.RS 4 Enables printing of detailed messages at every GC\&. By default, this option is disabled\&. -.TP --XX:+PrintGCTaskTimeStamps -.br +.RE +.PP +\-XX:+PrintGCTaskTimeStamps +.RS 4 Enables printing of time stamps for every individual GC worker thread task\&. By default, this option is disabled\&. -.TP --XX:+PrintGCTimeStamp -.br +.RE +.PP +\-XX:+PrintGCTimeStamps +.RS 4 Enables printing of time stamps at every GC\&. By default, this option is disabled\&. -.TP --XX:+PrintTenuringDistribution -.br +.RE +.PP +\-XX:+PrintStringDeduplicationStatistics +.RS 4 +Prints detailed deduplication statistics\&. By default, this option is disabled\&. See the +\fB\-XX:+UseStringDeduplication\fR +option\&. +.RE +.PP +\-XX:+PrintTenuringDistribution +.RS 4 Enables printing of tenuring age information\&. The following is an example of the output: -.sp -.nf -\f3Desired survivor size 48286924 bytes, new threshold 10 (max 10)\fP -.fi -.nf -\f3\- age 1: 28992024 bytes, 28992024 total\fP -.fi -.nf -\f3\- age 2: 1366864 bytes, 30358888 total\fP -.fi -.nf -\f3\- age 3: 1425912 bytes, 31784800 total\fP -.fi -.nf -\f3\&.\&.\&.\fP -.fi -.nf -\f3\fP -.fi -.sp - - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBDesired survivor size 48286924 bytes, new threshold 10 (max 10)\fR +\fB\- age 1: 28992024 bytes, 28992024 total\fR +\fB\- age 2: 1366864 bytes, 30358888 total\fR +\fB\- age 3: 1425912 bytes, 31784800 total\fR +\fB\&.\&.\&.\fR + +.fi +.if n \{\ +.RE +.\} Age 1 objects are the youngest survivors (they were created after the previous scavenge, survived the latest scavenge, and moved from eden to survivor space)\&. Age 2 objects have survived two scavenges (during the second scavenge they were copied from one survivor space to the next)\&. And so on\&. - +.sp In the preceding example, 28 992 024 bytes survived one scavenge and were copied from eden to survivor space, 1 366 864 bytes are occupied by age 2 objects, etc\&. The third value in each row is the cumulative size of objects of age n or less\&. - +.sp By default, this option is disabled\&. -.TP --XX:+ScavengeBeforeFullGC -.br -Enables GC of the young generation before each full GC\&. This option is enabled by default\&. Oracle recommends that you \fIdo not\fR disable it, because scavenging the young generation before a full GC can reduce the number of objects reachable from the old generation space into the young generation space\&. To disable GC of the young generation before each full GC, specify \f3-XX:-ScavengeBeforeFullGC\fR\&. -.TP --XX:SoftRefLRUPolicyMSPerMB=\fItime\fR -.br -Sets the amount of time (in milliseconds) a softly reachable object is kept active on the heap after the last time it was referenced\&. The default value is one second of lifetime per free megabyte in the heap\&. The \f3-XX:SoftRefLRUPolicyMSPerMB\fR option accepts integer values representing milliseconds per one megabyte of the current heap size (for Java HotSpot Client VM) or the maximum possible heap size (for Java HotSpot Server VM)\&. This difference means that the Client VM tends to flush soft references rather than grow the heap, whereas the Server VM tends to grow the heap rather than flush soft references\&. In the latter case, the value of the \f3-Xmx\fR option has a significant effect on how quickly soft references are garbage collected\&. - +.RE +.PP +\-XX:+ScavengeBeforeFullGC +.RS 4 +Enables GC of the young generation before each full GC\&. This option is enabled by default\&. Oracle recommends that you +\fIdo not\fR +disable it, because scavenging the young generation before a full GC can reduce the number of objects reachable from the old generation space into the young generation space\&. To disable GC of the young generation before each full GC, specify +\fB\-XX:\-ScavengeBeforeFullGC\fR\&. +.RE +.PP +\-XX:SoftRefLRUPolicyMSPerMB=\fItime\fR +.RS 4 +Sets the amount of time (in milliseconds) a softly reachable object is kept active on the heap after the last time it was referenced\&. The default value is one second of lifetime per free megabyte in the heap\&. The +\fB\-XX:SoftRefLRUPolicyMSPerMB\fR +option accepts integer values representing milliseconds per one megabyte of the current heap size (for Java HotSpot Client VM) or the maximum possible heap size (for Java HotSpot Server VM)\&. This difference means that the Client VM tends to flush soft references rather than grow the heap, whereas the Server VM tends to grow the heap rather than flush soft references\&. In the latter case, the value of the +\fB\-Xmx\fR +option has a significant effect on how quickly soft references are garbage collected\&. +.sp The following example shows how to set the value to 2\&.5 seconds: -.sp -.nf -\f3\-XX:SoftRefLRUPolicyMSPerMB=2500\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:SurvivorRatio=\fIratio\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:SoftRefLRUPolicyMSPerMB=2500\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:StringDeduplicationAgeThreshold=\fIthreshold\fR +.RS 4 +\fBString\fR +objects reaching the specified age are considered candidates for deduplication\&. An object\*(Aqs age is a measure of how many times it has survived garbage collection\&. This is sometimes referred to as tenuring; see the +\fB\-XX:+PrintTenuringDistribution\fR +option\&. Note that +\fBString\fR +objects that are promoted to an old heap region before this age has been reached are always considered candidates for deduplication\&. The default value for this option is +\fB3\fR\&. See the +\fB\-XX:+UseStringDeduplication\fR +option\&. +.RE +.PP +\-XX:SurvivorRatio=\fIratio\fR +.RS 4 Sets the ratio between eden space size and survivor space size\&. By default, this option is set to 8\&. The following example shows how to set the eden/survivor space ratio to 4: -.sp -.nf -\f3\-XX:SurvivorRatio=4\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:TargetSurvivorRatio=\fIpercent\fR -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:SurvivorRatio=4\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:TargetSurvivorRatio=\fIpercent\fR +.RS 4 Sets the desired percentage of survivor space (0 to 100) used after young garbage collection\&. By default, this option is set to 50%\&. - +.sp The following example shows how to set the target survivor space ratio to 30%: -.sp -.nf -\f3\-XX:TargetSurvivorRatio=30\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:TLABSize=\fIsize\fR -.br -Sets the initial size (in bytes) of a thread-local allocation buffer (TLAB)\&. Append the letter \f3k\fR or \f3K\fR to indicate kilobytes, \f3m\fR or \f3M\fR to indicate megabytes, \f3g\fR or \f3G\fR to indicate gigabytes\&. If this option is set to 0, then the JVM chooses the initial size automatically\&. - +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:TargetSurvivorRatio=30\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:TLABSize=\fIsize\fR +.RS 4 +Sets the initial size (in bytes) of a thread\-local allocation buffer (TLAB)\&. Append the letter +\fBk\fR +or +\fBK\fR +to indicate kilobytes, +\fBm\fR +or +\fBM\fR +to indicate megabytes, +\fBg\fR +or +\fBG\fR +to indicate gigabytes\&. If this option is set to 0, then the JVM chooses the initial size automatically\&. +.sp The following example shows how to set the initial TLAB size to 512 KB: -.sp -.nf -\f3\-XX:TLABSize=512k\fP -.fi -.nf -\f3\fP -.fi -.sp - -.TP --XX:+UseAdaptiveSizePolicy -.br -Enables the use of adaptive generation sizing\&. This option is enabled by default\&. To disable adaptive generation sizing, specify \f3-XX:-UseAdaptiveSizePolicy\fR and set the size of the memory allocation pool explicitly (see the \f3-XX:SurvivorRatio\fR option)\&. -.TP --XX:+UseCMSInitiatingOccupancyOnly -.br +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB\-XX:TLABSize=512k\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-XX:+UseAdaptiveSizePolicy +.RS 4 +Enables the use of adaptive generation sizing\&. This option is enabled by default\&. To disable adaptive generation sizing, specify +\fB\-XX:\-UseAdaptiveSizePolicy\fR +and set the size of the memory allocation pool explicitly (see the +\fB\-XX:SurvivorRatio\fR +option)\&. +.RE +.PP +\-XX:+UseCMSInitiatingOccupancyOnly +.RS 4 Enables the use of the occupancy value as the only criterion for initiating the CMS collector\&. By default, this option is disabled and other criteria may be used\&. -.TP --XX:+UseConcMarkSweepGC -.br -Enables the use of the CMS garbage collector for the old generation\&. Oracle recommends that you use the CMS garbage collector when application latency requirements cannot be met by the throughput (\f3-XX:+UseParallelGC\fR) garbage collector\&. The G1 garbage collector (\f3-XX:+UseG1GC\fR) is another alternative\&. - -By default, this option is disabled and the collector is chosen automatically based on the configuration of the machine and type of the JVM\&. When this option is enabled, the \f3-XX:+UseParNewGC\fR option is automatically set\&. -.TP --XX:+UseG1GC -.br -Enables the use of the G1 garbage collector\&. It is a server-style garbage collector, targeted for multiprocessor machines with a large amount of RAM\&. It meets GC pause time goals with high probability, while maintaining good throughput\&. The G1 collector is recommended for applications requiring large heaps (sizes of around 6 GB or larger) with limited GC latency requirements (stable and predictable pause time below 0\&.5 seconds)\&. - +.RE +.PP +\-XX:+UseConcMarkSweepGC +.RS 4 +Enables the use of the CMS garbage collector for the old generation\&. Oracle recommends that you use the CMS garbage collector when application latency requirements cannot be met by the throughput (\fB\-XX:+UseParallelGC\fR) garbage collector\&. The G1 garbage collector (\fB\-XX:+UseG1GC\fR) is another alternative\&. +.sp +By default, this option is disabled and the collector is chosen automatically based on the configuration of the machine and type of the JVM\&. When this option is enabled, the +\fB\-XX:+UseParNewGC\fR +option is automatically set and you should not disable it, because the following combination of options has been deprecated in JDK 8: +\fB\-XX:+UseConcMarkSweepGC \-XX:\-UseParNewGC\fR\&. +.RE +.PP +\-XX:+UseG1GC +.RS 4 +Enables the use of the garbage\-first (G1) garbage collector\&. It is a server\-style garbage collector, targeted for multiprocessor machines with a large amount of RAM\&. It meets GC pause time goals with high probability, while maintaining good throughput\&. The G1 collector is recommended for applications requiring large heaps (sizes of around 6 GB or larger) with limited GC latency requirements (stable and predictable pause time below 0\&.5 seconds)\&. +.sp By default, this option is disabled and the collector is chosen automatically based on the configuration of the machine and type of the JVM\&. -.TP --XX:+UseGCOverheadLimit -.br -Enables the use of a policy that limits the proportion of time spent by the JVM on GC before an \f3OutOfMemoryError\fR exception is thrown\&. This option is enabled, by default and the parallel GC will throw an \f3OutOfMemoryError\fR if more than 98% of the total time is spent on garbage collection and less than 2% of the heap is recovered\&. When the heap is small, this feature can be used to prevent applications from running for long periods of time with little or no progress\&. To disable this option, specify \f3-XX:-UseGCOverheadLimit\fR\&. -.TP --XX:+UseNUMA -.br -Enables performance optimization of an application on a machine with nonuniform memory architecture (NUMA) by increasing the application\&'s use of lower latency memory\&. By default, this option is disabled and no optimization for NUMA is made\&. The option is only available when the parallel garbage collector is used (\f3-XX:+UseParallelGC\fR)\&. -.TP --XX:+UseParallelGC -.br +.RE +.PP +\-XX:+UseGCOverheadLimit +.RS 4 +Enables the use of a policy that limits the proportion of time spent by the JVM on GC before an +\fBOutOfMemoryError\fR +exception is thrown\&. This option is enabled, by default and the parallel GC will throw an +\fBOutOfMemoryError\fR +if more than 98% of the total time is spent on garbage collection and less than 2% of the heap is recovered\&. When the heap is small, this feature can be used to prevent applications from running for long periods of time with little or no progress\&. To disable this option, specify +\fB\-XX:\-UseGCOverheadLimit\fR\&. +.RE +.PP +\-XX:+UseNUMA +.RS 4 +Enables performance optimization of an application on a machine with nonuniform memory architecture (NUMA) by increasing the application\*(Aqs use of lower latency memory\&. By default, this option is disabled and no optimization for NUMA is made\&. The option is only available when the parallel garbage collector is used (\fB\-XX:+UseParallelGC\fR)\&. +.RE +.PP +\-XX:+UseParallelGC +.RS 4 Enables the use of the parallel scavenge garbage collector (also known as the throughput collector) to improve the performance of your application by leveraging multiple processors\&. - -By default, this option is disabled and the collector is chosen automatically based on the configuration of the machine and type of the JVM\&. If it is enabled, then the \f3-XX:+UseParallelOldGC\fR option is automatically enabled, unless you explicitly disable it\&. -.TP --XX:+UseParallelOldGC -.br -Enables the use of the parallel garbage collector for full GCs\&. By default, this option is disabled\&. Enabling it automatically enables the \f3-XX:+UseParallelGC\fR option\&. -.TP --XX:+UseParNewGC -.br -Enables the use of parallel threads for collection in the young generation\&. By default, this option is disabled\&. It is automatically enabled when you set the \f3-XX:+UseConcMarkSweepGC\fR option\&. -.TP --XX:+UseSerialGC -.br +.sp +By default, this option is disabled and the collector is chosen automatically based on the configuration of the machine and type of the JVM\&. If it is enabled, then the +\fB\-XX:+UseParallelOldGC\fR +option is automatically enabled, unless you explicitly disable it\&. +.RE +.PP +\-XX:+UseParallelOldGC +.RS 4 +Enables the use of the parallel garbage collector for full GCs\&. By default, this option is disabled\&. Enabling it automatically enables the +\fB\-XX:+UseParallelGC\fR +option\&. +.RE +.PP +\-XX:+UseParNewGC +.RS 4 +Enables the use of parallel threads for collection in the young generation\&. By default, this option is disabled\&. It is automatically enabled when you set the +\fB\-XX:+UseConcMarkSweepGC\fR +option\&. Using the +\fB\-XX:+UseParNewGC\fR +option without the +\fB\-XX:+UseConcMarkSweepGC\fR +option was deprecated in JDK 8\&. +.RE +.PP +\-XX:+UseSerialGC +.RS 4 Enables the use of the serial garbage collector\&. This is generally the best choice for small and simple applications that do not require any special functionality from garbage collection\&. By default, this option is disabled and the collector is chosen automatically based on the configuration of the machine and type of the JVM\&. -.TP --XX:+UseTLAB -.br -Enables the use of thread-local allocation blocks (TLABs) in the young generation space\&. This option is enabled by default\&. To disable the use of TLABs, specify \f3-XX:-UseTLAB\fR\&. -.SS DEPRECATED\ AND\ REMOVED\ OPTIONS +.RE +.PP +\-XX:+UseSHM +.RS 4 +On Linux, enables the JVM to use shared memory to setup large pages\&. +.sp +For more information, see "Large Pages"\&. +.RE +.PP +\-XX:+UseStringDeduplication +.RS 4 +Enables string deduplication\&. By default, this option is disabled\&. To use this option, you must enable the garbage\-first (G1) garbage collector\&. See the +\fB\-XX:+UseG1GC\fR +option\&. +.sp +\fIString deduplication\fR +reduces the memory footprint of +\fBString\fR +objects on the Java heap by taking advantage of the fact that many +\fBString\fR +objects are identical\&. Instead of each +\fBString\fR +object pointing to its own character array, identical +\fBString\fR +objects can point to and share the same character array\&. +.RE +.PP +\-XX:+UseTLAB +.RS 4 +Enables the use of thread\-local allocation blocks (TLABs) in the young generation space\&. This option is enabled by default\&. To disable the use of TLABs, specify +\fB\-XX:\-UseTLAB\fR\&. +.RE +.SS "Deprecated and Removed Options" +.PP These options were included in the previous release, but have since been considered unnecessary\&. -.TP --Xrun\fIlibname\fR -.br -Loads the specified debugging/profiling library\&. This option was superseded by the \f3-agentlib\fR option\&. -.TP --XX:CMSInitiatingPermOccupancyFraction=\fIpercent\fR -.br +.PP +\-Xincgc +.RS 4 +Enables incremental garbage collection\&. This option was deprecated in JDK 8 with no replacement\&. +.RE +.PP +\-Xrun\fIlibname\fR +.RS 4 +Loads the specified debugging/profiling library\&. This option was superseded by the +\fB\-agentlib\fR +option\&. +.RE +.PP +\-XX:CMSIncrementalDutyCycle=\fIpercent\fR +.RS 4 +Sets the percentage of time (0 to 100) between minor collections that the concurrent collector is allowed to run\&. This option was deprecated in JDK 8 with no replacement, following the deprecation of the +\fB\-XX:+CMSIncrementalMode\fR +option\&. +.RE +.PP +\-XX:CMSIncrementalDutyCycleMin=\fIpercent\fR +.RS 4 +Sets the percentage of time (0 to 100) between minor collections that is the lower bound for the duty cycle when +\fB\-XX:+CMSIncrementalPacing\fR +is enabled\&. This option was deprecated in JDK 8 with no replacement, following the deprecation of the +\fB\-XX:+CMSIncrementalMode\fR +option\&. +.RE +.PP +\-XX:+CMSIncrementalMode +.RS 4 +Enables the incremental mode for the CMS collector\&. This option was deprecated in JDK 8 with no replacement, along with other options that start with +\fBCMSIncremental\fR\&. +.RE +.PP +\-XX:CMSIncrementalOffset=\fIpercent\fR +.RS 4 +Sets the percentage of time (0 to 100) by which the incremental mode duty cycle is shifted to the right within the period between minor collections\&. This option was deprecated in JDK 8 with no replacement, following the deprecation of the +\fB\-XX:+CMSIncrementalMode\fR +option\&. +.RE +.PP +\-XX:+CMSIncrementalPacing +.RS 4 +Enables automatic adjustment of the incremental mode duty cycle based on statistics collected while the JVM is running\&. This option was deprecated in JDK 8 with no replacement, following the deprecation of the +\fB\-XX:+CMSIncrementalMode\fR +option\&. +.RE +.PP +\-XX:CMSIncrementalSafetyFactor=\fIpercent\fR +.RS 4 +Sets the percentage of time (0 to 100) used to add conservatism when computing the duty cycle\&. This option was deprecated in JDK 8 with no replacement, following the deprecation of the +\fB\-XX:+CMSIncrementalMode\fR +option\&. +.RE +.PP +\-XX:CMSInitiatingPermOccupancyFraction=\fIpercent\fR +.RS 4 Sets the percentage of the permanent generation occupancy (0 to 100) at which to start a GC\&. This option was deprecated in JDK 8 with no replacement\&. -.TP --XX:MaxPermSize=\fIsize\fR -.br -Sets the maximum permanent generation space size (in bytes)\&. This option was deprecated in JDK 8, and superseded by the \f3-XX:MaxMetaspaceSize\fR option\&. -.TP --XX:PermSize=\fIsize\fR -.br -Sets the space (in bytes) allocated to the permanent generation that triggers a garbage collection if it is exceeded\&. This option was deprecated un JDK 8, and superseded by the \f3-XX:MetaspaceSize\fR option\&. -.TP --XX:+UseSplitVerifier -.br +.RE +.PP +\-XX:MaxPermSize=\fIsize\fR +.RS 4 +Sets the maximum permanent generation space size (in bytes)\&. This option was deprecated in JDK 8, and superseded by the +\fB\-XX:MaxMetaspaceSize\fR +option\&. +.RE +.PP +\-XX:PermSize=\fIsize\fR +.RS 4 +Sets the space (in bytes) allocated to the permanent generation that triggers a garbage collection if it is exceeded\&. This option was deprecated un JDK 8, and superseded by the +\fB\-XX:MetaspaceSize\fR +option\&. +.RE +.PP +\-XX:+UseSplitVerifier +.RS 4 Enables splitting of the verification process\&. By default, this option was enabled in the previous releases, and verification was split into two phases: type referencing (performed by the compiler) and type checking (performed by the JVM runtime)\&. This option was deprecated in JDK 8, and verification is now split by default without a way to disable it\&. -.TP --XX:+UseStringCache -.br +.RE +.PP +\-XX:+UseStringCache +.RS 4 Enables caching of commonly allocated strings\&. This option was removed from JDK 8 with no replacement\&. -.SH PERFORMANCE\ TUNING\ EXAMPLES +.RE +.SH "PERFORMANCE TUNING EXAMPLES" +.PP The following examples show how to use experimental tuning flags to either optimize throughput or to provide lower response time\&. .PP -\f3Example 1 Tuning for Higher Throughput\fR -.sp -.nf -\f3java \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g \-Xms26g \-Xmx26g\fP -.fi -.nf -\f3\fP -.fi -.sp -\f3Example 2 Tuning for Lower Response Time\fR -.sp -.nf -\f3java \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamp\fP -.fi -.nf -\f3\fP -.fi -.sp -.SH EXIT\ STATUS -The following exit values are typically returned by the launcher when the launcher is called with the wrong arguments, serious errors, or exceptions thrown by the JVM\&. However, a Java application may choose to return any value by using the API call \f3System\&.exit(exitValue)\fR\&. The values are: -.TP 0.2i -\(bu -\f30\fR: Successful completion -.TP 0.2i -\(bu -\f3>0\fR: An error occurred -.SH SEE\ ALSO -.TP 0.2i -\(bu +\fBExample 1 \fRTuning for Higher Throughput +.RS 4 +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBjava \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g \-Xms26g \-Xmx26g\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\fBExample 2 \fRTuning for Lower Response Time +.RS 4 +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fBjava \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamp\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.SH "LARGE PAGES" +.PP +Also known as huge pages, large pages are memory pages that are significantly larger than the standard memory page size (which varies depending on the processor and operating system)\&. Large pages optimize processor Translation\-Lookaside Buffers\&. +.PP +A Translation\-Lookaside Buffer (TLB) is a page translation cache that holds the most\-recently used virtual\-to\-physical address translations\&. TLB is a scarce system resource\&. A TLB miss can be costly as the processor must then read from the hierarchical page table, which may require multiple memory accesses\&. By using a larger memory page size, a single TLB entry can represent a larger memory range\&. There will be less pressure on TLB, and memory\-intensive applications may have better performance\&. +.PP +However, large pages page memory can negatively affect system performance\&. For example, when a large mount of memory is pinned by an application, it may create a shortage of regular memory and cause excessive paging in other applications and slow down the entire system\&. Also, a system that has been up for a long time could produce excessive fragmentation, which could make it impossible to reserve enough large page memory\&. When this happens, either the OS or JVM reverts to using regular pages\&. +.SS "Large Pages Support" +.PP +Solaris and Linux support large pages\&. +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBSolaris\fR +.RS 4 +.PP +Solaris 9 and later include Multiple Page Size Support (MPSS); no additional configuration is necessary\&. See http://www\&.oracle\&.com/technetwork/server\-storage/solaris10/overview/solaris9\-features\-scalability\-135663\&.html\&. +.RE +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBLinux\fR +.RS 4 +.PP +The 2\&.6 kernel supports large pages\&. Some vendors have backported the code to their 2\&.4\-based releases\&. To check if your system can support large page memory, try the following: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB# cat /proc/meminfo | grep Huge\fR +\fBHugePages_Total: 0\fR +\fBHugePages_Free: 0\fR +\fBHugepagesize: 2048 kB\fR + +.fi +.if n \{\ +.RE +.\} +.PP +If the output shows the three "Huge" variables, then your system can support large page memory but it needs to be configured\&. If the command prints nothing, then your system does not support large pages\&. To configure the system to use large page memory, login as +\fBroot\fR, and then follow these steps: +.sp +.RS 4 +.ie n \{\ +\h'-04' 1.\h'+01'\c +.\} +.el \{\ +.sp -1 +.IP " 1." 4.2 +.\} +If you are using the option +\fB\-XX:+UseSHM\fR +(instead of +\fB\-XX:+UseHugeTLBFS\fR), then increase the +\fBSHMMAX\fR +value\&. It must be larger than the Java heap size\&. On a system with 4 GB of physical RAM (or less), the following will make all the memory sharable: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB# echo 4294967295 > /proc/sys/kernel/shmmax\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04' 2.\h'+01'\c +.\} +.el \{\ +.sp -1 +.IP " 2." 4.2 +.\} +If you are using the option +\fB\-XX:+UseSHM\fR +or +\fB\-XX:+UseHugeTLBFS\fR, then specify the number of large pages\&. In the following example, 3 GB of a 4 GB system are reserved for large pages (assuming a large page size of 2048kB, then 3 GB = 3 * 1024 MB = 3072 MB = 3072 * 1024 kB = 3145728 kB and 3145728 kB / 2048 kB = 1536): +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB# echo 1536 > /proc/sys/vm/nr_hugepages\fR + +.fi +.if n \{\ +.RE +.\} +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +.TS +allbox tab(:); +l. +T{ +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Note that the values contained in +\fB/proc\fR +will reset after you reboot your system, so may want to set them in an initialization script (for example, +\fBrc\&.local\fR +or +\fBsysctl\&.conf\fR)\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +If you configure (or resize) the OS kernel parameters +\fB/proc/sys/kernel/shmmax\fR +or +\fB/proc/sys/vm/nr_hugepages\fR, Java processes may allocate large pages for areas in addition to the Java heap\&. These steps can allocate large pages for the following areas: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Java heap +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Code cache +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The marking bitmap data structure for the parallel GC +.RE +.sp +Consequently, if you configure the +\fBnr_hugepages\fR +parameter to the size of the Java heap, then the JVM can fail in allocating the code cache areas on large pages because these areas are quite large in size\&. +.RE +T} +.TE +.sp 1 +.sp .5v +.RE +.RE +.SH "EXIT STATUS" +.PP +The following exit values are typically returned by the launcher when the launcher is called with the wrong arguments, serious errors, or exceptions thrown by the JVM\&. However, a Java application may choose to return any value by using the API call +\fBSystem\&.exit(exitValue)\fR\&. The values are: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fB0\fR: Successful completion +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fB>0\fR: An error occurred +.RE +.SH "SEE ALSO" +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} javac(1) -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} jdb(1) -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} javah(1) -.TP 0.2i -\(bu +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} jar(1) -.RE -.br -'pl 8.5i -'bp +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +jstat(1) +.RE +.br +'pl 8.5i +'bp diff --git a/jdk/src/bsd/doc/man/javac.1 b/jdk/src/bsd/doc/man/javac.1 index 3cbc97614b8..62ef22d2782 100644 --- a/jdk/src/bsd/doc/man/javac.1 +++ b/jdk/src/bsd/doc/man/javac.1 @@ -1,53 +1,52 @@ '\" t -.\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" +.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" .\" Arch: generic .\" Software: JDK 8 -.\" Date: 21 November 2013 +.\" Date: 03 March 2015 .\" SectDesc: Basic Tools .\" Title: javac.1 .\" .if n .pl 99999 -.TH javac 1 "21 November 2013" "JDK 8" "Basic Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- +.TH javac 1 "03 March 2015" "JDK 8" "Basic Tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH NAME javac \- Reads Java class and interface definitions and compiles them into bytecode and class files\&. @@ -235,10 +234,16 @@ No language changes were introduced in Java SE 6\&. However, encoding errors in Synonym for 1\&.6\&. .TP 1\&.7 -This is the default value\&. The compiler accepts code with features introduced in Java SE 7\&. +The compiler accepts code with features introduced in Java SE 7\&. .TP 7 Synonym for 1\&.7\&. +.TP +1\&.8 +This is the default value\&. The compiler accepts code with features introduced in Java SE 8\&. +.TP +8 +Synonym for 1\&.8\&. .RE .TP @@ -268,13 +273,13 @@ By default, classes are compiled against the bootstrap and extension classes of .TP -target \fIversion\fR .br -Generates class files that target a specified release of the virtual machine\&. Class files will run on the specified target and on later releases, but not on earlier releases of the JVM\&. Valid targets are 1\&.1, 1\&.2, 1\&.3, 1\&.4, 1\&.5 (also 5), 1\&.6 (also 6), and 1\&.7 (also 7)\&. +Generates class files that target a specified release of the virtual machine\&. Class files will run on the specified target and on later releases, but not on earlier releases of the JVM\&. Valid targets are 1\&.1, 1\&.2, 1\&.3, 1\&.4, 1\&.5 (also 5), 1\&.6 (also 6), 1\&.7 (also 7), and 1\&.8 (also 8)\&. The default for the \f3-target\fR option depends on the value of the \f3-source\fR option: .RS .TP 0.2i \(bu -If the \f3-source\fR option is not specified, then the value of the \f3-target\fR option is 1\&.7 +If the \f3-source\fR option is not specified, then the value of the \f3-target\fR option is 1\&.8 .TP 0.2i \(bu If the \f3-source\fR option is 1\&.2, then the value of the \f3-target\fR option is 1\&.4 @@ -283,10 +288,13 @@ If the \f3-source\fR option is 1\&.2, then the value of the \f3-target\fR option If the \f3-source\fR option is 1\&.3, then the value of the \f3-target\fR option is 1\&.4 .TP 0.2i \(bu -If the \f3-source\fR option is 1\&.5, then the value of the \f3-target\fR option is 1\&.7 +If the \f3-source\fR option is 1\&.5, then the value of the \f3-target\fR option is 1\&.8 .TP 0.2i \(bu -If the \f3-source\fR option is 1\&.6, then the value of the \f3-target\fR is option 1\&.7 +If the \f3-source\fR option is 1\&.6, then the value of the \f3-target\fR is option 1\&.8 +.TP 0.2i +\(bu +If the \f3-source\fR option is 1\&.7, then the value of the \f3-target\fR is option 1\&.8 .TP 0.2i \(bu For all other values of the \f3-source\fR option, the value of the \f3-target\fR option is the value of the \f3-source\fR option\&. @@ -1114,9 +1122,6 @@ To compile as though providing command-line arguments, use the following syntax: \f3JavaCompiler javac = ToolProvider\&.getSystemJavaCompiler();\fP .fi .nf -\f3JavaCompiler javac = ToolProvider\&.getSystemJavaCompiler();\fP -.fi -.nf \f3\fP .fi .sp @@ -1279,10 +1284,10 @@ To execute a class in the \f3greetings\fR package, the program needs access to t .sp \f3Example 4 Separate Source Files and Class Files\fR .PP -The following example uses \f3javac\fR to compile code that runs on JVM 1\&.6\&. +The following example uses \f3javac\fR to compile code that runs on JVM 1\&.7\&. .sp .nf -\f3javac \-source 1\&.6 \-target 1\&.6 \-bootclasspath jdk1\&.6\&.0/lib/rt\&.jar \e \fP +\f3javac \-source 1\&.7 \-target 1\&.7 \-bootclasspath jdk1\&.7\&.0/lib/rt\&.jar \e \fP .fi .nf \f3\-extdirs "" OldCode\&.java\fP @@ -1291,31 +1296,31 @@ The following example uses \f3javac\fR to compile code that runs on JVM 1\&.6\&. \f3\fP .fi .sp -The \f3-source 1\&.6\fR option specifies that release 1\&.6 (or 6) of the Java programming language be used to compile \f3OldCode\&.java\fR\&. The option \f3-target 1\&.6\fR option ensures that the generated class files are compatible with JVM 1\&.6\&. Note that in most cases, the value of the \f3-target\fR option is the value of the \f3-source\fR option; in this example, you can omit the \f3-target\fR option\&. +The \f3-source 1\&.7\fR option specifies that release 1\&.7 (or 7) of the Java programming language be used to compile \f3OldCode\&.java\fR\&. The option \f3-target 1\&.7\fR option ensures that the generated class files are compatible with JVM 1\&.7\&. Note that in most cases, the value of the \f3-target\fR option is the value of the \f3-source\fR option; in this example, you can omit the \f3-target\fR option\&. .PP You must specify the \f3-bootclasspath\fR option to specify the correct version of the bootstrap classes (the \f3rt\&.jar\fR library)\&. If not, then the compiler generates a warning: .sp .nf -\f3javac \-source 1\&.6 OldCode\&.java\fP +\f3javac \-source 1\&.7 OldCode\&.java\fP .fi .nf \f3warning: [options] bootstrap class path not set in conjunction with \fP .fi .nf -\f3\-source 1\&.6\fP +\f3\-source 1\&.7\fP .fi .nf \f3\fP .fi .sp -If you do not specify the correct version of bootstrap classes, then the compiler uses the old language rules (in this example, it uses version 1\&.6 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to nonexistent methods can get included\&. +If you do not specify the correct version of bootstrap classes, then the compiler uses the old language rules (in this example, it uses version 1\&.7 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 7) because reference to nonexistent methods can get included\&. .PP \f3Example 5 Cross Compile\fR .PP -This example uses \f3javac\fR to compile code that runs on JVM 1\&.6\&. +This example uses \f3javac\fR to compile code that runs on JVM 1\&.7\&. .sp .nf -\f3javac \-source 1\&.6 \-target 1\&.6 \-bootclasspath jdk1\&.6\&.0/lib/rt\&.jar \e\fP +\f3javac \-source 1\&.7 \-target 1\&.7 \-bootclasspath jdk1\&.7\&.0/lib/rt\&.jar \e\fP .fi .nf \f3 \-extdirs "" OldCode\&.java\fP @@ -1324,21 +1329,21 @@ This example uses \f3javac\fR to compile code that runs on JVM 1\&.6\&. \f3\fP .fi .sp -The\f3-source 1\&.6\fR option specifies that release 1\&.6 (or 6) of the Java programming language to be used to compile OldCode\&.java\&. The \f3-target 1\&.6\fR option ensures that the generated class files are compatible with JVM 1\&.6\&. In most cases, the value of the \f3-target\fR is the value of \f3-source\fR\&. In this example, the \f3-target\fR option is omitted\&. +The\f3-source 1\&.7\fR option specifies that release 1\&.7 (or 7) of the Java programming language to be used to compile OldCode\&.java\&. The \f3-target 1\&.7\fR option ensures that the generated class files are compatible with JVM 1\&.7\&. .PP You must specify the \f3-bootclasspath\fR option to specify the correct version of the bootstrap classes (the \f3rt\&.jar\fR library)\&. If not, then the compiler generates a warning: .sp .nf -\f3javac \-source 1\&.6 OldCode\&.java\fP +\f3javac \-source 1\&.7 OldCode\&.java\fP .fi .nf -\f3warning: [options] bootstrap class path not set in conjunction with \-source 1\&.6\fP +\f3warning: [options] bootstrap class path not set in conjunction with \-source 1\&.7\fP .fi .nf \f3\fP .fi .sp -If you do not specify the correct version of bootstrap classes, then the compiler uses the old language rules combined with the new bootstrap classes\&. This combination can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to nonexistent methods can get included\&. In this example, the compiler uses release 1\&.6 of the Java programming language\&. +If you do not specify the correct version of bootstrap classes, then the compiler uses the old language rules combined with the new bootstrap classes\&. This combination can result in class files that do not work on the older platform (in this case, Java SE 7) because reference to nonexistent methods can get included\&. In this example, the compiler uses release 1\&.7 of the Java programming language\&. .SH SEE\ ALSO .TP 0.2i \(bu @@ -1358,7 +1363,7 @@ jar(1) .TP 0.2i \(bu jdb(1) -.RE -.br -'pl 8.5i -'bp +.RE +.br +'pl 8.5i +'bp diff --git a/jdk/src/bsd/doc/man/javadoc.1 b/jdk/src/bsd/doc/man/javadoc.1 index b48535a388a..202bd989f22 100644 --- a/jdk/src/bsd/doc/man/javadoc.1 +++ b/jdk/src/bsd/doc/man/javadoc.1 @@ -1,53 +1,52 @@ '\" t -.\" Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. -.\" -.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -.\" -.\" This code is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License version 2 only, as -.\" published by the Free Software Foundation. -.\" -.\" This code is distributed in the hope that it will be useful, but WITHOUT -.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" version 2 for more details (a copy is included in the LICENSE file that -.\" accompanied this code). -.\" -.\" You should have received a copy of the GNU General Public License version -.\" 2 along with this work; if not, write to the Free Software Foundation, -.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -.\" or visit www.oracle.com if you need additional information or have any -.\" questions. -.\" +.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. +.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +.\" +.\" This code is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License version 2 only, as +.\" published by the Free Software Foundation. +.\" +.\" This code is distributed in the hope that it will be useful, but WITHOUT +.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +.\" version 2 for more details (a copy is included in the LICENSE file that +.\" accompanied this code). +.\" +.\" You should have received a copy of the GNU General Public License version +.\" 2 along with this work; if not, write to the Free Software Foundation, +.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +.\" or visit www.oracle.com if you need additional information or have any +.\" questions. +.\" .\" Arch: generic .\" Software: JDK 8 -.\" Date: 10 May 2011 +.\" Date: 03 March 2015 .\" SectDesc: Basic Tools .\" Title: javadoc.1 .\" .if n .pl 99999 -.TH javadoc 1 "10 May 2011" "JDK 8" "Basic Tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- +.TH javadoc 1 "03 March 2015" "JDK 8" "Basic Tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH NAME javadoc \- Generates HTML pages of API documentation from Java source files\&. @@ -209,7 +208,7 @@ The \f3package-info\&.java\fR file can contain a package comment of the followin \f3package java\&.lang\&.applet;\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -251,7 +250,7 @@ File: \f3java/applet/package\&.html\fR \f3initialize, start, and stop the applet\&. \fP .fi .nf -\f3\fR +\f3\fP .fi .nf \f3@since 1\&.0 \fP @@ -266,7 +265,7 @@ File: \f3java/applet/package\&.html\fR \f3\fP .fi .nf -\f3\fR +\f3\fP .fi .sp The \f3package\&.html\fR file is a typical HTML file and does not include a package declaration\&. The content of the package comment file is written in HTML with one exception\&. The documentation comment should not include the comment separators \f3/**\fR and \f3*/\fR or leading asterisks\&. When writing the comment, make the first sentence a summary about the package, and do not put a title or any other text between the \f3\fR tag and the first sentence\&. You can include package tags\&. All block tags must appear after the main description\&. If you add an \f3@see\fR tag in a package comment file, then it must have a fully qualified name\&. @@ -334,7 +333,7 @@ All links to the unprocessed files must be included in the code because the \f3j \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp .SS TEST\ AND\ TEMPLATE\ FILES @@ -350,7 +349,7 @@ If you want your test files to belong to either an unnamed package or to a packa \f3com/package1/test\-files/\fP .fi .nf -\f3\fR +\f3\fP .fi .sp If your test files contain documentation comments, then you can set up a separate run of the \f3javadoc\fR command to produce test file documentation by passing in their test source file names with wild cards, such as \f3com/package1/test-files/*\&.java\fR\&. @@ -560,7 +559,7 @@ The \f3javadoc\fR command generates a declaration at the start of each class, in \f3implements Serializable\fP .fi .nf -\f3\fR +\f3\fP .fi .sp The declaration for the \f3Boolean\&.valueOf\fR method is: @@ -569,7 +568,7 @@ The declaration for the \f3Boolean\&.valueOf\fR method is: \f3public static Boolean valueOf(String s)\fP .fi .nf -\f3\fR +\f3\fP .fi .sp The \f3javadoc\fR command can include the modifiers \f3public\fR, \f3protected\fR, \f3private\fR, \f3abstract\fR, \f3final\fR, \f3static\fR, \f3transient\fR, and \f3volatile\fR, but not \f3synchronized\fR or \f3native\fR\&. The \f3synchronized\fR and \f3native\fR modifiers are considered implementation detail and not part of the API specification\&. @@ -593,7 +592,7 @@ You can include documentation comments in the source code, ahead of declarations \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp To save space you can put a comment on one line: @@ -602,7 +601,7 @@ To save space you can put a comment on one line: \f3/** This comment takes up only one line\&. */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -623,19 +622,19 @@ A common mistake is to put an \f3import\fR statement between the class comment a \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .nf \f3import com\&.example; // MISTAKE \- Important not to put import statement here\fP .fi .nf -\f3\fR +\f3\fP .fi .nf \f3public class Whatever{ }\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -657,7 +656,7 @@ A documentation comment has a main description followed by a tag section\&. The \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -676,7 +675,7 @@ A tag is a special keyword within a documentation comment that the \f3javadoc\fR \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -700,7 +699,7 @@ For example, entities for the less than symbol (<) and the greater than symbol ( \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -730,7 +729,7 @@ The Java platform lets you declare multiple fields in a single statement, but th \f3public int x, y; // Avoid this \fP .fi .nf -\f3\fR +\f3\fP .fi .sp The \f3javadoc\fR command generates the following documentation from the previous code: @@ -739,7 +738,7 @@ The \f3javadoc\fR command generates the following documentation from the previou \f3public int x\fP .fi .nf -\f3\fR +\f3\fP .fi .sp The horizontal and vertical distances of point (x, y)\&. @@ -748,7 +747,7 @@ The horizontal and vertical distances of point (x, y)\&. \f3public int y\fP .fi .nf -\f3\fR +\f3\fP .fi .sp The horizontal and vertical distances of point (x, y)\&. @@ -872,7 +871,7 @@ In a documentation comment: \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -899,11 +898,10 @@ In the main description block of a method\&. In this case, the main description .TP 0.2i \(bu In the text arguments of the \f3@return\fR, \f3@param,\fR and \f3@throws\fR tags of a method\&. In this case, the tag text is copied from the corresponding tag up the hierarchy\&. -.RE -.RS -See Method Comment Inheritance for a description of how comments are found in the inheritance hierarchy\&. Note that if this tag is missing, then the comment is or is not automatically inherited according to rules described in that section\&. +.RE -.RE + +See Method Comment Inheritance for a description of how comments are found in the inheritance hierarchy\&. Note that if this tag is missing, then the comment is or is not automatically inherited according to rules described in that section\&. .TP {@link \fIpackage\&.class#member label\fR} Introduced in JDK 1\&.2 @@ -920,7 +918,7 @@ For example, here is a comment that refers to the \f3getComponentAt(int, int)\fR \f3Use the {@link #getComponentAt(int, int) getComponentAt} method\&.\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -931,7 +929,7 @@ From this code, the standard doclet generates the following HTML (assuming it re \f3Use the getComponentAt method\&.\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -942,7 +940,7 @@ The previous line appears on the web page as: \f3Use the getComponentAt method\&.\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -982,7 +980,7 @@ Example of a type parameter of a class: \f3}\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -1014,7 +1012,7 @@ Example of a type parameter of a method: \f3}\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -1071,7 +1069,7 @@ A space is the delimiter between \f3package\&.class#member\fR and \f3label\fR\&. \f3 */\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -1091,7 +1089,7 @@ The standard doclet produces HTML that is similar to: \f3\fP .fi .nf -\f3\fR +\f3\fP .fi .sp @@ -1128,7 +1126,7 @@ Specify a Name \f3@see #constructor(Type argname, Type argname,\&.\&.\&.) \fP .fi .nf -\f3\fR +\f3\fP .fi .nf \f3\fIReferencing another class in the current or imported packages\fR\fP @@ -1155,7 +1153,7 @@ Specify a Name \f3@see Class \fP .fi .nf -\f3\fR +\f3\fP .fi .nf \f3\fIReferencing an element in another package (fully qualified)\fR\fP @@ -1185,7 +1183,7 @@ Specify a Name \f3@see package\fP .fi .nf -\f3\fR +\f3\fP .fi .sp \f3\fRNotes about the previous listing: @@ -1215,7 +1213,7 @@ The current class or interface\&. Any enclosing classes and interfaces searching the closest first\&. .TP 0.4i 3\&. -Any superclasses and superonterfaces, searching the closest first\&. +Any superclasses and superinterfaces, searching the closest first\&. .TP 0.4i 4\&. The current package\&. @@ -1307,7 +1305,7 @@ The comment to the right shows how the name appears when the \f3@see\fR tag is i \f3@see "The Java Programming Language" // "The Java Programming Language" \fP .fi .nf -\f3\fR +\f3\fP .fi .sp \fINote:\fR You can extend the \f3@se\fR\f3e\fR tag to link to classes not being documented with the \f3-link\fR option\&. @@ -1317,7 +1315,7 @@ Introduced in JDK 1\&.2 Used in the documentation comment for a default serializable field\&. See Documenting Serializable Fields and Data for a Class at http://docs\&.oracle\&.com/javase/8/docs/platform/serialization/spec/serial-arch\&.html#5251 -See also Oracle\(cqs Criteria for Including Classes in the Serialilzed Form Specification at http://www\&.oracle\&.com/technetwork/java/javase/documentation/serialized-criteria-137781\&.html +See also Oracle\(cqs Criteria for Including Classes in the Serialized Form Specification at http://www\&.oracle\&.com/technetwork/java/javase/documentation/serialized-criteria-137781\&.html An optional \f3field-description\fR should explain the meaning of the field and list the acceptable values\&. When needed, the description can span multiple lines\&. The standard doclet adds this information to the serialized form page\&. See Cross-Reference Pages\&. @@ -1331,13 +1329,12 @@ A public or protected class that implements \f3Serializable\fR is included unles .TP 0.2i \(bu A private or package-private class that implements \f3Serializable\fR is excluded unless that class (or its package) is marked with the \f3@serial include\fR tag\&. -.RE -.RS +.RE + + For example, the \f3javax\&.swing\fR package is marked with the \f3@serial\fR\f3exclude\fR tag in package\&.html or package-info\&.java\&. The public class \f3java\&.security\&.BasicPermission\fR is marked with the \f3@serial exclude\fR tag\&. The package-private class \f3java\&.util\&.PropertyPermissionCollection\fR is marked with the \f3@serial include\fR tag\&. The \f3@serial\fR tag at the class level overrides the \f3@serial\fR tag at the package level\&. - -.RE .TP @serialData \fIdata-description\fR Introduced in JDK 1\&.2 @@ -1387,7 +1384,7 @@ Displays constant values\&. When the \f3{@value}\fR tag is used without an argum \f3public static final String SCRIPT_START = "