The (supported) Generation hierarchy currently looks like this:
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java similarity index 94% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java index c757ac02a37..5818513c330 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, 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 @@ -22,11 +22,13 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; import java.util.*; import sun.jvm.hotspot.debugger.*; +import sun.jvm.hotspot.gc.cms.*; +import sun.jvm.hotspot.gc.serial.*; import sun.jvm.hotspot.runtime.*; import sun.jvm.hotspot.types.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java similarity index 92% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java index a93819c73af..a0b759918d1 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationIsInClosure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 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 @@ -22,7 +22,7 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; import sun.jvm.hotspot.debugger.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java similarity index 95% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java index 24603b62e6d..484ce6959dc 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, 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 @@ -22,7 +22,7 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; import java.util.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java similarity index 91% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java index d3db1bd5e24..30564238287 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/OffsetTableContigSpace.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 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 @@ -22,7 +22,7 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; import sun.jvm.hotspot.debugger.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Space.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Space.java similarity index 96% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Space.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Space.java index c047a8c81c4..1f941e9747b 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Space.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Space.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, 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 @@ -22,13 +22,14 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; import java.io.*; import java.util.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.types.*; +import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.runtime.*; +import sun.jvm.hotspot.types.*; /**A Space describes a heap area. Class Space is an abstract base class.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java similarity index 90% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java index 4306f4214e3..c8ef40f98ab 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/SpaceClosure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 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 @@ -22,7 +22,7 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; public interface SpaceClosure { public void doSpace(Space s); diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java similarity index 91% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java index 1b4d9e0fe07..7a5b46ddff6 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 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 @@ -22,7 +22,7 @@ * */ -package sun.jvm.hotspot.memory; +package sun.jvm.hotspot.gc.shared; import sun.jvm.hotspot.debugger.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ReferenceType.java similarity index 93% rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ReferenceType.java index e8bb8bc2119..e5c8f5a1d9a 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ReferenceType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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,7 +22,7 @@ * */ -package sun.jvm.hotspot.gc_interface; +package sun.jvm.hotspot.memory; //These definitions should be kept in sync with the definitions in the HotSpot code. diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java index ee4fbb06594..f26fc452c94 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java @@ -27,9 +27,9 @@ package sun.jvm.hotspot.memory; import java.io.*; import java.util.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; -import sun.jvm.hotspot.gc_implementation.g1.G1CollectedHeap; -import sun.jvm.hotspot.gc_implementation.parallelScavenge.*; +import sun.jvm.hotspot.gc.shared.*; +import sun.jvm.hotspot.gc.g1.G1CollectedHeap; +import sun.jvm.hotspot.gc.parallel.*; import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.types.*; import sun.jvm.hotspot.runtime.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java index d550a935fa3..f7c0a625942 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.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 @@ -32,9 +32,10 @@ package sun.jvm.hotspot.oops; import java.util.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; -import sun.jvm.hotspot.gc_implementation.g1.*; -import sun.jvm.hotspot.gc_implementation.parallelScavenge.*; +import sun.jvm.hotspot.gc.cms.*; +import sun.jvm.hotspot.gc.shared.*; +import sun.jvm.hotspot.gc.g1.*; +import sun.jvm.hotspot.gc.parallel.*; import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.runtime.*; import sun.jvm.hotspot.types.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java index eb090565a9b..f10e0b4c418 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, 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 @@ -25,10 +25,10 @@ package sun.jvm.hotspot.tools; import java.util.*; -import sun.jvm.hotspot.gc_interface.*; -import sun.jvm.hotspot.gc_implementation.g1.*; -import sun.jvm.hotspot.gc_implementation.parallelScavenge.*; -import sun.jvm.hotspot.gc_implementation.shared.*; +import sun.jvm.hotspot.gc.g1.*; +import sun.jvm.hotspot.gc.parallel.*; +import sun.jvm.hotspot.gc.serial.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.debugger.JVMDebugger; import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.oops.*; @@ -85,7 +85,7 @@ public class HeapSummary extends Tool { GenCollectedHeap genHeap = (GenCollectedHeap) heap; for (int n = 0; n < genHeap.nGens(); n++) { Generation gen = genHeap.getGen(n); - if (gen instanceof sun.jvm.hotspot.memory.DefNewGeneration) { + if (gen instanceof DefNewGeneration) { System.out.println("New Generation (Eden + 1 Survivor Space):"); printGen(gen); diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java index eba84fd6496..9f4c2d2e3b8 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java @@ -1236,7 +1236,7 @@ public class HTMLGenerator implements /* imports */ ClassConstants { protected String genOopMapInfo(NMethod nmethod, PCDesc pcDesc) { ImmutableOopMapSet mapSet = nmethod.getOopMaps(); - if (mapSet == null || (mapSet.getSize() <= 0)) + if (mapSet == null || (mapSet.getCount() <= 0)) return ""; int pcOffset = pcDesc.getPCOffset(); ImmutableOopMap map = mapSet.findMapAtOffset(pcOffset, VM.getVM().isDebugging()); diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java index 1aa3c8c8815..a69f88f5a3c 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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,7 +27,7 @@ package sun.jvm.hotspot.utilities; import java.io.*; import java.util.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java index a93fc65455e..5b247573749 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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,7 +25,7 @@ package sun.jvm.hotspot.utilities; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java index a76457f7f5f..35e8fe003e8 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, 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 @@ -26,7 +26,7 @@ package sun.jvm.hotspot.utilities; import sun.jvm.hotspot.code.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.interpreter.*; import sun.jvm.hotspot.runtime.*; import sun.jvm.hotspot.memory.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java index 0dd1ea966d5..aa50800de63 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, 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 @@ -27,7 +27,7 @@ package sun.jvm.hotspot.utilities; import java.io.*; import sun.jvm.hotspot.code.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.interpreter.*; import sun.jvm.hotspot.runtime.*; import sun.jvm.hotspot.memory.*; diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java index 35afe78f724..50a8d4d62a8 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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,7 +27,7 @@ package sun.jvm.hotspot.utilities; import java.io.*; import java.util.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; diff --git a/hotspot/make/aix/makefiles/vm.make b/hotspot/make/aix/makefiles/vm.make index cf10de3e214..ecd46d1c371 100644 --- a/hotspot/make/aix/makefiles/vm.make +++ b/hotspot/make/aix/makefiles/vm.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright 2012, 2013 SAP AG. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -137,7 +137,7 @@ LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo LIBJVM_DIZ = lib$(JVM).diz -SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt +SPECIAL_PATHS:=adlc c1 gc opto shark libadt SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ diff --git a/hotspot/make/bsd/makefiles/vm.make b/hotspot/make/bsd/makefiles/vm.make index 1adcc796719..b27d88fb556 100644 --- a/hotspot/make/bsd/makefiles/vm.make +++ b/hotspot/make/bsd/makefiles/vm.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 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 @@ -154,7 +154,7 @@ else LIBJVM_DIZ = lib$(JVM).diz endif -SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt +SPECIAL_PATHS:=adlc c1 gc opto shark libadt SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ diff --git a/hotspot/make/excludeSrc.make b/hotspot/make/excludeSrc.make index 5cfdb4d3058..0bc759f25b7 100644 --- a/hotspot/make/excludeSrc.make +++ b/hotspot/make/excludeSrc.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 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 @@ -81,36 +81,15 @@ ifeq ($(INCLUDE_ALL_GCS), false) CXXFLAGS += -DINCLUDE_ALL_GCS=0 CFLAGS += -DINCLUDE_ALL_GCS=0 - gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation - gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation - gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew + gc_dir := $(HS_COMMON_SRC)/share/vm/gc + gc_dir_alt := $(HS_ALT_SRC)/share/vm/gc + gc_subdirs := cms g1 parallel gc_exclude := $(foreach gc,$(gc_subdirs), \ - $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp)) \ - $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp))) - Src_Files_EXCLUDE += $(gc_exclude) - - # Exclude everything in $(gc_impl)/shared except the files listed - # in $(gc_shared_keep). - gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp)) - gc_shared_keep := \ - adaptiveSizePolicy.cpp \ - ageTable.cpp \ - collectorCounters.cpp \ - cSpaceCounters.cpp \ - gcId.cpp \ - gcPolicyCounters.cpp \ - gcStats.cpp \ - gcTimer.cpp \ - gcTrace.cpp \ - gcTraceSend.cpp \ - gcTraceTime.cpp \ - gcUtil.cpp \ - generationCounters.cpp \ - markSweep.cpp \ - objectCountEventSender.cpp \ - spaceDecorator.cpp \ - vmGCOperations.cpp - Src_Files_EXCLUDE += $(filter-out $(gc_shared_keep),$(gc_shared_all)) + $(notdir $(wildcard $(gc_dir)/$(gc)/*.cpp)) \ + $(notdir $(wildcard $(gc_dir_alt)/$(gc)/*.cpp))) + Src_Files_EXCLUDE += $(gc_exclude) \ + concurrentGCThread.cpp \ + plab.cpp # src/share/vm/services Src_Files_EXCLUDE += \ diff --git a/hotspot/make/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make index d0737d41c1a..c334309978d 100644 --- a/hotspot/make/linux/makefiles/vm.make +++ b/hotspot/make/linux/makefiles/vm.make @@ -142,7 +142,7 @@ LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo LIBJVM_DIZ = lib$(JVM).diz -SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt +SPECIAL_PATHS:=adlc c1 gc opto shark libadt SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ diff --git a/hotspot/make/pic.make b/hotspot/make/pic.make index 0e61ad93127..9211b5b70d6 100644 --- a/hotspot/make/pic.make +++ b/hotspot/make/pic.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. +# 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 @@ -37,7 +37,7 @@ ifneq ($(OSNAME), windows) PARTIAL_NONPIC=0 endif ifeq ($(PARTIAL_NONPIC),1) - NONPIC_DIRS = memory oops gc_implementation gc_interface + NONPIC_DIRS = memory oops gc NONPIC_DIRS := $(foreach dir,$(NONPIC_DIRS), $(GAMMADIR)/src/share/vm/$(dir)) # Look for source files under NONPIC_DIRS NONPIC_FILES := $(foreach dir,$(NONPIC_DIRS),\ diff --git a/hotspot/make/sa.files b/hotspot/make/sa.files index dfe1e53a209..a39dc1c98e9 100644 --- a/hotspot/make/sa.files +++ b/hotspot/make/sa.files @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2013, 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 @@ -79,10 +79,11 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/x86/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windows/x86/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windows/amd64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/x86/*.java \ -$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/g1/*.java \ -$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/parallelScavenge/*.java \ -$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/shared/*.java \ -$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_interface/*.java \ +$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/cms/*.java \ +$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/g1/*.java \ +$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/parallel/*.java \ +$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/serial/*.java \ +$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/shared/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/interpreter/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/jdi/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/*.java \ diff --git a/hotspot/make/solaris/makefiles/vm.make b/hotspot/make/solaris/makefiles/vm.make index 04a2b608b35..75d974e3de6 100644 --- a/hotspot/make/solaris/makefiles/vm.make +++ b/hotspot/make/solaris/makefiles/vm.make @@ -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 @@ -163,7 +163,7 @@ LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo LIBJVM_DIZ = lib$(JVM).diz -SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt +SPECIAL_PATHS:=adlc c1 dist gc opto shark libadt SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ diff --git a/hotspot/make/test/JtregNative.gmk b/hotspot/make/test/JtregNative.gmk index edff57fc014..e62bc94abe2 100644 --- a/hotspot/make/test/JtregNative.gmk +++ b/hotspot/make/test/JtregNative.gmk @@ -42,6 +42,8 @@ include TestFilesCompilation.gmk # Add more directories here when needed. BUILD_HOTSPOT_JTREG_NATIVE_SRC := \ $(HOTSPOT_TOPDIR)/test/native_sanity \ + $(HOTSPOT_TOPDIR)/test/runtime/jni/8025979 \ + $(HOTSPOT_TOPDIR)/test/runtime/jni/8033445 \ # BUILD_HOTSPOT_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/hotspot/jtreg/native diff --git a/hotspot/make/windows/create_obj_files.sh b/hotspot/make/windows/create_obj_files.sh index c17b0690e17..e99ca829e6d 100644 --- a/hotspot/make/windows/create_obj_files.sh +++ b/hotspot/make/windows/create_obj_files.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, 2013, 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 @@ -57,11 +57,11 @@ ALTSRC_REL=src/closed # Change this to pick up alt sources from somewhere else COMMONSRC=${WorkSpace}/${COMMONSRC_REL} ALTSRC=${WorkSpace}/${ALTSRC_REL} -BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \); fi`" -BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)`" +BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc -o -name opto -o -name shark -o -name libadt \); fi`" +BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc -o -name opto -o -name shark -o -name libadt \)`" for sd in \ - share/vm/gc_implementation/shared \ + share/vm/gc/shared \ os/${Platform_os_family}/vm \ cpu/${Platform_arch}/vm \ os_cpu/${Platform_os_arch}/vm; do @@ -80,10 +80,10 @@ fi BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/share/vm/prims/wbtestmethods" # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS. -if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then - BASE_PATHS="${BASE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" +if [ -d "${ALTSRC}/share/vm/gc" ]; then + BASE_PATHS="${BASE_PATHS} `$FIND ${ALTSRC}/share/vm/gc ! -name gc -prune -type d \! -name shared`" fi -BASE_PATHS="${BASE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" +BASE_PATHS="${BASE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc ! -name gc -prune -type d \! -name shared`" if [ -d "${ALTSRC}/share/vm/c1" ]; then COMPILER1_PATHS="${ALTSRC}/share/vm/c1" diff --git a/hotspot/make/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make index 9267a71aac9..65fbf2a0ae7 100644 --- a/hotspot/make/windows/makefiles/vm.make +++ b/hotspot/make/windows/makefiles/vm.make @@ -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 @@ -157,12 +157,11 @@ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/ci VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/classfile -VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parallelScavenge -VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/shared -VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parNew -VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/concurrentMarkSweep -VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/g1 -VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_interface +VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/parallel +VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/shared +VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/serial +VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/cms +VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/g1 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/asm VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops @@ -233,22 +232,19 @@ bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWi {$(COMMONSRC)\share\vm\classfile}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: +{$(COMMONSRC)\share\vm\gc\parallel}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj:: +{$(COMMONSRC)\share\vm\gc\shared}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: +{$(COMMONSRC)\share\vm\gc\serial}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: +{$(COMMONSRC)\share\vm\gc\cms}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj:: - $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< - -{$(COMMONSRC)\share\vm\gc_interface}.cpp.obj:: +{$(COMMONSRC)\share\vm\gc\g1}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< {$(COMMONSRC)\share\vm\asm}.cpp.obj:: @@ -316,22 +312,19 @@ bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWi {$(ALTSRC)\share\vm\classfile}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: +{$(ALTSRC)\share\vm\gc\parallel}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj:: +{$(ALTSRC)\share\vm\gc\shared}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: +{$(ALTSRC)\share\vm\gc\serial}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: +{$(ALTSRC)\share\vm\gc\cms}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< -{$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj:: - $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< - -{$(ALTSRC)\share\vm\gc_interface}.cpp.obj:: +{$(ALTSRC)\share\vm\gc\g1}.cpp.obj:: $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< {$(ALTSRC)\share\vm\asm}.cpp.obj:: diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad index 357b0167029..a71729c503b 100644 --- a/hotspot/src/cpu/aarch64/vm/aarch64.ad +++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad @@ -1,5 +1,5 @@ // -// Copyright (c) 2003, 2012, 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. // @@ -828,7 +828,7 @@ definitions %{ source_hpp %{ -#include "memory/cardTableModRefBS.hpp" +#include "gc/shared/cardTableModRefBS.hpp" class CallStubImpl { diff --git a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp index 4b076fcdc45..5cb78d2055d 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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. * @@ -33,7 +33,7 @@ #include "runtime/sharedRuntime.hpp" #include "vmreg_aarch64.inline.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp index d5e0184d6ff..353486c402d 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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. * @@ -33,9 +33,9 @@ #include "c1/c1_ValueStack.hpp" #include "ci/ciArrayKlass.hpp" #include "ci/ciInstance.hpp" -#include "gc_interface/collectedHeap.hpp" -#include "memory/barrierSet.hpp" -#include "memory/cardTableModRefBS.hpp" +#include "gc/shared/barrierSet.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.hpp" #include "nativeInst_aarch64.hpp" #include "oops/objArrayKlass.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp index 8886eb33964..046be55e4e5 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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. * @@ -27,7 +27,7 @@ #include "c1/c1_MacroAssembler.hpp" #include "c1/c1_Runtime1.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/collectedHeap.hpp" #include "interpreter/interpreter.hpp" #include "oops/arrayOop.hpp" #include "oops/markOop.hpp" diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp index 5b31905fdef..a68da825e62 100644 --- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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. * @@ -42,7 +42,7 @@ #include "runtime/vframeArray.hpp" #include "vmreg_aarch64.inline.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif diff --git a/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp index fc0fc8820fd..21c2a3cc770 100644 --- a/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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. * @@ -27,7 +27,7 @@ #include "asm/macroAssembler.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/icBuffer.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_aarch64.hpp" diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp index 7d180013406..1bc3643e1c4 100644 --- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp +++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp @@ -41,9 +41,9 @@ #include "runtime/sharedRuntime.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif #ifdef PRODUCT diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp index 7b19ddb0018..56564ac7ea7 100644 --- a/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "asm/assembler.inline.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" -#include "memory/cardTableModRefBS.hpp" #include "memory/resourceArea.hpp" #include "prims/methodHandles.hpp" #include "runtime/biasedLocking.hpp" @@ -38,9 +38,9 @@ #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS #ifdef PRODUCT diff --git a/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp b/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp index 536e5728bc1..8e16078b3d7 100644 --- a/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp @@ -27,7 +27,7 @@ #include "asm/assembler.hpp" #include "assembler_ppc.inline.hpp" #include "code/icBuffer.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_ppc.hpp" diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp index 4d0e6df26b5..587000b963f 100644 --- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp @@ -26,9 +26,9 @@ #include "precompiled.hpp" #include "asm/macroAssembler.inline.hpp" #include "compiler/disassembler.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" -#include "memory/cardTableModRefBS.hpp" #include "memory/resourceArea.hpp" #include "prims/methodHandles.hpp" #include "runtime/biasedLocking.hpp" @@ -40,9 +40,9 @@ #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS #ifdef PRODUCT diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad index 388b102ee11..b4264973cb3 100644 --- a/hotspot/src/cpu/ppc/vm/ppc.ad +++ b/hotspot/src/cpu/ppc/vm/ppc.ad @@ -2173,9 +2173,8 @@ const bool Matcher::clone_shift_expressions = false; // Do we need to mask the count passed to shift instructions or does // the cpu only look at the lower 5/6 bits anyway? -// Off, as masks are generated in expand rules where required. -// Constant shift counts are handled in Ideal phase. -const bool Matcher::need_masked_shift_count = false; +// PowerPC requires masked shift counts. +const bool Matcher::need_masked_shift_count = true; // This affects two different things: // - how Decode nodes are matched diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp index 1187443000d..f998a9c3a12 100644 --- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp @@ -33,7 +33,7 @@ #include "utilities/macros.hpp" #include "vmreg_sparc.inline.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // INCLUDE_ALL_GCS #define __ ce->masm()-> diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp index 69d5987a40d..6efec095dcc 100644 --- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp @@ -30,9 +30,9 @@ #include "c1/c1_ValueStack.hpp" #include "ci/ciArrayKlass.hpp" #include "ci/ciInstance.hpp" -#include "gc_interface/collectedHeap.hpp" -#include "memory/barrierSet.hpp" -#include "memory/cardTableModRefBS.hpp" +#include "gc/shared/barrierSet.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.hpp" #include "nativeInst_sparc.hpp" #include "oops/objArrayKlass.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp index ca72c6bdc00..2e4bb6bac7d 100644 --- a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp @@ -26,7 +26,7 @@ #include "c1/c1_MacroAssembler.hpp" #include "c1/c1_Runtime1.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/collectedHeap.hpp" #include "interpreter/interpreter.hpp" #include "oops/arrayOop.hpp" #include "oops/markOop.hpp" diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp index c27f81abd6d..766b00a6bd8 100644 --- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp @@ -37,7 +37,7 @@ #include "utilities/macros.hpp" #include "vmreg_sparc.inline.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // Implementation of StubAssembler diff --git a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp index 800e6ef5a74..2c3424c0699 100644 --- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp +++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp @@ -79,7 +79,7 @@ define_pd_global(bool, PreserveFramePointer, false); // GC Ergo Flags define_pd_global(size_t, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread -define_pd_global(uintx, TypeProfileLevel, 0); +define_pd_global(uintx, TypeProfileLevel, 111); #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \ \ diff --git a/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp b/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp index 21565fb44f5..641da12ab76 100644 --- a/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/icBuffer.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_sparc.hpp" diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp index fa90497fb76..d4507cf04b0 100644 --- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "asm/macroAssembler.inline.hpp" #include "compiler/disassembler.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" -#include "memory/cardTableModRefBS.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "prims/methodHandles.hpp" @@ -39,9 +39,9 @@ #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS #ifdef PRODUCT diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp index 613c1cb0145..b6f92e8730e 100644 --- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/assembler_x86.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 @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "asm/assembler.hpp" #include "asm/assembler.inline.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" -#include "memory/cardTableModRefBS.hpp" #include "memory/resourceArea.hpp" #include "prims/methodHandles.hpp" #include "runtime/biasedLocking.hpp" @@ -38,9 +38,9 @@ #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS #ifdef PRODUCT diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp index 919c2a6df9c..71684561223 100644 --- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp @@ -33,7 +33,7 @@ #include "utilities/macros.hpp" #include "vmreg_x86.inline.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // INCLUDE_ALL_GCS diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp index c76408f6af7..d8e9f412d79 100644 --- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @@ -32,9 +32,9 @@ #include "c1/c1_ValueStack.hpp" #include "ci/ciArrayKlass.hpp" #include "ci/ciInstance.hpp" -#include "gc_interface/collectedHeap.hpp" -#include "memory/barrierSet.hpp" -#include "memory/cardTableModRefBS.hpp" +#include "gc/shared/barrierSet.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.hpp" #include "nativeInst_x86.hpp" #include "oops/objArrayKlass.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp index cf1a59a30b3..76d160ac113 100644 --- a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp @@ -26,7 +26,7 @@ #include "c1/c1_MacroAssembler.hpp" #include "c1/c1_Runtime1.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/collectedHeap.hpp" #include "interpreter/interpreter.hpp" #include "oops/arrayOop.hpp" #include "oops/markOop.hpp" diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp index 6746704cabf..7818ddd2c95 100644 --- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp @@ -39,7 +39,7 @@ #include "utilities/macros.hpp" #include "vmreg_x86.inline.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif diff --git a/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp b/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp index 6d10865c32f..dc45fa7f65c 100644 --- a/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp +++ b/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp @@ -26,7 +26,7 @@ #include "asm/macroAssembler.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/icBuffer.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_x86.hpp" diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp b/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp index e9e238001aa..80995b130f9 100644 --- a/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86.cpp @@ -1035,8 +1035,7 @@ void InterpreterMacroAssembler::get_method_counters(Register method, // rdx, c_rarg1: BasicObjectLock to be used for locking // // Kills: -// rax -// rscratch1 (scratch regs) +// rax, rbx void InterpreterMacroAssembler::lock_object(Register lock_reg) { assert(lock_reg == LP64_ONLY(c_rarg1) NOT_LP64(rdx), "The argument is only for looks. It must be c_rarg1"); @@ -1049,6 +1048,8 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) { Label done; const Register swap_reg = rax; // Must use rax for cmpxchg instruction + const Register tmp_reg = rbx; // Will be passed to biased_locking_enter to avoid a + // problematic case where tmp_reg = no_reg. const Register obj_reg = LP64_ONLY(c_rarg3) NOT_LP64(rcx); // Will contain the oop const int obj_offset = BasicObjectLock::obj_offset_in_bytes(); @@ -1062,7 +1063,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) { movptr(obj_reg, Address(lock_reg, obj_offset)); if (UseBiasedLocking) { - biased_locking_enter(lock_reg, obj_reg, swap_reg, rscratch1, false, done, &slow_case); + biased_locking_enter(lock_reg, obj_reg, swap_reg, tmp_reg, false, done, &slow_case); } // Load immediate 1 into swap_reg %rax diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp index 21674fc6c01..d172a467f3c 100644 --- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp @@ -26,9 +26,9 @@ #include "asm/assembler.hpp" #include "asm/assembler.inline.hpp" #include "compiler/disassembler.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" -#include "memory/cardTableModRefBS.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "prims/methodHandles.hpp" @@ -40,9 +40,9 @@ #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS #ifdef PRODUCT @@ -1069,15 +1069,8 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, BiasedLockingCounters* counters) { assert(UseBiasedLocking, "why call this otherwise?"); assert(swap_reg == rax, "swap_reg must be rax for cmpxchgq"); - LP64_ONLY( assert(tmp_reg != noreg, "tmp_reg must be supplied"); ) - bool need_tmp_reg = false; - if (tmp_reg == noreg) { - need_tmp_reg = true; - tmp_reg = lock_reg; - assert_different_registers(lock_reg, obj_reg, swap_reg); - } else { - assert_different_registers(lock_reg, obj_reg, swap_reg, tmp_reg); - } + assert(tmp_reg != noreg, "tmp_reg must be supplied"); + assert_different_registers(lock_reg, obj_reg, swap_reg, tmp_reg); assert(markOopDesc::age_shift == markOopDesc::lock_bits + markOopDesc::biased_lock_bits, "biased locking makes assumptions about bit layout"); Address mark_addr (obj_reg, oopDesc::mark_offset_in_bytes()); Address saved_mark_addr(lock_reg, 0); @@ -1097,15 +1090,9 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, null_check_offset = offset(); movptr(swap_reg, mark_addr); } - if (need_tmp_reg) { - push(tmp_reg); - } movptr(tmp_reg, swap_reg); andptr(tmp_reg, markOopDesc::biased_lock_mask_in_place); cmpptr(tmp_reg, markOopDesc::biased_lock_pattern); - if (need_tmp_reg) { - pop(tmp_reg); - } jcc(Assembler::notEqual, cas_label); // The bias pattern is present in the object's header. Need to check // whether the bias owner and the epoch are both still current. @@ -1117,9 +1104,6 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, // simpler. movptr(saved_mark_addr, swap_reg); #endif - if (need_tmp_reg) { - push(tmp_reg); - } if (swap_reg_contains_mark) { null_check_offset = offset(); } @@ -1135,9 +1119,6 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, Register header_reg = swap_reg; #endif andptr(header_reg, ~((int) markOopDesc::age_mask_in_place)); - if (need_tmp_reg) { - pop(tmp_reg); - } if (counters != NULL) { cond_inc32(Assembler::zero, ExternalAddress((address) counters->biased_lock_entry_count_addr())); @@ -1180,9 +1161,6 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, NOT_LP64( movptr(swap_reg, saved_mark_addr); ) andptr(swap_reg, markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place); - if (need_tmp_reg) { - push(tmp_reg); - } #ifdef _LP64 movptr(tmp_reg, swap_reg); orptr(tmp_reg, r15_thread); @@ -1194,9 +1172,6 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, lock(); } cmpxchgptr(tmp_reg, mark_addr); // compare tmp_reg and swap_reg - if (need_tmp_reg) { - pop(tmp_reg); - } // If the biasing toward our thread failed, this means that // another thread succeeded in biasing it toward itself and we // need to revoke that bias. The revocation will occur in the @@ -1220,9 +1195,6 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, // // FIXME: due to a lack of registers we currently blow away the age // bits in this situation. Should attempt to preserve them. - if (need_tmp_reg) { - push(tmp_reg); - } load_prototype_header(tmp_reg, obj_reg); #ifdef _LP64 orptr(tmp_reg, r15_thread); @@ -1235,9 +1207,6 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, lock(); } cmpxchgptr(tmp_reg, mark_addr); // compare tmp_reg and swap_reg - if (need_tmp_reg) { - pop(tmp_reg); - } // If the biasing toward our thread failed, then another thread // succeeded in biasing it toward itself and we need to revoke that // bias. The revocation will occur in the runtime in the slow case. @@ -1263,17 +1232,11 @@ int MacroAssembler::biased_locking_enter(Register lock_reg, // FIXME: due to a lack of registers we currently blow away the age // bits in this situation. Should attempt to preserve them. NOT_LP64( movptr(swap_reg, saved_mark_addr); ) - if (need_tmp_reg) { - push(tmp_reg); - } load_prototype_header(tmp_reg, obj_reg); if (os::is_MP()) { lock(); } cmpxchgptr(tmp_reg, mark_addr); // compare tmp_reg and swap_reg - if (need_tmp_reg) { - pop(tmp_reg); - } // Fall through to the normal CAS-based lock, because no matter what // the result of the above CAS, some thread must have succeeded in // removing the bias bit from the object's header. diff --git a/hotspot/src/cpu/zero/vm/assembler_zero.cpp b/hotspot/src/cpu/zero/vm/assembler_zero.cpp index 4a60af98fd4..669273d955d 100644 --- a/hotspot/src/cpu/zero/vm/assembler_zero.cpp +++ b/hotspot/src/cpu/zero/vm/assembler_zero.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "assembler_zero.inline.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" -#include "memory/cardTableModRefBS.hpp" #include "memory/resourceArea.hpp" #include "prims/methodHandles.hpp" #include "runtime/biasedLocking.hpp" @@ -38,9 +38,9 @@ #include "runtime/stubRoutines.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS int AbstractAssembler::code_fill_byte() { diff --git a/hotspot/src/cpu/zero/vm/globals_zero.hpp b/hotspot/src/cpu/zero/vm/globals_zero.hpp index 9e2020ea159..1f7a4f87114 100644 --- a/hotspot/src/cpu/zero/vm/globals_zero.hpp +++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp @@ -61,6 +61,8 @@ define_pd_global(size_t, CMSYoungGenPerWorker, 16*M); // default max size of CM define_pd_global(uintx, TypeProfileLevel, 0); +define_pd_global(bool, PreserveFramePointer, false); + #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \ product(bool, UseFastEmptyMethods, true, \ "Use fast method entry code for empty methods") \ diff --git a/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp b/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp index 924e0836067..8e28fa6eacc 100644 --- a/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp +++ b/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp @@ -27,7 +27,7 @@ #include "asm/assembler.hpp" #include "assembler_zero.inline.hpp" #include "code/icBuffer.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecodes.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_zero.hpp" diff --git a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp index a4fa0d560c7..8fd9e727b17 100644 --- a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp +++ b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp @@ -41,7 +41,7 @@ #include "code/codeBlob.hpp" #include "code/nmethod.hpp" #include "code/pcDesc.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/collectedHeap.hpp" #include "memory/heap.hpp" #include "memory/memRegion.hpp" #include "memory/universe.hpp" diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp index 013ee143c92..3ae38ebed3c 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp @@ -5878,14 +5878,6 @@ void Parker::unpark() { extern char** environ; -#ifndef __NR_fork - #define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57) AARCH64_ONLY(1079) -#endif - -#ifndef __NR_execve - #define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59) AARCH64_ONLY(221) -#endif - // Run the specified command in a separate process. Return its exit value, // or -1 on failure (e.g. can't fork a new process). // Unlike system(), this function can be called from signal handler. It @@ -5893,13 +5885,7 @@ extern char** environ; int os::fork_and_exec(char* cmd) { const char * argv[4] = {"sh", "-c", cmd, NULL}; - // fork() in LinuxThreads/NPTL is not async-safe. It needs to run - // pthread_atfork handlers and reset pthread library. All we need is a - // separate process to execve. Make a direct syscall to fork process. - // On IA64 there's no fork syscall, we have to use fork() and hope for - // the best... - pid_t pid = NOT_IA64(syscall(__NR_fork);) - IA64_ONLY(fork();) + pid_t pid = fork(); if (pid < 0) { // fork failed @@ -5908,15 +5894,7 @@ int os::fork_and_exec(char* cmd) { } else if (pid == 0) { // child process - // execve() in LinuxThreads will call pthread_kill_other_threads_np() - // first to kill every thread on the thread list. Because this list is - // not reset by fork() (see notes above), execve() will instead kill - // every thread in the parent process. We know this is the only thread - // in the new process, so make a system call directly. - // IA64 should use normal execve() from glibc to match the glibc fork() - // above. - NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);) - IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);) + execve("/bin/sh", (char* const*)argv, environ); // execve failed _exit(-1); diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp index c23810915e1..ac66ccba240 100644 --- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp +++ b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp @@ -41,7 +41,7 @@ #include "code/codeBlob.hpp" #include "code/nmethod.hpp" #include "code/pcDesc.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/collectedHeap.hpp" #include "memory/heap.hpp" #include "memory/memRegion.hpp" #include "memory/universe.hpp" diff --git a/hotspot/src/share/vm/adlc/main.cpp b/hotspot/src/share/vm/adlc/main.cpp index 6dfbba3e4d2..ef0a71fef25 100644 --- a/hotspot/src/share/vm/adlc/main.cpp +++ b/hotspot/src/share/vm/adlc/main.cpp @@ -215,7 +215,7 @@ int main(int argc, char *argv[]) AD.addInclude(AD._CPP_file, "code/compiledIC.hpp"); AD.addInclude(AD._CPP_file, "code/nativeInst.hpp"); AD.addInclude(AD._CPP_file, "code/vmreg.inline.hpp"); - AD.addInclude(AD._CPP_file, "gc_interface/collectedHeap.inline.hpp"); + AD.addInclude(AD._CPP_file, "gc/shared/collectedHeap.inline.hpp"); AD.addInclude(AD._CPP_file, "oops/compiledICHolder.hpp"); AD.addInclude(AD._CPP_file, "oops/markOop.hpp"); AD.addInclude(AD._CPP_file, "oops/method.hpp"); diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/hotspot/src/share/vm/asm/codeBuffer.cpp index 974a48156f8..c24e0adb1df 100644 --- a/hotspot/src/share/vm/asm/codeBuffer.cpp +++ b/hotspot/src/share/vm/asm/codeBuffer.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "asm/codeBuffer.hpp" #include "compiler/disassembler.hpp" -#include "memory/gcLocker.hpp" +#include "gc/shared/gcLocker.hpp" #include "oops/methodData.hpp" #include "oops/oop.inline.hpp" #include "runtime/icache.hpp" diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp index cc35fc3ae30..c8db5f824b0 100644 --- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp @@ -23,8 +23,8 @@ */ #include "precompiled.hpp" -#include "c1/c1_Defs.hpp" #include "c1/c1_Compilation.hpp" +#include "c1/c1_Defs.hpp" #include "c1/c1_FrameMap.hpp" #include "c1/c1_Instruction.hpp" #include "c1/c1_LIRAssembler.hpp" @@ -33,7 +33,7 @@ #include "ci/ciArrayKlass.hpp" #include "ci/ciInstance.hpp" #include "ci/ciObjArray.hpp" -#include "memory/cardTableModRefBS.hpp" +#include "gc/shared/cardTableModRefBS.hpp" #include "runtime/arguments.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" @@ -41,7 +41,7 @@ #include "utilities/bitMap.inline.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/heapRegion.hpp" +#include "gc/g1/heapRegion.hpp" #endif // INCLUDE_ALL_GCS #ifdef ASSERT diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp index cb9539ee34f..74d394d0a06 100644 --- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp +++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp @@ -38,11 +38,11 @@ #include "code/scopeDesc.hpp" #include "code/vtableStubs.hpp" #include "compiler/disassembler.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/barrierSet.hpp" +#include "gc/shared/collectedHeap.hpp" #include "interpreter/bytecode.hpp" #include "interpreter/interpreter.hpp" #include "memory/allocation.inline.hpp" -#include "memory/barrierSet.hpp" #include "memory/oopFactory.hpp" #include "memory/resourceArea.hpp" #include "oops/objArrayKlass.hpp" diff --git a/hotspot/src/share/vm/ci/ciBaseObject.cpp b/hotspot/src/share/vm/ci/ciBaseObject.cpp index 2d1fe71e2d8..8cef3daf72e 100644 --- a/hotspot/src/share/vm/ci/ciBaseObject.cpp +++ b/hotspot/src/share/vm/ci/ciBaseObject.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "ci/ciBaseObject.hpp" #include "ci/ciUtilities.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" // ------------------------------------------------------------------ // ciBaseObject::set_ident diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp index 9ba708320b1..b95ca80d6dc 100644 --- a/hotspot/src/share/vm/ci/ciEnv.cpp +++ b/hotspot/src/share/vm/ci/ciEnv.cpp @@ -39,7 +39,7 @@ #include "compiler/compileBroker.hpp" #include "compiler/compileLog.hpp" #include "compiler/compilerOracle.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/linkResolver.hpp" #include "memory/allocation.inline.hpp" #include "memory/oopFactory.hpp" diff --git a/hotspot/src/share/vm/ci/ciField.cpp b/hotspot/src/share/vm/ci/ciField.cpp index 57da3a5d628..ba3d07157aa 100644 --- a/hotspot/src/share/vm/ci/ciField.cpp +++ b/hotspot/src/share/vm/ci/ciField.cpp @@ -27,7 +27,7 @@ #include "ci/ciInstanceKlass.hpp" #include "ci/ciUtilities.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/linkResolver.hpp" #include "memory/universe.inline.hpp" #include "oops/oop.inline.hpp" diff --git a/hotspot/src/share/vm/ci/ciMetadata.cpp b/hotspot/src/share/vm/ci/ciMetadata.cpp index f7354c40869..a991d406e02 100644 --- a/hotspot/src/share/vm/ci/ciMetadata.cpp +++ b/hotspot/src/share/vm/ci/ciMetadata.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "ci/ciObject.hpp" #include "ci/ciUtilities.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" // ------------------------------------------------------------------ // ciMetadata::print diff --git a/hotspot/src/share/vm/ci/ciObject.cpp b/hotspot/src/share/vm/ci/ciObject.cpp index ae852e68938..2b09567cfca 100644 --- a/hotspot/src/share/vm/ci/ciObject.cpp +++ b/hotspot/src/share/vm/ci/ciObject.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "ci/ciObject.hpp" #include "ci/ciUtilities.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "oops/oop.inline.hpp" // ciObject diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.cpp b/hotspot/src/share/vm/ci/ciObjectFactory.cpp index 1b15be7a101..295b7c9282e 100644 --- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp +++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp @@ -42,13 +42,13 @@ #include "ci/ciUtilities.hpp" #include "classfile/javaClasses.inline.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "memory/allocation.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/fieldType.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -# include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +# include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // ciObjectFactory diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp index 52532918aeb..c42a7d2dcb0 100644 --- a/hotspot/src/share/vm/classfile/classFileParser.cpp +++ b/hotspot/src/share/vm/classfile/classFileParser.cpp @@ -33,8 +33,8 @@ #include "classfile/verificationType.hpp" #include "classfile/verifier.hpp" #include "classfile/vmSymbols.hpp" +#include "gc/shared/gcLocker.hpp" #include "memory/allocation.hpp" -#include "memory/gcLocker.hpp" #include "memory/metadataFactory.hpp" #include "memory/oopFactory.hpp" #include "memory/referenceType.hpp" @@ -59,8 +59,8 @@ #include "services/classLoadingService.hpp" #include "services/threadService.hpp" #include "utilities/array.hpp" -#include "utilities/globalDefinitions.hpp" #include "utilities/exceptions.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" #include "utilities/ostream.hpp" #include "utilities/resourceHash.hpp" diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp index a325344ec94..d8c29b3fd90 100644 --- a/hotspot/src/share/vm/classfile/classLoader.cpp +++ b/hotspot/src/share/vm/classfile/classLoader.cpp @@ -26,19 +26,19 @@ #include "classfile/classFileParser.hpp" #include "classfile/classFileStream.hpp" #include "classfile/classLoader.hpp" -#include "classfile/classLoaderExt.hpp" #include "classfile/classLoaderData.inline.hpp" +#include "classfile/classLoaderExt.hpp" #include "classfile/imageFile.hpp" #include "classfile/javaClasses.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" #include "compiler/compileBroker.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "gc/shared/generation.hpp" #include "interpreter/bytecodeStream.hpp" #include "interpreter/oopMapCache.hpp" #include "memory/allocation.inline.hpp" #include "memory/filemap.hpp" -#include "memory/generation.hpp" #include "memory/oopFactory.hpp" #include "memory/universe.inline.hpp" #include "oops/instanceKlass.hpp" @@ -64,8 +64,8 @@ #include "utilities/hashtable.inline.hpp" #include "utilities/macros.hpp" #if INCLUDE_CDS -#include "classfile/sharedPathsMiscInfo.hpp" #include "classfile/sharedClassUtil.hpp" +#include "classfile/sharedPathsMiscInfo.hpp" #endif diff --git a/hotspot/src/share/vm/classfile/classLoaderData.cpp b/hotspot/src/share/vm/classfile/classLoaderData.cpp index a5ed19ffb06..ea2286acc8e 100644 --- a/hotspot/src/share/vm/classfile/classLoaderData.cpp +++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp @@ -53,7 +53,7 @@ #include "classfile/metadataOnStackMark.hpp" #include "classfile/systemDictionary.hpp" #include "code/codeCache.hpp" -#include "memory/gcLocker.hpp" +#include "gc/shared/gcLocker.hpp" #include "memory/metadataFactory.hpp" #include "memory/metaspaceShared.hpp" #include "memory/oopFactory.hpp" diff --git a/hotspot/src/share/vm/classfile/stringTable.cpp b/hotspot/src/share/vm/classfile/stringTable.cpp index ac5e1ce1f8f..feff0b80b60 100644 --- a/hotspot/src/share/vm/classfile/stringTable.cpp +++ b/hotspot/src/share/vm/classfile/stringTable.cpp @@ -28,18 +28,18 @@ #include "classfile/javaClasses.hpp" #include "classfile/stringTable.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "gc/shared/gcLocker.inline.hpp" #include "memory/allocation.inline.hpp" #include "memory/filemap.hpp" -#include "memory/gcLocker.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.inline.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/hashtable.inline.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS -#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" -#include "gc_implementation/g1/g1StringDedup.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/g1StringDedup.hpp" #endif PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp index ec111a6d4e3..d5788136a35 100644 --- a/hotspot/src/share/vm/classfile/symbolTable.cpp +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp @@ -28,10 +28,10 @@ #include "classfile/javaClasses.hpp" #include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "gc/shared/gcLocker.inline.hpp" #include "memory/allocation.inline.hpp" #include "memory/filemap.hpp" -#include "memory/gcLocker.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.inline.hpp" #include "runtime/mutexLocker.hpp" diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp index 4095681b1ce..c7ba983de31 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp @@ -34,10 +34,10 @@ #include "classfile/vmSymbols.hpp" #include "code/codeCache.hpp" #include "compiler/compileBroker.hpp" +#include "gc/shared/gcLocker.hpp" #include "interpreter/bytecodeStream.hpp" #include "interpreter/interpreter.hpp" #include "memory/filemap.hpp" -#include "memory/gcLocker.hpp" #include "memory/oopFactory.hpp" #include "oops/instanceKlass.hpp" #include "oops/instanceRefKlass.hpp" diff --git a/hotspot/src/share/vm/classfile/verifier.hpp b/hotspot/src/share/vm/classfile/verifier.hpp index 93b75948228..c9aa6d50789 100644 --- a/hotspot/src/share/vm/classfile/verifier.hpp +++ b/hotspot/src/share/vm/classfile/verifier.hpp @@ -26,12 +26,12 @@ #define SHARE_VM_CLASSFILE_VERIFIER_HPP #include "classfile/verificationType.hpp" -#include "memory/gcLocker.hpp" +#include "gc/shared/gcLocker.hpp" #include "oops/klass.hpp" #include "oops/method.hpp" #include "runtime/handles.hpp" -#include "utilities/growableArray.hpp" #include "utilities/exceptions.hpp" +#include "utilities/growableArray.hpp" // The verifier class class Verifier : AllStatic { diff --git a/hotspot/src/share/vm/code/codeCache.cpp b/hotspot/src/share/vm/code/codeCache.cpp index 415b32497ed..8d801094d0f 100644 --- a/hotspot/src/share/vm/code/codeCache.cpp +++ b/hotspot/src/share/vm/code/codeCache.cpp @@ -31,22 +31,22 @@ #include "code/nmethod.hpp" #include "code/pcDesc.hpp" #include "compiler/compileBroker.hpp" +#include "gc/shared/gcLocker.hpp" #include "memory/allocation.inline.hpp" -#include "memory/gcLocker.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" #include "oops/method.hpp" #include "oops/objArrayOop.hpp" #include "oops/oop.inline.hpp" #include "oops/verifyOopClosure.hpp" -#include "runtime/handles.inline.hpp" #include "runtime/arguments.hpp" +#include "runtime/compilationPolicy.hpp" #include "runtime/deoptimization.hpp" +#include "runtime/handles.inline.hpp" #include "runtime/icache.hpp" #include "runtime/java.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/sweeper.hpp" -#include "runtime/compilationPolicy.hpp" #include "services/memoryService.hpp" #include "trace/tracing.hpp" #include "utilities/xmlstream.hpp" diff --git a/hotspot/src/share/vm/code/icBuffer.cpp b/hotspot/src/share/vm/code/icBuffer.cpp index f0cccc9a8d9..a08e2e616ae 100644 --- a/hotspot/src/share/vm/code/icBuffer.cpp +++ b/hotspot/src/share/vm/code/icBuffer.cpp @@ -28,7 +28,7 @@ #include "code/icBuffer.hpp" #include "code/nmethod.hpp" #include "code/scopeDesc.hpp" -#include "gc_interface/collectedHeap.inline.hpp" +#include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/linkResolver.hpp" #include "memory/resourceArea.hpp" diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp index fc8758a3b00..49228e592b2 100644 --- a/hotspot/src/share/vm/compiler/disassembler.cpp +++ b/hotspot/src/share/vm/compiler/disassembler.cpp @@ -26,8 +26,8 @@ #include "classfile/javaClasses.hpp" #include "code/codeCache.hpp" #include "compiler/disassembler.hpp" -#include "gc_interface/collectedHeap.hpp" -#include "memory/cardTableModRefBS.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.hpp" #include "oops/oop.inline.hpp" #include "runtime/fprofiler.hpp" #include "runtime/handles.inline.hpp" diff --git a/hotspot/src/share/vm/compiler/oopMap.cpp b/hotspot/src/share/vm/compiler/oopMap.cpp index fe54ba8211e..cb5dfc7ef83 100644 --- a/hotspot/src/share/vm/compiler/oopMap.cpp +++ b/hotspot/src/share/vm/compiler/oopMap.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 @@ -28,7 +28,7 @@ #include "code/nmethod.hpp" #include "code/scopeDesc.hpp" #include "compiler/oopMap.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/shared/collectedHeap.hpp" #include "memory/allocation.inline.hpp" #include "memory/resourceArea.hpp" #include "runtime/frame.inline.hpp" @@ -596,6 +596,17 @@ ImmutableOopMap::ImmutableOopMap(const OopMap* oopmap) : _count(oopmap->count()) oopmap->copy_data_to(addr); } +#ifdef ASSERT +int ImmutableOopMap::nr_of_bytes() const { + OopMapStream oms(this); + + while (!oms.is_done()) { + oms.next(); + } + return sizeof(ImmutableOopMap) + oms.stream_position(); +} +#endif + class ImmutableOopMapBuilder { private: class Mapping; @@ -652,7 +663,7 @@ private: } #ifdef ASSERT - void verify(address buffer, int size); + void verify(address buffer, int size, const ImmutableOopMapSet* set); #endif bool has_empty() const { @@ -660,8 +671,8 @@ private: } int size_for(const OopMap* map) const; - void fill_pair(ImmutableOopMapPair* pair, const OopMap* map, int offset); - int fill_map(ImmutableOopMapPair* pair, const OopMap* map, int offset); + void fill_pair(ImmutableOopMapPair* pair, const OopMap* map, int offset, const ImmutableOopMapSet* set); + int fill_map(ImmutableOopMapPair* pair, const OopMap* map, int offset, const ImmutableOopMapSet* set); void fill(ImmutableOopMapSet* set, int size); }; @@ -711,12 +722,13 @@ int ImmutableOopMapBuilder::heap_size() { return total; } -void ImmutableOopMapBuilder::fill_pair(ImmutableOopMapPair* pair, const OopMap* map, int offset) { +void ImmutableOopMapBuilder::fill_pair(ImmutableOopMapPair* pair, const OopMap* map, int offset, const ImmutableOopMapSet* set) { + assert(offset < set->nr_of_bytes(), "check"); new ((address) pair) ImmutableOopMapPair(map->offset(), offset); } -int ImmutableOopMapBuilder::fill_map(ImmutableOopMapPair* pair, const OopMap* map, int offset) { - fill_pair(pair, map, offset); +int ImmutableOopMapBuilder::fill_map(ImmutableOopMapPair* pair, const OopMap* map, int offset, const ImmutableOopMapSet* set) { + fill_pair(pair, map, offset, set); address addr = (address) pair->get_from(_new_set); // location of the ImmutableOopMap new (addr) ImmutableOopMap(map); @@ -732,9 +744,9 @@ void ImmutableOopMapBuilder::fill(ImmutableOopMapSet* set, int sz) { int size = 0; if (_mapping[i]._kind == Mapping::OOPMAP_NEW) { - size = fill_map(&pairs[i], map, _mapping[i]._offset); + size = fill_map(&pairs[i], map, _mapping[i]._offset, set); } else if (_mapping[i]._kind == Mapping::OOPMAP_DUPLICATE || _mapping[i]._kind == Mapping::OOPMAP_EMPTY) { - fill_pair(&pairs[i], map, _mapping[i]._offset); + fill_pair(&pairs[i], map, _mapping[i]._offset, set); } const ImmutableOopMap* nv = set->find_map_at_offset(map->offset()); @@ -743,10 +755,18 @@ void ImmutableOopMapBuilder::fill(ImmutableOopMapSet* set, int sz) { } #ifdef ASSERT -void ImmutableOopMapBuilder::verify(address buffer, int size) { +void ImmutableOopMapBuilder::verify(address buffer, int size, const ImmutableOopMapSet* set) { for (int i = 0; i < 8; ++i) { assert(buffer[size - 8 + i] == (unsigned char) 0xff, "overwritten memory check"); } + + for (int i = 0; i < set->count(); ++i) { + const ImmutableOopMapPair* pair = set->pair_at(i); + assert(pair->oopmap_offset() < set->nr_of_bytes(), "check size"); + const ImmutableOopMap* map = pair->get_from(set); + int nr_of_bytes = map->nr_of_bytes(); + assert(pair->oopmap_offset() + nr_of_bytes <= set->nr_of_bytes(), "check size + size"); + } } #endif @@ -760,7 +780,7 @@ ImmutableOopMapSet* ImmutableOopMapBuilder::build() { _new_set = new (buffer) ImmutableOopMapSet(_set, required); fill(_new_set, required); - DEBUG_ONLY(verify(buffer, required)); + DEBUG_ONLY(verify(buffer, required, _new_set)); return _new_set; } diff --git a/hotspot/src/share/vm/compiler/oopMap.hpp b/hotspot/src/share/vm/compiler/oopMap.hpp index 54d4fd6b9ea..f2639c8ae6a 100644 --- a/hotspot/src/share/vm/compiler/oopMap.hpp +++ b/hotspot/src/share/vm/compiler/oopMap.hpp @@ -273,6 +273,9 @@ public: bool has_derived_pointer() const PRODUCT_RETURN0; int count() const { return _count; } +#ifdef ASSERT + int nr_of_bytes() const; // this is an expensive operation, only used in debug builds +#endif // Printing void print_on(outputStream* st) const; @@ -346,6 +349,9 @@ class OopMapStream : public StackObj { bool is_done() { if(!_valid_omv) { find_next(); } return !_valid_omv; } void next() { find_next(); } OopMapValue current() { return _omv; } +#ifdef ASSERT + int stream_position() const { return _stream->position(); } +#endif }; diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp similarity index 95% rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp rename to hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp index 47b90ff5a40..6a37dd01f8b 100644 --- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp +++ b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014, 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 @@ -23,9 +23,9 @@ */ #include "precompiled.hpp" -#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp" -#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" -#include "gc_interface/collectedHeap.hpp" +#include "gc/cms/adaptiveFreeList.hpp" +#include "gc/cms/freeChunk.hpp" +#include "gc/shared/collectedHeap.hpp" #include "memory/freeBlockDictionary.hpp" #include "runtime/globals.hpp" #include "runtime/mutex.hpp" diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp similarity index 96% rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp rename to hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp index 337040b9cd4..d4757eb0c15 100644 --- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp +++ b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp @@ -22,11 +22,11 @@ * */ -#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_ADAPTIVEFREELIST_HPP -#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_ADAPTIVEFREELIST_HPP +#ifndef SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP +#define SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP +#include "gc/cms/allocationStats.hpp" #include "memory/freeList.hpp" -#include "gc_implementation/shared/allocationStats.hpp" class CompactibleFreeListSpace; @@ -226,4 +226,4 @@ class AdaptiveFreeList : public FreeList+ * The {@code pack} methods may be used by application developers who + * wish to deploy large JARs on the web. The {@code unpack} methods + * may be used by deployment applications such as Java Web Start and + * Java Plugin. + * + *
+ * In typical use, the packed output should be further compressed + * using a suitable tool such as gzip or + * {@code java.util.zip.GZIPOutputStream}. The resulting file (with + * a suffix ".pack.gz") should be hosted on a HTTP/1.1 compliant + * server, which will be capable of handling "Accept-Encoding", as + * specified by the HTTP 1.1 RFC2616 specification. + * + *
+ * NOTE: It is recommended that the original ".jar" file be + * hosted in addition to the ".pack.gz" file, so that older client + * implementations will continue to work reliably. (On-demand + * compression by the server is not recommended.) + * + *
+ * When a client application requests a ".jar" file (call it + * "Large.jar"), the client will transmit the headers + * "Content-Type=application/x-java-archive" as well as + * "Accept-Encoding=pack200-gzip". This indicates to the server that + * the client application desires an version of the file encoded with + * Pack200 and further compressed with gzip. + * + *
+ * The server implementation will typically check for the existence of + * "Large.pack.gz". If that file is available, the server will + * transmit it with the headers "Content-Encoding=pack200-gzip" and + * "Content-Type=application/x-java-archive". + * + *
+ * If the ".pack.gz" file, is not available, then the server will + * transmit the original ".jar" with "Content-Encoding=null" and + * "Content-Type=application/x-java-archive". + * + *
+ * A MIME type of "application/x-java-pack200" may be specified by the + * client application to indicate a ".pack" file is required. + * However, this has limited capability, and is not recommended. + * + *
-This package provides methods to read files from a JAR file and -to transform them to a more compact transfer format called Pack200. -It also provides methods to receive the transmitted data and expand -it into a JAR file equivalent to the original JAR file. - -
-The pack methods may be used by application developers -who wish to deploy large JARs on the web. The unpack methods may be used -by deployment applications such as Java Web Start and Java Plugin. - -
-In typical use, the packed output should be further compressed using -a suitable tool such as gzip or java.util.zip.GZIPOutputStream. -The resulting file (with a suffix ".pack.gz") should be hosted on a HTTP/1.1 -compliant server, which will be capable of handling "Accept-Encoding", -as specified by the HTTP 1.1 RFC2616 specification. - -
-NOTE: It is recommended that the original ".jar" file be hosted -in addition to the ".pack.gz" file, so that older client implementations -will continue to work reliably. -(On-demand compression by the server is not recommended.) - -
-When a client application requests a ".jar" file (call it "Large.jar"), -the client will transmit the headers -"Content-Type=application/x-java-archive" as well as "Accept-Encoding=pack200-gzip". -This indicates to the server that the client application desires an version -of the file encoded with Pack200 and further compressed with gzip. - -
-The server implementation will typically check for the existence of "Large.pack.gz". -If that file is available, the server will transmit it with the headers -"Content-Encoding=pack200-gzip" and "Content-Type=application/x-java-archive". - -
-If the ".pack.gz" file, is not available, then the server will transmit -the original ".jar" -with "Content-Encoding=null" and "Content-Type=application/x-java-archive". - -
-A MIME type of "application/x-java-pack200" may be specified by the -client application to indicate a ".pack" file is required. -However, this has limited capability, and is not recommended. - -
Each reference-object type is implemented by a subclass of the + * abstract base {@link java.lang.ref.Reference} class. + * An instance of one of these subclasses encapsulates a single + * reference to a particular object, called the referent. + * Every reference object provides methods for getting and clearing + * the reference. Aside from the clearing operation reference objects + * are otherwise immutable, so no {@code set} operation is + * provided. A program may further subclass these subclasses, adding + * whatever fields and methods are required for its purposes, or it + * may use these subclasses without change. + * + *
The relationship between a registered reference object and its + * queue is one-sided. That is, a queue does not keep track of the + * references that are registered with it. If a registered reference + * becomes unreachable itself, then it will never be enqueued. It is + * the responsibility of the program using reference objects to ensure + * that the objects remain reachable for as long as the program is + * interested in their referents. + * + *
While some programs will choose to dedicate a thread to + * removing reference objects from one or more queues and processing + * them, this is by no means necessary. A tactic that often works + * well is to examine a reference queue in the course of performing + * some other fairly-frequent action. For example, a hashtable that + * uses weak references to implement weak keys could poll its + * reference queue each time the table is accessed. This is how the + * {@link java.util.WeakHashMap} class works. Because + * the {@link java.lang.ref.ReferenceQueue#poll + * ReferenceQueue.poll} method simply checks an internal data + * structure, this check will add little overhead to the hashtable + * access methods. + * + *
Each reference-object type is implemented by a subclass of the abstract
-base {@link java.lang.ref.Reference} class. An instance of one of
-these subclasses encapsulates a single reference to a particular object, called
-the referent. Every reference object provides methods for getting and
-clearing the reference. Aside from the clearing operation reference objects
-are otherwise immutable, so no set operation is provided. A
-program may further subclass these subclasses, adding whatever fields and
-methods are required for its purposes, or it may use these subclasses without
-change.
-
-
-
{@link java.lang.ref.ReferenceQueue}
-class.
-
-The relationship between a registered reference object and its queue is -one-sided. That is, a queue does not keep track of the references that are -registered with it. If a registered reference becomes unreachable itself, then -it will never be enqueued. It is the responsibility of the program using -reference objects to ensure that the objects remain reachable for as long as -the program is interested in their referents. - -
While some programs will choose to dedicate a thread to removing reference
-objects from one or more queues and processing them, this is by no means
-necessary. A tactic that often works well is to examine a reference queue in
-the course of performing some other fairly-frequent action. For example, a
-hashtable that uses weak references to implement weak keys could poll its
-reference queue each time the table is accessed. This is how the {@link
-java.util.WeakHashMap} class works. Because the {@link
-java.lang.ref.ReferenceQueue#poll ReferenceQueue.poll} method simply
-checks an internal data structure, this check will add little overhead to the
-hashtable access methods.
-
-
-
Only developers who are defining new selector providers or + * asynchronous channel providers should need to make direct use of + * this package.
+ * + *Unless otherwise noted, passing a {@code null} argument to a + * constructor or method in any class or interface in this package + * will cause a {@link java.lang.NullPointerException + * NullPointerException} to be thrown. + * + * + * @since 1.4 + * @author Mark Reinhold + * @author JSR-51 Expert Group + */ +package java.nio.channels.spi; diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html b/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html deleted file mode 100644 index a6f8cbfdcb3..00000000000 --- a/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - -
- -Service-provider classes for the {@link java.nio.channels} package. - -Only developers who are defining new selector providers or asynchronous -channel providers should need to make direct use of this package.
- - Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
index 8d67ebbc8d6..a242b9c7ac8 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -30,6 +30,7 @@ import java.nio.CharBuffer;
import java.nio.charset.spi.CharsetProvider;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -336,12 +337,10 @@ public abstract class Charset
//
private static Iterator A charset is named mapping between sequences of
+ * sixteen-bit Unicode characters and sequences of bytes, in the sense
+ * defined in RFC 2278.
+ * A decoder is an engine which transforms bytes in a specific
+ * charset into characters, and an encoder is an engine which
+ * transforms characters into bytes. Encoders and decoders operate on
+ * byte and character buffers. They are collectively referred to as
+ * coders.
+ *
+ * The {@link java.nio.charset.Charset} class defines methods for
+ * creating coders for a given charset and for retrieving the various
+ * names associated with a charset. It also defines static methods
+ * for testing whether a particular charset is supported, for locating
+ * charset instances by name, and for constructing a map that contains
+ * every charset for which support is available in the current Java
+ * virtual machine.
+ *
+ * Most users will not use these classes directly; instead they
+ * will use the existing charset-related constructors and methods in
+ * the {@link java.lang.String} class, together with the existing
+ * {@link java.io.InputStreamReader} and {@link
+ * java.io.OutputStreamWriter} classes, all of whose implementations
+ * have been reworked to make use of the charset facilities defined in
+ * this package. A small number of changes have been made to the
+ * {@link java.io.InputStreamReader} and {@link
+ * java.io.OutputStreamWriter} classes in order to allow explicit
+ * charset objects to be specified in the construction of instances of
+ * those classes.
+ *
+ * Support for new charsets can be made available via the
+ * interface defined in the {@link
+ * java.nio.charset.spi.CharsetProvider} class in the {@link
+ * java.nio.charset.spi} package.
+ *
+ * Unless otherwise noted, passing a null argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio.charset;
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/package.html b/jdk/src/java.base/share/classes/java/nio/charset/package.html
deleted file mode 100644
index 69b160b8139..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/charset/package.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
- Class name Description A charset is named mapping between sequences of sixteen-bit Unicode
-characters and sequences of bytes, in the sense defined in RFC 2278. A
-decoder is an engine which transforms bytes in a specific charset into
-characters, and an encoder is an engine which transforms characters into
-bytes. Encoders and decoders operate on byte and character buffers. They are
-collectively referred to as coders.
-
- The {@link java.nio.charset.Charset} class defines methods for creating
-coders for a given charset and for retrieving the various names associated with
-a charset. It also defines static methods for testing whether a particular
-charset is supported, for locating charset instances by name, and for
-constructing a map that contains every charset for which support is available
-in the current Java virtual machine.
-
- Most users will not use these classes directly; instead they will use the
-existing charset-related constructors and methods in the {@link
-java.lang.String} class, together with the existing {@link
-java.io.InputStreamReader} and {@link java.io.OutputStreamWriter} classes, all
-of whose implementations have been reworked to make use of the charset
-facilities defined in this package. A small number of changes have been made
-to the {@link java.io.InputStreamReader} and {@link java.io.OutputStreamWriter}
-classes in order to allow explicit charset objects to be specified in the
-construction of instances of those classes.
-
- Support for new charsets can be made available via the interface defined in
-the {@link java.nio.charset.spi.CharsetProvider} class in the {@link
-java.nio.charset.spi} package.
-
- Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java b/jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java
similarity index 65%
rename from jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
rename to jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java
index 55b22bcc67a..8e5e81da703 100644
--- a/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -23,21 +23,19 @@
* questions.
*/
-package sun.tools.native2ascii.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgNative2ascii extends ListResourceBundle {
-
- public Object[][] getContents() {
- Object[][] temp = new Object[][] {
- {"err.bad.arg", "-encoding requires argument"},
- {"err.cannot.read", "{0} could not be read."},
- {"err.cannot.write", "{0} could not be written."},
- {"usage", "Usage: native2ascii" +
- " [-reverse] [-encoding encoding] [inputfile [outputfile]]"},
- };
-
- return temp;
- }
-}
+/**
+ * Service-provider classes for the {@link java.nio.charset} package.
+ *
+ * Only developers who are defining new charsets should need to
+ * make direct use of this package. Unless otherwise noted, passing a {@code null} argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio.charset.spi;
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html b/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html
deleted file mode 100644
index a7b7ab18879..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- Only developers who are defining new charsets should need to make direct
-use of this package. Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/nio/package-info.java b/jdk/src/java.base/share/classes/java/nio/package-info.java
new file mode 100644
index 00000000000..374e0bb59a9
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/nio/package-info.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000, 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. 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.
+ */
+
+/**
+ * Defines buffers, which are containers for data, and provides an
+ * overview of the other NIO packages.
+ *
+ *
+ * The central abstractions of the NIO APIs are: Buffers, which are containers for data;
+ * Charsets and their
+ * associated decoders and encoders, Channels of
+ * various types, which represent connections Selectors and selection keys, which
+ * together with The java.nio package defines the buffer classes, which
+ * are used throughout the NIO APIs. The charset API is defined in
+ * the {@link java.nio.charset} package, and the channel and selector
+ * APIs are defined in the {@link java.nio.channels} package. Each of
+ * these subpackages has its own service-provider (SPI) subpackage,
+ * the contents of which can be used to extend the platform's default
+ * implementations or to construct alternative implementations.
+ *
+ *
+ *
+ * A buffer is a container for a fixed amount of data of a
+ * specific primitive type. In addition to its content a buffer has a
+ * position, which is the index of the next element to be read
+ * or written, and a limit, which is the index of the first
+ * element that should not be read or written. The base {@link
+ * java.nio.Buffer} class defines these properties as well as methods
+ * for clearing, flipping, and rewinding, for
+ * marking the current position, and for resetting the
+ * position to the previous mark.
+ *
+ * There is a buffer class for each non-boolean primitive type.
+ * Each class defines a family of get and put methods
+ * for moving data out of and in to a buffer, methods for
+ * compacting, duplicating, and slicing a buffer,
+ * and static methods for allocating a new buffer as well as
+ * for wrapping an existing array into a buffer.
+ *
+ * Byte buffers are distinguished in that they can be used as the
+ * sources and targets of I/O operations. They also support several
+ * features not found in the other buffer classes:
+ *
+ * A byte buffer can be allocated as a direct buffer, in which
+ * case the Java virtual machine will make a best effort to perform
+ * native I/O operations directly upon it. A byte buffer can be created by {@link
+ * java.nio.channels.FileChannel#map mapping} a region of a
+ * file directly into memory, in which case a few additional
+ * file-related operations defined in the {@link
+ * java.nio.MappedByteBuffer} class are available. A byte buffer provides access to its content as either a
+ * heterogeneous or homogeneous sequence of binary data of any
+ * non-boolean primitive type, in either big-endian or little-endian
+ * byte order. Unless otherwise noted, passing a null argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio;
diff --git a/jdk/src/java.base/share/classes/java/nio/package.html b/jdk/src/java.base/share/classes/java/nio/package.html
deleted file mode 100644
index 1ce7131f869..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/package.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
- The central abstractions of the NIO APIs are: Buffers, which are containers for data;
- Charsets and their
- associated decoders and encoders, Channels of
- various types, which represent connections Selectors and selection keys, which together with The java.nio package defines the buffer classes, which are used
-throughout the NIO APIs. The charset API is defined in the {@link
-java.nio.charset} package, and the channel and selector APIs are defined in the
-{@link java.nio.channels} package. Each of these subpackages has its own
-service-provider (SPI) subpackage, the contents of which can be used to extend
-the platform's default implementations or to construct alternative
-implementations.
-
-
-
-
- Buffers Description A buffer is a container for a fixed amount of data of a specific
-primitive type. In addition to its content a buffer has a position,
-which is the index of the next element to be read or written, and a
-limit, which is the index of the first element that should not be read
-or written. The base {@link java.nio.Buffer} class defines these properties as
-well as methods for clearing, flipping, and rewinding, for
-marking the current position, and for resetting the position to
-the previous mark.
-
- There is a buffer class for each non-boolean primitive type. Each class
-defines a family of get and put methods for moving data out of
-and in to a buffer, methods for compacting, duplicating, and
-slicing a buffer, and static methods for allocating a new buffer
-as well as for wrapping an existing array into a buffer.
-
- Byte buffers are distinguished in that they can be used as the sources and
-targets of I/O operations. They also support several features not found in the
-other buffer classes:
-
- A byte buffer can be allocated as a
- direct buffer, in which case the Java virtual machine will make a
- best effort to perform native I/O operations directly upon it. A byte buffer can be created by {@link
- java.nio.channels.FileChannel#map mapping} a region of a
- file directly into memory, in which case a few additional file-related
- operations defined in the {@link java.nio.MappedByteBuffer} class are
- available. A byte buffer provides access to its content as either a heterogeneous
- or homogeneous sequence of binary data
- of any non-boolean primitive type, in either big-endian or little-endian byte order. Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/text/AttributedString.java b/jdk/src/java.base/share/classes/java/text/AttributedString.java
index daceb62a70f..6e89fdec599 100644
--- a/jdk/src/java.base/share/classes/java/text/AttributedString.java
+++ b/jdk/src/java.base/share/classes/java/text/AttributedString.java
@@ -332,7 +332,7 @@ public class AttributedString {
* @param beginIndex Index of the first character of the range.
* @param endIndex Index of the character following the last character of the range.
* @exception NullPointerException if These classes are capable of formatting dates, numbers, and
+ * messages, parsing; searching and sorting strings; and iterating
+ * over characters, words, sentences, and line breaks. This package
+ * contains three main groups of classes and interfaces:
+ *
+ *
-These classes are capable of formatting dates, numbers, and messages, parsing;
-searching and sorting strings; and iterating over characters, words, sentences,
-and line breaks. This package contains three main groups of classes and
-interfaces:
-
- * Beyond dates and times, the API also allows the storage of period and durations of time.
+ * Beyond dates and times, the API also allows the storage of periods and durations of time.
* A {@link java.time.Duration} is a simple measure of time along the time-line in nanoseconds.
- * A {@link java.time.Period} expresses an amount of time in units meaningful to humans, such as years or hours.
+ * A {@link java.time.Period} expresses an amount of time in units meaningful
+ * to humans, such as years or days.
* The {@link #loadFromXML(InputStream)} and {@link
* #storeToXML(OutputStream, String, String)} methods load and store properties
@@ -108,9 +107,6 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
* This class is thread-safe: multiple threads can share a single
* Properties object without the need for external synchronization.
*
- * @see native2ascii tool for Solaris
- * @see native2ascii tool for Windows
- *
* @author Arthur van Hoff
* @author Michael McCloskey
* @author Xueming Shen
diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
index 3c01aacecc2..f565bc02361 100644
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -268,13 +268,25 @@ class JarFile extends ZipFile {
}
/**
- * Returns an enumeration of the zip file entries.
+ * Returns an enumeration of the jar file entries.
+ *
+ * @return an enumeration of the jar file entries
+ * @throws IllegalStateException
+ * may be thrown if the jar file has been closed
*/
public Enumeration
+ * In JAR files, all file names must be encoded in the UTF-8 encoding.
+ *
- In JAR files, all file names must be encoded in the UTF-8 encoding.
- An instance of the {@link java.util.regex.Pattern} class
+ * represents a regular expression that is specified in string form in
+ * a syntax similar to that used by Perl.
+ *
+ * Instances of the {@link java.util.regex.Matcher} class are used
+ * to match character sequences against a given pattern. Input is
+ * provided to matchers via the {@link java.lang.CharSequence}
+ * interface in order to support matching against characters from a
+ * wide variety of input sources. Unless otherwise noted, passing a null argument to a
+ * method in any class or interface in this package will cause a
+ * {@link java.lang.NullPointerException NullPointerException} to be
+ * thrown.
+ *
+ * An excellent tutorial and overview of regular expressions is Mastering Regular
+ * Expressions, Jeffrey E. F. Friedl, O'Reilly and Associates,
+ * 1997. An instance of the {@link java.util.regex.Pattern} class represents a
-regular expression that is specified in string form in a syntax similar to
-that used by Perl.
-
- Instances of the {@link java.util.regex.Matcher} class are used to match
-character sequences against a given pattern. Input is provided to matchers via
-the {@link java.lang.CharSequence} interface in order to support matching
-against characters from a wide variety of input sources. Unless otherwise noted, passing a null argument to a method
-in any class or interface in this package will cause a
-{@link java.lang.NullPointerException NullPointerException} to be thrown.
-
- An excellent tutorial and overview of regular expressions is Mastering Regular
-Expressions, Jeffrey E. F. Friedl, O'Reilly and Associates, 1997. Note that these interfaces are intended only for key
+ * implementations whose key material is accessible and
+ * available. These interfaces are not intended for key implementations
+ * whose key material resides in inaccessible, protected storage (such
+ * as in a hardware device).
+ *
+ * For more developer information on how to use these interfaces,
+ * including information on how to design
-Note that these interfaces are intended only
-for key implementations whose key material
-is accessible and available. These
-interfaces are not intended for key
-implementations whose key material resides
-in inaccessible, protected storage (such as
-in a hardware device).
-
-For more developer information on how to use
-these interfaces, including information on
-how to design Support for encryption includes symmetric, asymmetric, block,
+ * and stream ciphers. This package also supports secure streams and
+ * sealed objects.
+ *
+ * Many of the classes provided in this package are provider-based.
+ * The class itself defines a programming interface to which
+ * applications may write. The implementations themselves may then be
+ * written by independent third-party vendors and plugged in
+ * seamlessly as needed. Therefore application developers may take
+ * advantage of any number of provider-based implementations without
+ * having to add or rewrite code.
+ *
+ * Support for encryption includes symmetric, asymmetric, block, and
-stream ciphers. This package also supports secure streams and sealed
-objects.
-
- Many of the classes provided in this package are provider-based. The
-class itself defines a programming interface to which applications may
-write. The implementations themselves may then be written by
-independent third-party vendors and plugged in seamlessly as needed.
-Therefore application developers may take advantage of any number of
-provider-based implementations without having to add or rewrite code.
-
- A key specification is a transparent representation of the key
+ * material that constitutes a key. A key may be specified in an
+ * algorithm-specific way, or in an algorithm-independent encoding
+ * format (such as ASN.1). This package contains key specifications
+ * for Diffie-Hellman public and private keys, as well as key
+ * specifications for DES, Triple DES, and PBE secret keys.
+ *
+ * An algorithm parameter specification is a transparent
+ * representation of the sets of parameters used with an
+ * algorithm. This package contains algorithm parameter specifications
+ * for parameters used with the Diffie-Hellman, DES, Triple DES, PBE,
+ * RC2 and RC5 algorithms.
+ *
+ *
+ * A key specification is a transparent representation of the key
-material that constitutes a key. A key may be specified in an
-algorithm-specific way, or in an algorithm-independent encoding format
-(such as ASN.1). This package contains key specifications for
-Diffie-Hellman public and private keys, as well as key specifications for DES,
-Triple DES, and PBE secret keys.
-
- An algorithm parameter specification is a transparent representation
-of the sets of parameters used with an algorithm. This package contains
-algorithm parameter specifications for parameters used with the
-Diffie-Hellman, DES, Triple DES, PBE, RC2 and RC5 algorithms.
-
-
-
- Licensee impact of JDK 1.4 reflection changes
-
-
-
-Sun's JDK 1.4 contains a new implementation of java.lang.reflect which
-offers substantially higher performance than previous JDKs' native
-code. Licensees can at their discretion port these changes. There are
-no public API or documentation changes associated with the new
-reflection implementation aside from a few minor clarifications in the
-specifications of Method.invoke(), Constructor.newInstance(), and a
-few methods in java.lang.reflect.Field.
-
-
-
-The bulk of the new implementation is Java programming language code
-which generates bytecodes, and is therefore portable. If licensees
-desire to port it, the following JVM changes are required:
-
-
-
-The following changes were discovered to be necessary for backward
-compatibility with certain applications (see bug 4474172):
-
-
+ *
+ *
+ *
Class name Description {@link java.nio.charset.Charset}
+ * A named mapping between characters
and bytes{@link java.nio.charset.CharsetDecoder}
+ * Decodes bytes into characters {@link java.nio.charset.CharsetEncoder}
+ * Encodes characters into bytes {@link java.nio.charset.CoderResult}
+ * Describes coder results {@link java.nio.charset.CodingErrorAction}
+ * Describes actions to take when
coding errors are detected
-
-
-
{@link java.nio.charset.Charset}
- A named mapping between characters
and bytes{@link java.nio.charset.CharsetDecoder}
- Decodes bytes into characters {@link java.nio.charset.CharsetEncoder}
- Encodes characters into bytes {@link java.nio.charset.CoderResult}
- Describes coder results {@link java.nio.charset.CodingErrorAction}
- Describes actions to take when
coding errors are detected
+ *
+ *
+ *
+ *
which
+ * translate between bytes and Unicode characters;
to entities
+ * capable of performing I/O operations; and
selectable channels define a multiplexed,
+ * non-blocking
I/O facility.
+ *
+ *
+ *
Buffers Description {@link java.nio.Buffer}
+ * Position, limit, and capacity;
+ *
clear, flip, rewind, and mark/reset {@link java.nio.ByteBuffer}
+ * Get/put, compact, views; allocate, wrap {@link java.nio.MappedByteBuffer}
+ * A byte buffer mapped to a file {@link java.nio.CharBuffer}
+ * Get/put, compact; allocate, wrap {@link java.nio.DoubleBuffer}
+ * ' ' {@link java.nio.FloatBuffer}
+ * ' ' {@link java.nio.IntBuffer}
+ * ' ' {@link java.nio.LongBuffer}
+ * ' ' {@link java.nio.ShortBuffer}
+ * ' ' {@link java.nio.ByteOrder}
+ * Typesafe enumeration for byte orders
+ *
+ *
+ *
+ *
-
-
-
-
which translate between
- bytes and Unicode characters;
to entities capable of
- performing I/O operations; and
- selectable channels define a multiplexed, non-blocking
- I/O facility.
-
-
-
{@link java.nio.Buffer}
- Position, limit, and capacity;
-
clear, flip, rewind, and mark/reset {@link java.nio.ByteBuffer}
- Get/put, compact, views; allocate, wrap {@link java.nio.MappedByteBuffer}
- A byte buffer mapped to a file {@link java.nio.CharBuffer}
- Get/put, compact; allocate, wrap {@link java.nio.DoubleBuffer}
- ' ' {@link java.nio.FloatBuffer}
- ' ' {@link java.nio.IntBuffer}
- ' ' {@link java.nio.LongBuffer}
- ' ' {@link java.nio.ShortBuffer}
- ' ' {@link java.nio.ByteOrder}
- Typesafe enumeration for byte orders
-
-
-
-attribute is null.
- * @exception IllegalArgumentException if beginIndex is less then 0, endIndex is
+ * @exception IllegalArgumentException if beginIndex is less than 0, endIndex is
* greater than the length of the string, or beginIndex and endIndex together don't
* define a non-empty subrange of the string.
*/
@@ -357,7 +357,7 @@ public class AttributedString {
* @param endIndex Index of the character following the last
* character of the range.
* @exception NullPointerException if attributes is null.
- * @exception IllegalArgumentException if beginIndex is less then
+ * @exception IllegalArgumentException if beginIndex is less than
* 0, endIndex is greater than the length of the string, or
* beginIndex and endIndex together don't define a non-empty
* subrange of the string and the attributes parameter is not an
@@ -580,7 +580,7 @@ public class AttributedString {
* @param beginIndex the index of the first character
* @param endIndex the index of the character following the last character
* @return an iterator providing access to the text and its attributes
- * @exception IllegalArgumentException if beginIndex is less then 0,
+ * @exception IllegalArgumentException if beginIndex is less than 0,
* endIndex is greater than the length of the string, or beginIndex is
* greater than endIndex.
*/
diff --git a/jdk/src/java.base/share/classes/java/text/package-info.java b/jdk/src/java.base/share/classes/java/text/package-info.java
new file mode 100644
index 00000000000..b4c411844bd
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/text/package-info.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1998, 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.
+ */
+
+/**
+ * Provides classes and interfaces for handling text, dates, numbers,
+ * and messages in a manner independent of natural languages. This
+ * means your main application or applet can be written to be
+ * language-independent, and it can rely upon separate,
+ * dynamically-linked localized resources. This allows the flexibility
+ * of adding localizations for new localizations at any time.
+ *
+ *
+ *
+ *
+ * @since 1.1
+ */
+package java.text;
diff --git a/jdk/src/java.base/share/classes/java/text/package.html b/jdk/src/java.base/share/classes/java/text/package.html
deleted file mode 100644
index 3e9e51f15c7..00000000000
--- a/jdk/src/java.base/share/classes/java/text/package.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes and interfaces for handling text, dates, numbers, and messages
-in a manner independent of natural languages. This means your main application
-or applet can be written to be language-independent, and it can rely upon
-separate, dynamically-linked localized resources. This allows the flexibility
-of adding localizations for new localizations at any time.
-
-
-
-
-@since 1.1
-
-
diff --git a/jdk/src/java.base/share/classes/java/text/spi/package-info.java b/jdk/src/java.base/share/classes/java/text/spi/package-info.java
new file mode 100644
index 00000000000..3b8fa8bc9a1
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/text/spi/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 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. 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.
+ */
+
+/**
+ * Service provider classes for the classes in the java.text package.
+ *
+ * @since 1.6
+ */
+package java.text.spi;
diff --git a/jdk/src/java.base/share/classes/java/text/spi/package.html b/jdk/src/java.base/share/classes/java/text/spi/package.html
deleted file mode 100644
index fa08ec1fb35..00000000000
--- a/jdk/src/java.base/share/classes/java/text/spi/package.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-Service provider classes for the classes in the java.text package.
-
-
-@since 1.6
-
-
diff --git a/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
index 3dbbec5c0a4..ebe4e8a29d4 100644
--- a/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
+++ b/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
@@ -490,6 +490,16 @@ public final class HijrahChronology extends AbstractChronology implements Serial
return yearOfEra;
}
+ /**
+ * Creates the HijrahEra object from the numeric value.
+ * The Hijrah calendar system has only one era covering the
+ * proleptic years greater than zero.
+ * This method returns the singleton HijrahEra for the value 1.
+ *
+ * @param eraValue the era value
+ * @return the calendar system era, not null
+ * @throws DateTimeException if unable to create the era
+ */
@Override
public HijrahEra eraOf(int eraValue) {
switch (eraValue) {
diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
index 4a5a53cd83c..32e17093c68 100644
--- a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
+++ b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.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
@@ -1333,8 +1333,8 @@ public final class DateTimeFormatter {
* If the time '23:59:60' is received, then a simple conversion is applied,
* replacing the second-of-minute of 60 with 59. This query can be used
* on the parse result to determine if the leap-second adjustment was made.
- * The query will return one second of excess if it did adjust to remove
- * the leap-second, and zero if not. Note that applying a leap-second
+ * The query will return {@code true} if it did adjust to remove the
+ * leap-second, and {@code false} if not. Note that applying a leap-second
* smoothing mechanism, such as UTC-SLS, is the responsibility of the
* application, as follows:
*
diff --git a/jdk/src/java.base/share/classes/java/time/package-info.java b/jdk/src/java.base/share/classes/java/time/package-info.java
index cea222126f1..f078a08306d 100644
--- a/jdk/src/java.base/share/classes/java/time/package-info.java
+++ b/jdk/src/java.base/share/classes/java/time/package-info.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
@@ -120,9 +120,10 @@
*
*
Duration and Period
* Additional value types
diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
index a075da67d1c..0d983e52f96 100644
--- a/jdk/src/java.base/share/classes/java/util/Properties.java
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java
@@ -73,8 +73,7 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
* Unicode escapes as defined in section 3.3 of
* The Java™ Language Specification;
* only a single 'u' character is allowed in an escape
- * sequence. The native2ascii tool can be used to convert property files to and
- * from other character encodings.
+ * sequence.
*
* Package Specification
+ *
+ * The java.util.jar package is based on the following
+ * specifications:
+ *
+ *
+ *
+ *
+ * @since 1.2
+ */
+package java.util.jar;
diff --git a/jdk/src/java.base/share/classes/java/util/jar/package.html b/jdk/src/java.base/share/classes/java/util/jar/package.html
deleted file mode 100644
index 5c3a366122c..00000000000
--- a/jdk/src/java.base/share/classes/java/util/jar/package.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes for reading and writing the JAR (Java ARchive) file
-format, which is based on the standard ZIP file format with an
-optional manifest file. The manifest stores meta-information about the
-JAR file contents and is also used for signing JAR files.
-
-
-Package Specification
-
-The java.util.jar package is based on the following specifications:
-
-
-
-
-
-@since 1.2
-
-
diff --git a/jdk/src/java.base/share/classes/java/util/package-info.java b/jdk/src/java.base/share/classes/java/util/package-info.java
new file mode 100644
index 00000000000..ab706e0d179
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/util/package-info.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1998, 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. 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.
+ */
+
+/**
+ * Contains the collections framework, legacy collection classes,
+ * event model, date and time facilities, internationalization, and
+ * miscellaneous utility classes (a string tokenizer, a random-number
+ * generator, and a bit array).
+ *
+ * Package Specification
+ *
+ *
+ * Related Documentation
+ * For overviews, tutorials, examples, guides, and tool documentation,
+ * please see:
+ *
+ *
+ * @since 1.0
+ */
+package java.util;
diff --git a/jdk/src/java.base/share/classes/java/util/package.html b/jdk/src/java.base/share/classes/java/util/package.html
deleted file mode 100644
index eb77a146b0f..00000000000
--- a/jdk/src/java.base/share/classes/java/util/package.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-Contains the collections framework, legacy collection classes, event model,
-date and time facilities, internationalization, and miscellaneous utility
-classes (a string tokenizer, a random-number generator, and a bit array).
-
-Package Specification
-
-
-Related Documentation
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-
-
-@since 1.0
-
-
diff --git a/jdk/src/java.base/share/classes/java/util/regex/package-info.java b/jdk/src/java.base/share/classes/java/util/regex/package-info.java
new file mode 100644
index 00000000000..2907f10c003
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/util/regex/package-info.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2000, 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. 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.
+ */
+
+/**
+ * Classes for matching character sequences against patterns specified
+ * by regular expressions.
+ *
+ * Related Documentation
+ *
+ * Related Documentation
-
-Key classes for
+ * hardware devices, please refer to the cryptographic provider
+ * developer guide:
+ *
+ * Package Specification
+ *
+ *
+ *
+ *
+ * Related Documentation
+ *
+ * For further documentation, please see:
+ *
+ *
+ * @since 1.4
+ */
+package javax.crypto.interfaces;
diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html b/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
deleted file mode 100644
index c43000e80a7..00000000000
--- a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-Provides interfaces for Diffie-Hellman keys as defined in
-RSA Laboratories' PKCS #3.
-Key classes
-for hardware devices, please refer to the
-cryptographic provider developer guide:
-Package Specification
-
-
-
-
-Related Documentation
-
-For further documentation, please see:
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/crypto/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/package-info.java
new file mode 100644
index 00000000000..754b5f643c8
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/crypto/package-info.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1999, 2011, 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.
+ */
+
+/**
+ * Provides the classes and interfaces for cryptographic
+ * operations. The cryptographic operations defined in this package
+ * include encryption, key generation and key agreement, and Message
+ * Authentication Code (MAC) generation.
+ *
+ * Related Documentation
+ *
+ * For further documentation, please see:
+ *
+ *
+ *
+ * @since 1.4
+ */
+package javax.crypto;
diff --git a/jdk/src/java.base/share/classes/javax/crypto/package.html b/jdk/src/java.base/share/classes/javax/crypto/package.html
deleted file mode 100644
index c1d46ff528c..00000000000
--- a/jdk/src/java.base/share/classes/javax/crypto/package.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-Provides the classes and interfaces for cryptographic operations. The
-cryptographic operations defined in this package include encryption,
-key generation and key agreement, and Message Authentication Code
-(MAC) generation.
-
-Package Specification
-
-
-
-Related Documentation
-
-For further documentation, please see:
-
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java
new file mode 100644
index 00000000000..a9b4589321e
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1999, 2007, 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.
+ */
+
+/**
+ * Provides classes and interfaces for key specifications and
+ * algorithm parameter specifications.
+ *
+ *
+ *
+ *
+ * Related Documentation
+ *
+ * For documentation that includes information about algorithm
+ * parameter and key specifications, please see:
+ *
+ *
+ *
+ *
+ * @since 1.4
+ */
+package javax.crypto.spec;
diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/package.html b/jdk/src/java.base/share/classes/javax/crypto/spec/package.html
deleted file mode 100644
index 7f563fbb372..00000000000
--- a/jdk/src/java.base/share/classes/javax/crypto/spec/package.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-Provides classes and interfaces for key specifications and algorithm
-parameter specifications.
-
-Package Specification
-
-
-
-
-Related Documentation
-
-For documentation that includes information about algorithm parameter
-and key specifications, please see:
-
-
-
-@since 1.4
-
-
diff --git a/hotspot/src/share/vm/memory/genRemSet.inline.hpp b/jdk/src/java.base/share/classes/javax/net/package-info.java
similarity index 60%
rename from hotspot/src/share/vm/memory/genRemSet.inline.hpp
rename to jdk/src/java.base/share/classes/javax/net/package-info.java
index c468e859d83..71de9e40091 100644
--- a/hotspot/src/share/vm/memory/genRemSet.inline.hpp
+++ b/jdk/src/java.base/share/classes/javax/net/package-info.java
@@ -1,10 +1,12 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2001, 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.
+ * 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
@@ -19,22 +21,13 @@
* 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.
- *
*/
-#ifndef SHARE_VM_MEMORY_GENREMSET_INLINE_HPP
-#define SHARE_VM_MEMORY_GENREMSET_INLINE_HPP
-
-// Inline functions of GenRemSet, which de-virtualize this
-// performance-critical call when when the rem set is the most common
-// card-table kind.
-
-void GenRemSet::write_ref_field_gc(void* field, oop new_val) {
- if (kind() == CardTableModRef) {
- ((CardTableRS*)this)->inline_write_ref_field_gc(field, new_val);
- } else {
- write_ref_field_gc_work(field, new_val);
- }
-}
-
-#endif // SHARE_VM_MEMORY_GENREMSET_INLINE_HPP
+/**
+ * Provides classes for networking applications. These classes include
+ * factories for creating sockets. Using socket factories you can
+ * encapsulate socket creation and configuration behavior.
+ *
+ * @since 1.4
+ */
+package javax.net;
diff --git a/jdk/src/java.base/share/classes/javax/net/package.html b/jdk/src/java.base/share/classes/javax/net/package.html
deleted file mode 100644
index 35845a1830a..00000000000
--- a/jdk/src/java.base/share/classes/javax/net/package.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes for networking applications. These classes include
-factories for creating sockets. Using socket factories you can encapsulate
-socket creation and configuration behavior.
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java b/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java
new file mode 100644
index 00000000000..9fd6868587e
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1999, 2011, 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.
+ */
+
+/**
+ * Provides classes for the secure socket package. Using the secure
+ * socket classes, you can communicate using SSL or a related security
+ * protocol to reliably detect any errors introduced into the network
+ * byte stream and to optionally encrypt the data and/or authenticate
+ * the communicating peers.
+ *
+ *
+ *
+ * @since 1.4
+ */
+package javax.net.ssl;
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/package.html b/jdk/src/java.base/share/classes/javax/net/ssl/package.html
deleted file mode 100644
index d75e1d397a0..00000000000
--- a/jdk/src/java.base/share/classes/javax/net/ssl/package.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes for the secure socket package. Using the secure socket
-classes, you can communicate using SSL or a related security protocol
-to reliably detect any errors introduced into the network byte stream
-and to optionally encrypt the data and/or authenticate the communicating peers.
-
-Package Specification
-
-
-
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
index 57115f2139d..eb2c5f7028e 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
@@ -162,8 +162,8 @@ public abstract class Parser {
* Possible character type values are:
- 0 for underscore ('_') or any
* lower and upper case alphabetical character value;
- 1 for colon
* (':') character;
- 2 for dash ('-') and dot ('.') or any decimal
- * digit character value;
- 3 for any kind of white space character
An ASCII (7 bit) character which does not fall in any category listed
+ * digit character value;
- 3 for any kind of white space character
+ * An ASCII (7 bit) character which does not fall in any category listed
* above is mapped to 0xff.
*/
private static final byte nmttyp[];
diff --git a/jdk/src/java.base/share/classes/sun/reflect/package.html b/jdk/src/java.base/share/classes/sun/reflect/package.html
deleted file mode 100644
index 18ff61624bb..00000000000
--- a/jdk/src/java.base/share/classes/sun/reflect/package.html
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-The first three return the declared constructors, fields, and methods
-for a given class, with an option to return only the public ones. They
-are similar in functionality to the earlier GetClassConstructors,
-GetClassFields, and GetClassMethods. JVM_GetClassDeclaredFields and
-JVM_GetClassDeclaredMethods must intern the Strings for the names of
-the Field and Method objects returned. The fouth returns the access
-flags for a given class as marked in the class file, as opposed to in
-the InnerClasses attribute if the class is an inner class, and
-therefore differs from JVM_GetClassModifiers for inner classes (most
-importantly, protected inner classes; see 4471811.)
-
-
-
-
-
-
- -The following JVM entry points may be deleted: - -
- -To keep using the previous reflection implementation, licensees should -not take changes from Sun's JDK 1.4 relating specifically to the -implementation of reflection in the following classes/methods and -any associated native code: - -
@@ -2282,10 +2243,6 @@ public class PolicyFile extends java.security.Policy {
// Stores grant entries in the policy
final List
+ *
- * Characters in
+ *
* The corbaname URL is parsed into two parts: a corbaloc URL and a COS name.
- * The corbaloc URL is constructed by concatenation "corbaloc:" with
- *
+ * The corbaloc URL is constructed by concatenation {@code "corbaloc:"} with
+ * {@code
* A corbaname URL is resolved by:
- *
* This method effective does the following:
- *
- * Methods in the interfaces {@link ResultSet},
* {@link CallableStatement}, and {@link PreparedStatement}, such as
- *
- * All methods on the
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * After The The {@code Clob} interface provides methods for getting the
+ * length of an SQL {@code CLOB} (Character Large Object) value,
+ * for materializing a {@code CLOB} value on the client, and for
+ * searching for a substring or {@code CLOB} object within a
+ * {@code CLOB} value.
* Methods in the interfaces {@link ResultSet},
* {@link CallableStatement}, and {@link PreparedStatement}, such as
- *
- * All methods on the
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * After
+
@since 1.4
{@code
* corbaname url = "corbaname:"
+ * Characters in {@code {@code
* ; / : ? @ & = + $ , - _ . ! ~ * ; ( )
+ * }
* Escaped characters is escaped by using a % followed by its 2 hexadecimal
* numbers representing the octet.
- *
- *
*
* @author Rosanna Lee
*/
diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
index d6ed5fd71fd..a51d6a4880c 100644
--- a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
+++ b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
@@ -38,6 +38,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
*
* The format of an iiopname URL is defined in INS 98-10-11 as follows:
*
+ *
+ *
+ * }
+ * {@code
* nctx = ORB.string_to_object(corbalocUrl);
- *
* iiopname url = "iiopname://" [addr_list]["/" string_name]
* addr_list = [address ","]* address
* address = [version host [":" port]]
@@ -46,19 +47,23 @@ import com.sun.jndi.toolkit.url.UrlUtil;
* port = number
* major = number
* minor = number
- * string_name = stringified name | empty_string
+ * string_name = stringified name | empty_string
+ *
*
* The default port is 9999. The default version is "1.0"
* US-ASCII alphanumeric characters are not escaped. Any characters outside
* of this range are escaped except for the following:
+ * {@code
* ; / : ? : @ & = + $ , - _ . ! ~ * ' ( )
+ * }
* Escaped characters is escaped by using a % followed by its 2 hexadecimal
* numbers representing the octet.
*
* For backward compatibility, the "iiop" URL as defined in INS 97-6-6
* is also supported:
- *
+ * {@code
* iiop url = "iiop://" [host [":" port]] ["/" string_name]
+ * }
* The default port is 900.
*
* @author Rosanna Lee
diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
index 3802f5f106c..2fa43bca79e 100644
--- a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
+++ b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
@@ -56,7 +56,7 @@ public class CorbaUtils {
* object by using the javax.rmi.CORBA package.
*
+ *
*
* @param remoteObj The non-null remote object for
* @param orb The non-null ORB to connect the remote object to
diff --git a/jdk/src/java.management/share/classes/sun/management/Agent.java b/jdk/src/java.management/share/classes/sun/management/Agent.java
index ffb3105255e..e0b781dc71c 100644
--- a/jdk/src/java.management/share/classes/sun/management/Agent.java
+++ b/jdk/src/java.management/share/classes/sun/management/Agent.java
@@ -345,6 +345,7 @@ public class Agent {
if (jmxServer != null) {
ConnectorBootstrap.unexportRegistry();
+ ConnectorAddressLink.unexportRemote();
// Attempt to stop already stopped agent
// Don't cause any errors.
diff --git a/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
index 893f11c1f46..4ec5ec799cc 100644
--- a/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
+++ b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,6 +27,7 @@ package sun.management;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -45,9 +46,26 @@ import sun.management.counter.perf.PerfInstrumentation;
* @since 1.5
*/
public class ConnectorAddressLink {
+ /**
+ * A simple wrapper for the perf-counter backing {@linkplain ByteBuffer}
+ */
+ private static final class PerfHandle {
+ private ByteBuffer bb;
+
+ private PerfHandle(ByteBuffer bb) {
+ this.bb = bb.order(ByteOrder.nativeOrder());
+ }
+
+ private void putLong(long l) {
+ this.bb = bb.clear();
+ this.bb.asLongBuffer().put(l);
+ }
+ }
private static final String CONNECTOR_ADDRESS_COUNTER =
"sun.management.JMXConnectorServer.address";
+ private static final String REMOTE_CONNECTOR_STATE_COUNTER =
+ "sun.management.JMXConnectorServer.remote.enabled";
/*
* The format of the jvmstat counters representing the properties of
@@ -78,7 +96,9 @@ public class ConnectorAddressLink {
* JMX remote connector counter (it will be incremented every
* time a new out-of-the-box JMX remote connector is created).
*/
- private static AtomicInteger counter = new AtomicInteger();
+ private static final AtomicInteger counter = new AtomicInteger();
+
+ private static PerfHandle remotePerfHandle = null;
/**
* Exports the specified connector address to the instrumentation buffer
@@ -93,7 +113,17 @@ public class ConnectorAddressLink {
}
Perf perf = Perf.getPerf();
perf.createString(
- CONNECTOR_ADDRESS_COUNTER, 1, Units.STRING.intValue(), address);
+ CONNECTOR_ADDRESS_COUNTER, 1, Units.STRING.intValue(), address);
+ }
+
+ public static void unexportRemote() {
+ unexport(remotePerfHandle);
+ }
+
+ private static void unexport(PerfHandle ph) {
+ if (ph != null) {
+ ph.putLong(-1L);
+ }
}
/**
@@ -143,6 +173,13 @@ public class ConnectorAddressLink {
perf.createString(REMOTE_CONNECTOR_COUNTER_PREFIX + index + "." +
entry.getKey(), 1, Units.STRING.intValue(), entry.getValue());
}
+ if (remotePerfHandle != null) {
+ remotePerfHandle.putLong(index);
+ } else {
+ remotePerfHandle = new PerfHandle(
+ perf.createLong(REMOTE_CONNECTOR_STATE_COUNTER, 1, Units.NONE.intValue(), (long)index)
+ );
+ }
}
/**
diff --git a/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java b/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
index 63dfcfb166e..1e93cb88a32 100644
--- a/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
+++ b/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
@@ -1013,7 +1013,6 @@ class WindowsPreferences extends AbstractPreferences {
* description of the encoding algorithm.
*/
private static String toJavaValueString(byte[] windowsNameArray) {
- // Use modified native2ascii algorithm
String windowsName = byteArrayToString(windowsNameArray);
StringBuilder javaName = new StringBuilder();
char ch;
@@ -1055,8 +1054,7 @@ class WindowsPreferences extends AbstractPreferences {
* Encoding algorithm adds "/" character to capital letters, i.e.
* "A" is encoded as "/A". Character '\' is encoded as '//',
* '/' is encoded as '\'.
- * Then encoding scheme similar to jdk's native2ascii converter is used
- * to convert java string to a byte array of ASCII characters.
+ * Then convert java string to a byte array of ASCII characters.
*/
private static byte[] toWindowsValueString(String javaName) {
StringBuilder windowsName = new StringBuilder();
diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
index 5d04247df99..c090b308d4c 100644
--- a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
+++ b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
@@ -132,7 +132,9 @@ public interface ScriptEngine {
*
* @return The value returned from the execution of the script.
*
- * @throws ScriptException if an error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ *
* java.lang.Object stub;
* try {
* stub = PortableRemoteObject.toStub(remoteObj);
@@ -72,6 +72,7 @@ public class CorbaUtils {
* // ignore 'already connected' error
* }
* return (javax.rmi.CORBA.Stub)stub;
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if either argument is null.
*/
public Object eval(Reader reader , ScriptContext context) throws ScriptException;
@@ -145,7 +147,9 @@ public interface ScriptEngine {
*
* @return The value returned from the execution of the script.
*
- * @throws ScriptException if error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if the argument is null.
*/
public Object eval(String script) throws ScriptException;
@@ -158,7 +162,9 @@ public interface ScriptEngine {
*
* @return The value returned by the script.
*
- * @throws ScriptException if an error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if the argument is null.
*/
public Object eval(Reader reader) throws ScriptException;
@@ -177,7 +183,9 @@ public interface ScriptEngine {
*
* @return The value returned by the script.
*
- * @throws ScriptException if an error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if either argument is null.
*/
public Object eval(String script, Bindings n) throws ScriptException;
@@ -191,7 +199,9 @@ public interface ScriptEngine {
*
* @return The value returned by the script.
*
- * @throws ScriptException if an error occurs.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if either argument is null.
*/
public Object eval(Reader reader , Bindings n) throws ScriptException;
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
index 1fbb7a1de0b..262debcaf40 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
@@ -85,7 +85,7 @@ public class Krb5AcceptCredential
if (creds == null)
throw new GSSException(GSSException.NO_CRED, -1,
- "Failed to find any Kerberos credentails");
+ "Failed to find any Kerberos credentials");
if (name == null) {
String fullName = creds.getName();
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
index f2f74ab5c67..395738095a7 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
@@ -110,8 +110,10 @@ public class Config {
* java.security.krb5.kdc not specified, error reading configuration file.
*/
- public static synchronized void refresh() throws KrbException {
- singleton = new Config();
+ public static void refresh() throws KrbException {
+ synchronized (Config.class) {
+ singleton = new Config();
+ }
KdcComm.initStatic();
EType.initStatic();
Checksum.initStatic();
diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
index 8fb0b5be9e2..a97a27244af 100644
--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
@@ -1059,7 +1059,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* (acceptChanges) or population. This method may also be called
* while performing updates to the insert row.
* undoUpdateTINYINT, SMALLINT, INTEGER
- * BIGINT, REAL, FLOAT, DOUBLE, DECIMAL, NUMERIC, BIT, CHAR,
- * VARCHAR or LONGVARCHAR< value. The bold SQL type
- * designates the recommended return type.
+ * column does not store an SQL {@code TINYINT, SMALLINT, INTEGER
+ * BIGINT, REAL, FLOAT, DOUBLE, DECIMAL, NUMERIC, BIT, }
+ * {@code CHAR, VARCHAR} or
+ * {@code LONGVARCHAR} value.
+ * The bold SQL type designates the recommended return type.
*/
public String getString(String columnName) throws SQLException {
return getString(getColIdxByName(columnName));
@@ -7748,7 +7749,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* Updates the designated column with a RowId value. The updater
* methods are used to update column values in the current row or the insert
* row. The updater methods do not update the underlying database; instead
- * the updateRow or insertRow methods are called
+ * the {@code updateRow} or {@code insertRow} methods are called
* to update the database.
*
* @param columnIndex the first column is 1, the second 2, ...
@@ -7764,7 +7765,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* Updates the designated column with a RowId value. The updater
* methods are used to update column values in the current row or the insert
* row. The updater methods do not update the underlying database; instead
- * the updateRow or insertRow methods are called
+ * the {@code updateRow} or {@code insertRow} methods are called
* to update the database.
*
* @param columnName the name of the column
diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
index 79c3e78fc00..a3979499f28 100644
--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
@@ -182,7 +182,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable {
private CachedRowSetImpl crsResolve;
/**
- * This ArrayList will hold the values of SyncResolver.*
+ * This {@code ArrayList} will hold the values of SyncResolver.*
*/
private ArrayListBLOB value. An SQL BLOB is a built-in type
+ * the Java™ programming language of an SQL
+ * {@code BLOB} value. An SQL {@code BLOB} is a built-in type
* that stores a Binary Large Object as a column value in a row of
- * a database table. By default drivers implement Blob using
- * an SQL locator(BLOB), which means that a
- * Blob object contains a logical pointer to the
- * SQL BLOB data rather than the data itself.
- * A Blob object is valid for the duration of the
+ * a database table. By default drivers implement {@code Blob} using
+ * an SQL {@code locator(BLOB)}, which means that a
+ * {@code Blob} object contains a logical pointer to the
+ * SQL {@code BLOB} data rather than the data itself.
+ * A {@code Blob} object is valid for the duration of the
* transaction in which is was created.
*
* getBlob and setBlob allow a programmer to
- * access an SQL BLOB value.
- * The Blob interface provides methods for getting the
- * length of an SQL BLOB (Binary Large Object) value,
- * for materializing a BLOB value on the client, and for
+ * {@code getBlob} and {@code setBlob} allow a programmer to
+ * access an SQL {@code BLOB} value.
+ * The {@code Blob} interface provides methods for getting the
+ * length of an SQL {@code BLOB} (Binary Large Object) value,
+ * for materializing a {@code BLOB} value on the client, and for
* determining the position of a pattern of bytes within a
- * BLOB value. In addition, this interface has methods for updating
- * a BLOB value.
+ * {@code BLOB} value. In addition, this interface has methods for updating
+ * a {@code BLOB} value.
* Blob interface must be fully implemented if the
+ * All methods on the {@code Blob} interface must be fully implemented if the
* JDBC driver supports the data type.
*
* @since 1.2
@@ -60,51 +59,52 @@ import java.io.InputStream;
public interface Blob {
/**
- * Returns the number of bytes in the BLOB value
- * designated by this Blob object.
- * @return length of the BLOB in bytes
+ * Returns the number of bytes in the {@code BLOB} value
+ * designated by this {@code Blob} object.
+ *
+ * @return length of the {@code BLOB} in bytes
* @exception SQLException if there is an error accessing the
- * length of the BLOB
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * length of the {@code BLOB}
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long length() throws SQLException;
/**
- * Retrieves all or part of the BLOB
- * value that this Blob object represents, as an array of
- * bytes. This byte array contains up to length
- * consecutive bytes starting at position pos.
+ * Retrieves all or part of the {@code BLOB}
+ * value that this {@code Blob} object represents, as an array of
+ * bytes. This {@code byte} array contains up to {@code length}
+ * consecutive bytes starting at position {@code pos}.
*
* @param pos the ordinal position of the first byte in the
- * BLOB value to be extracted; the first byte is at
+ * {@code BLOB} value to be extracted; the first byte is at
* position 1
* @param length the number of consecutive bytes to be copied; the value
- * for length must be 0 or greater
- * @return a byte array containing up to length
- * consecutive bytes from the BLOB value designated
- * by this Blob object, starting with the
- * byte at position pos
+ * for length must be 0 or greater
+ * @return a byte array containing up to {@code length}
+ * consecutive bytes from the {@code BLOB} value designated
+ * by this {@code Blob} object, starting with the
+ * byte at position {@code pos}
* @exception SQLException if there is an error accessing the
- * BLOB value; if pos is less than 1 or length is
- * less than 0
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value; if pos is less than 1 or length is
+ * less than 0
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setBytes
* @since 1.2
*/
byte[] getBytes(long pos, int length) throws SQLException;
/**
- * Retrieves the BLOB value designated by this
- * Blob instance as a stream.
+ * Retrieves the {@code BLOB} value designated by this
+ * {@code Blob} instance as a stream.
*
- * @return a stream containing the BLOB data
+ * @return a stream containing the {@code BLOB} data
* @exception SQLException if there is an error accessing the
- * BLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setBinaryStream
* @since 1.2
*/
@@ -112,38 +112,38 @@ public interface Blob {
/**
* Retrieves the byte position at which the specified byte array
- * pattern begins within the BLOB
- * value that this Blob object represents. The
- * search for pattern begins at position
- * start.
+ * {@code pattern} begins within the {@code BLOB}
+ * value that this {@code Blob} object represents.
+ * The search for {@code pattern} begins at position
+ * {@code start}.
*
* @param pattern the byte array for which to search
* @param start the position at which to begin searching; the
* first position is 1
* @return the position at which the pattern appears, else -1
* @exception SQLException if there is an error accessing the
- * BLOB or if start is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} or if start is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(byte pattern[], long start) throws SQLException;
/**
- * Retrieves the byte position in the BLOB value
- * designated by this Blob object at which
- * pattern begins. The search begins at position
- * start.
+ * Retrieves the byte position in the {@code BLOB} value
+ * designated by this {@code Blob} object at which
+ * {@code pattern} begins. The search begins at position
+ * {@code start}.
*
- * @param pattern the Blob object designating
- * the BLOB value for which to search
- * @param start the position in the BLOB value
+ * @param pattern the {@code Blob} object designating
+ * the {@code BLOB} value for which to search
+ * @param start the position in the {@code BLOB} value
* at which to begin searching; the first position is 1
* @return the position at which the pattern begins, else -1
* @exception SQLException if there is an error accessing the
- * BLOB value or if start is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if start is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(Blob pattern, long start) throws SQLException;
@@ -151,152 +151,155 @@ public interface Blob {
// -------------------------- JDBC 3.0 -----------------------------------
/**
- * Writes the given array of bytes to the BLOB value that
- * this Blob object represents, starting at position
- * pos, and returns the number of bytes written.
+ * Writes the given array of bytes to the {@code BLOB} value that
+ * this {@code Blob} object represents, starting at position
+ * {@code pos}, and returns the number of bytes written.
* The array of bytes will overwrite the existing bytes
- * in the Blob object starting at the position
- * pos. If the end of the Blob value is reached
- * while writing the array of bytes, then the length of the Blob
+ * in the {@code Blob} object starting at the position
+ * {@code pos}. If the end of the {@code Blob} value is reached
+ * while writing the array of bytes, then the length of the {@code Blob}
* value will be increased to accommodate the extra bytes.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position in the BLOB object at which
+ * @param pos the position in the {@code BLOB} object at which
* to start writing; the first position is 1
- * @param bytes the array of bytes to be written to the BLOB
- * value that this Blob object represents
+ * @param bytes the array of bytes to be written to the {@code BLOB}
+ * value that this {@code Blob} object represents
* @return the number of bytes written
* @exception SQLException if there is an error accessing the
- * BLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getBytes
* @since 1.4
*/
int setBytes(long pos, byte[] bytes) throws SQLException;
/**
- * Writes all or part of the given byte array to the
- * BLOB value that this Blob object represents
+ * Writes all or part of the given {@code byte} array to the
+ * {@code BLOB} value that this {@code Blob} object represents
* and returns the number of bytes written.
- * Writing starts at position pos in the BLOB
- * value; len bytes from the given byte array are written.
+ * Writing starts at position {@code pos} in the {@code BLOB}
+ * value; {@code len} bytes from the given byte array are written.
* The array of bytes will overwrite the existing bytes
- * in the Blob object starting at the position
- * pos. If the end of the Blob value is reached
- * while writing the array of bytes, then the length of the Blob
+ * in the {@code Blob} object starting at the position
+ * {@code pos}. If the end of the {@code Blob} value is reached
+ * while writing the array of bytes, then the length of the {@code Blob}
* value will be increased to accommodate the extra bytes.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position in the BLOB object at which
+ * @param pos the position in the {@code BLOB} object at which
* to start writing; the first position is 1
- * @param bytes the array of bytes to be written to this BLOB
+ * @param bytes the array of bytes to be written to this {@code BLOB}
* object
- * @param offset the offset into the array bytes at which
+ * @param offset the offset into the array {@code bytes} at which
* to start reading the bytes to be set
- * @param len the number of bytes to be written to the BLOB
- * value from the array of bytes bytes
+ * @param len the number of bytes to be written to the {@code BLOB}
+ * value from the array of bytes {@code bytes}
* @return the number of bytes written
* @exception SQLException if there is an error accessing the
- * BLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getBytes
* @since 1.4
*/
int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException;
/**
- * Retrieves a stream that can be used to write to the BLOB
- * value that this Blob object represents. The stream begins
- * at position pos.
+ * Retrieves a stream that can be used to write to the {@code BLOB}
+ * value that this {@code Blob} object represents. The stream begins
+ * at position {@code pos}.
* The bytes written to the stream will overwrite the existing bytes
- * in the Blob object starting at the position
- * pos. If the end of the Blob value is reached
- * while writing to the stream, then the length of the Blob
+ * in the {@code Blob} object starting at the position
+ * {@code pos}. If the end of the {@code Blob} value is reached
+ * while writing to the stream, then the length of the {@code Blob}
* value will be increased to accommodate the extra bytes.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position in the BLOB value at which
+ * @param pos the position in the {@code BLOB} value at which
* to start writing; the first position is 1
- * @return a java.io.OutputStream object to which data can
+ * @return a {@code java.io.OutputStream} object to which data can
* be written
* @exception SQLException if there is an error accessing the
- * BLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getBinaryStream
* @since 1.4
*/
java.io.OutputStream setBinaryStream(long pos) throws SQLException;
/**
- * Truncates the BLOB value that this Blob
- * object represents to be len bytes in length.
+ * Truncates the {@code BLOB} value that this {@code Blob}
+ * object represents to be {@code len} bytes in length.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param len the length, in bytes, to which the BLOB value
- * that this Blob object represents should be truncated
+ * @param len the length, in bytes, to which the {@code BLOB} value
+ * that this {@code Blob} object represents should be truncated
* @exception SQLException if there is an error accessing the
- * BLOB value or if len is less than 0
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if len is less than 0
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
void truncate(long len) throws SQLException;
/**
- * This method frees the Blob object and releases the resources that
- * it holds. The object is invalid once the free
+ * This method frees the {@code Blob} object and releases the resources that
+ * it holds. The object is invalid once the {@code free}
* method is called.
* free has been called, any attempt to invoke a
- * method other than free will result in a SQLException
- * being thrown. If free is called multiple times, the subsequent
- * calls to free are treated as a no-op.
+ * After {@code free} has been called, any attempt to invoke a
+ * method other than {@code free} will result in an {@code SQLException}
+ * being thrown. If {@code free} is called multiple times, the subsequent
+ * calls to {@code free} are treated as a no-op.
*
* @throws SQLException if an error occurs releasing
- * the Blob's resources
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * the Blob's resources
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
void free() throws SQLException;
/**
- * Returns an InputStream object that contains a partial Blob value,
- * starting with the byte specified by pos, which is length bytes in length.
+ * Returns an {@code InputStream} object that contains
+ * a partial {@code Blob} value, starting with the byte
+ * specified by pos, which is length bytes in length.
*
- * @param pos the offset to the first byte of the partial value to be retrieved.
- * The first byte in the Blob is at position 1
+ * @param pos the offset to the first byte of the partial value to be
+ * retrieved. The first byte in the {@code Blob} is at position 1.
* @param length the length in bytes of the partial value to be retrieved
- * @return InputStream through which the partial Blob value can be read.
- * @throws SQLException if pos is less than 1 or if pos is greater than the number of bytes
- * in the Blob or if pos + length is greater than the number of bytes
- * in the Blob
+ * @return {@code InputStream} through which
+ * the partial {@code Blob} value can be read.
+ * @throws SQLException if pos is less than 1 or if pos is greater
+ * than the number of bytes in the {@code Blob} or if
+ * pos + length is greater than the number of bytes
+ * in the {@code Blob}
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
InputStream getBinaryStream(long pos, long length) throws SQLException;
diff --git a/jdk/src/java.sql/share/classes/java/sql/Clob.java b/jdk/src/java.sql/share/classes/java/sql/Clob.java
index b074ac604c0..3c4bfda793a 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Clob.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Clob.java
@@ -29,28 +29,28 @@ import java.io.Reader;
/**
* The mapping in the Java™ programming language
- * for the SQL CLOB type.
- * An SQL CLOB is a built-in type
+ * for the SQL {@code CLOB} type.
+ * An SQL {@code CLOB} is a built-in type
* that stores a Character Large Object as a column value in a row of
* a database table.
- * By default drivers implement a Clob object using an SQL
- * locator(CLOB), which means that a Clob object
- * contains a logical pointer to the SQL CLOB data rather than
- * the data itself. A Clob object is valid for the duration
+ * By default drivers implement a {@code Clob} object using an SQL
+ * {@code locator(CLOB)}, which means that a {@code Clob} object
+ * contains a logical pointer to the SQL {@code CLOB} data rather than
+ * the data itself. A {@code Clob} object is valid for the duration
* of the transaction in which it was created.
- * Clob interface provides methods for getting the
- * length of an SQL CLOB (Character Large Object) value,
- * for materializing a CLOB value on the client, and for
- * searching for a substring or CLOB object within a
- * CLOB value.
+ * getClob and setClob allow a programmer to
- * access an SQL CLOB value. In addition, this interface
- * has methods for updating a CLOB value.
+ * {@code getClob} and {@code setClob} allow a programmer to
+ * access an SQL {@code CLOB} value. In addition, this interface
+ * has methods for updating a {@code CLOB} value.
* Clob interface must be fully implemented if the
- * JDBC driver supports the data type.
+ * All methods on the {@code Clob} interface must be
+ * fully implemented if the JDBC driver supports the data type.
*
* @since 1.2
*/
@@ -59,67 +59,67 @@ public interface Clob {
/**
* Retrieves the number of characters
- * in the CLOB value
- * designated by this Clob object.
+ * in the {@code CLOB} value
+ * designated by this {@code Clob} object.
*
- * @return length of the CLOB in characters
+ * @return length of the {@code CLOB} in characters
* @exception SQLException if there is an error accessing the
- * length of the CLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * length of the {@code CLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long length() throws SQLException;
/**
* Retrieves a copy of the specified substring
- * in the CLOB value
- * designated by this Clob object.
+ * in the {@code CLOB} value
+ * designated by this {@code Clob} object.
* The substring begins at position
- * pos and has up to length consecutive
+ * {@code pos} and has up to {@code length} consecutive
* characters.
*
* @param pos the first character of the substring to be extracted.
- * The first character is at position 1.
+ * The first character is at position 1.
* @param length the number of consecutive characters to be copied;
- * the value for length must be 0 or greater
- * @return a String that is the specified substring in
- * the CLOB value designated by this Clob object
+ * the value for length must be 0 or greater
+ * @return a {@code String} that is the specified substring in
+ * the {@code CLOB} value designated by this {@code Clob} object
* @exception SQLException if there is an error accessing the
- * CLOB value; if pos is less than 1 or length is
- * less than 0
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value; if pos is less than 1 or length is
+ * less than 0
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
String getSubString(long pos, int length) throws SQLException;
/**
- * Retrieves the CLOB value designated by this Clob
- * object as a java.io.Reader object (or as a stream of
+ * Retrieves the {@code CLOB} value designated by this {@code Clob}
+ * object as a {@code java.io.Reader} object (or as a stream of
* characters).
*
- * @return a java.io.Reader object containing the
- * CLOB data
+ * @return a {@code java.io.Reader} object containing the
+ * {@code CLOB} data
* @exception SQLException if there is an error accessing the
- * CLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setCharacterStream
* @since 1.2
*/
java.io.Reader getCharacterStream() throws SQLException;
/**
- * Retrieves the CLOB value designated by this Clob
+ * Retrieves the {@code CLOB} value designated by this {@code Clob}
* object as an ascii stream.
*
- * @return a java.io.InputStream object containing the
- * CLOB data
+ * @return a {@code java.io.InputStream} object containing the
+ * {@code CLOB} data
* @exception SQLException if there is an error accessing the
- * CLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setAsciiStream
* @since 1.2
*/
@@ -127,38 +127,38 @@ public interface Clob {
/**
* Retrieves the character position at which the specified substring
- * searchstr appears in the SQL CLOB value
- * represented by this Clob object. The search
- * begins at position start.
+ * {@code searchstr} appears in the SQL {@code CLOB} value
+ * represented by this {@code Clob} object. The search
+ * begins at position {@code start}.
*
* @param searchstr the substring for which to search
- * @param start the position at which to begin searching; the first position
- * is 1
+ * @param start the position at which to begin searching;
+ * the first position is 1
* @return the position at which the substring appears or -1 if it is not
* present; the first position is 1
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(String searchstr, long start) throws SQLException;
/**
* Retrieves the character position at which the specified
- * Clob object searchstr appears in this
- * Clob object. The search begins at position
- * start.
+ * {@code Clob} object {@code searchstr} appears in this
+ * {@code Clob} object. The search begins at position
+ * {@code start}.
*
- * @param searchstr the Clob object for which to search
+ * @param searchstr the {@code Clob} object for which to search
* @param start the position at which to begin searching; the first
* position is 1
- * @return the position at which the Clob object appears
- * or -1 if it is not present; the first position is 1
+ * @return the position at which the {@code Clob} object appears
+ * or -1 if it is not present; the first position is 1
* @exception SQLException if there is an error accessing the
- * CLOB value or if start is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if start is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(Clob searchstr, long start) throws SQLException;
@@ -166,90 +166,91 @@ public interface Clob {
//---------------------------- jdbc 3.0 -----------------------------------
/**
- * Writes the given Java String to the CLOB
- * value that this Clob object designates at the position
- * pos. The string will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing the given string, then the length of the Clob
+ * Writes the given Java {@code String} to the {@code CLOB}
+ * value that this {@code Clob} object designates at the position
+ * {@code pos}. The string will overwrite the existing characters
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing the given string, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position at which to start writing to the CLOB
- * value that this Clob object represents;
- * The first position is 1
- * @param str the string to be written to the CLOB
- * value that this Clob designates
+ * @param pos the position at which to start writing to the {@code CLOB}
+ * value that this {@code Clob} object represents;
+ * the first position is 1.
+ * @param str the string to be written to the {@code CLOB}
+ * value that this {@code Clob} designates
* @return the number of characters written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
+ * {@code CLOB} value or if pos is less than 1
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
int setString(long pos, String str) throws SQLException;
/**
- * Writes len characters of str, starting
- * at character offset, to the CLOB value
- * that this Clob represents. The string will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing the given string, then the length of the Clob
+ * Writes {@code len} characters of {@code str}, starting
+ * at character {@code offset}, to the {@code CLOB} value
+ * that this {@code Clob} represents.
+ * The string will overwrite the existing characters
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing the given string, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
* @param pos the position at which to start writing to this
- * CLOB object; The first position is 1
- * @param str the string to be written to the CLOB
- * value that this Clob object represents
- * @param offset the offset into str to start reading
+ * {@code CLOB} object; The first position is 1
+ * @param str the string to be written to the {@code CLOB}
+ * value that this {@code Clob} object represents
+ * @param offset the offset into {@code str} to start reading
* the characters to be written
* @param len the number of characters to be written
* @return the number of characters written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
+ * {@code CLOB} value or if pos is less than 1
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
int setString(long pos, String str, int offset, int len) throws SQLException;
/**
* Retrieves a stream to be used to write Ascii characters to the
- * CLOB value that this Clob object represents,
- * starting at position pos. Characters written to the stream
+ * {@code CLOB} value that this {@code Clob} object represents,
+ * starting at position {@code pos}. Characters written to the stream
* will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing characters to the stream, then the length of the Clob
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing characters to the stream, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
* @param pos the position at which to start writing to this
- * CLOB object; The first position is 1
+ * {@code CLOB} object; The first position is 1
* @return the stream to which ASCII encoded characters can be written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getAsciiStream
*
* @since 1.4
@@ -258,28 +259,28 @@ public interface Clob {
/**
* Retrieves a stream to be used to write a stream of Unicode characters
- * to the CLOB value that this Clob object
- * represents, at position pos. Characters written to the stream
+ * to the {@code CLOB} value that this {@code Clob} object
+ * represents, at position {@code pos}. Characters written to the stream
* will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing characters to the stream, then the length of the Clob
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing characters to the stream, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
* @param pos the position at which to start writing to the
- * CLOB value; The first position is 1
+ * {@code CLOB} value; The first position is 1
*
* @return a stream to which Unicode encoded characters can be written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getCharacterStream
*
* @since 1.4
@@ -287,60 +288,64 @@ public interface Clob {
java.io.Writer setCharacterStream(long pos) throws SQLException;
/**
- * Truncates the CLOB value that this Clob
- * designates to have a length of len
+ * Truncates the {@code CLOB} value that this {@code Clob}
+ * designates to have a length of {@code len}
* characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param len the length, in characters, to which the CLOB value
+ * @param len the length, in characters, to which the {@code CLOB} value
* should be truncated
* @exception SQLException if there is an error accessing the
- * CLOB value or if len is less than 0
+ * {@code CLOB} value or if len is less than 0
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
void truncate(long len) throws SQLException;
/**
- * This method releases the resources that the Clob object
- * holds. The object is invalid once the free method
+ * This method releases the resources that the {@code Clob} object
+ * holds. The object is invalid once the {@code free} method
* is called.
* free has been called, any attempt to invoke a
- * method other than free will result in a SQLException
- * being thrown. If free is called multiple times, the subsequent
- * calls to free are treated as a no-op.
+ * After {@code free} has been called, any attempt to invoke a
+ * method other than {@code free} will result in a {@code SQLException}
+ * being thrown. If {@code free} is called multiple times, the subsequent
+ * calls to {@code free} are treated as a no-op.
*
* @throws SQLException if an error occurs releasing
- * the Clob's resources
+ * the Clob's resources
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
void free() throws SQLException;
/**
- * Returns a Reader object that contains a partial Clob value, starting
- * with the character specified by pos, which is length characters in length.
+ * Returns a {@code Reader} object that contains
+ * a partial {@code Clob} value, starting with the character
+ * specified by pos, which is length characters in length.
*
* @param pos the offset to the first character of the partial value to
* be retrieved. The first character in the Clob is at position 1.
* @param length the length in characters of the partial value to be retrieved.
- * @return Reader through which the partial Clob value can be read.
- * @throws SQLException if pos is less than 1 or if pos is greater than the number of
- * characters in the Clob or if pos + length is greater than the number of
- * characters in the Clob
+ * @return {@code Reader} through which
+ * the partial {@code Clob} value can be read.
+ * @throws SQLException if pos is less than 1;
+ * or if pos is greater than the number of characters
+ * in the {@code Clob};
+ * or if pos + length is greater than the number of
+ * characters in the {@code Clob}
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
Reader getCharacterStream(long pos, long length) throws SQLException;
diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html b/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html
index daa9e6807ca..0d74a973014 100644
--- a/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html
+++ b/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html
@@ -35,7 +35,7 @@ manager to enlist and delist resource objects (supplied by the
resource manager driver) in JTA transactions. The driver vendor
for a specific resource manager provides the implementation of
this API.
-