stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 20:28:13 +02:00
commit d63c6e90be
223 changed files with 3067 additions and 2107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -301,3 +301,4 @@ cb7367141e910e265b8344a8facee740bd1e5467 jdk9-b54
eb7febe45865ba6b81f2ea68082262d0708a0b22 jdk9-b56
f25ee9f62427a9ba27418e5531a89754791a305b jdk9-b57
6e78dd9b121037719a065fe8fb25b936babdfecb jdk9-b58
39e8a131289e8386aa4c3e4b184faa812a7c0421 jdk9-b59

3
common/autoconf/basics.m4
View File

@ -658,6 +658,8 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
fi
OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
$MKDIR -p "$OUTPUT_ROOT"
CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
$MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
if test ! -d "$OUTPUT_ROOT"; then
AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
fi
@ -703,6 +705,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
AC_SUBST(CONF_NAME, $CONF_NAME)
AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
# The spec.gmk file contains all variables for the make system.
AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])

43
common/autoconf/basics_windows.m4
View File

@ -383,45 +383,46 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
if test "x$OPENJDK_BUILD_OS" = xwindows; then
AC_MSG_CHECKING([if fixpath can be created])
FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
# Important to keep the .exe suffix on Cygwin for Hotspot makefiles
FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
FIXPATH="$FIXPATH_BIN -c"
elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
# Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
# @ was chosen as separator to minimize risk of other tools messing around with it
all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \
| tr ' ' '\n' | grep '^/./' | sort | uniq`
fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
fi
rm -f $OUTPUT_ROOT/fixpath*
cd $OUTPUT_ROOT
$CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
FIXPATH_SRC_W="$FIXPATH_SRC"
FIXPATH_BIN_W="$FIXPATH_BIN"
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
$RM -rf $FIXPATH_BIN $FIXPATH_DIR
$MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
cd $FIXPATH_DIR
$CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
cd $CURDIR
if test ! -x $OUTPUT_ROOT/fixpath.exe; then
if test ! -x $FIXPATH_BIN; then
AC_MSG_RESULT([no])
cat $OUTPUT_ROOT/fixpath1.log
AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
cat $FIXPATH_DIR/fixpath1.log
AC_MSG_ERROR([Could not create $FIXPATH_BIN])
fi
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([if fixpath.exe works])
cd $OUTPUT_ROOT
$FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
cd $FIXPATH_DIR
$FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
> $FIXPATH_DIR/fixpath2.log 2>&1
cd $CURDIR
if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
if test ! -x $FIXPATH_DIR/fixpath2.exe; then
AC_MSG_RESULT([no])
cat $OUTPUT_ROOT/fixpath2.log
cat $FIXPATH_DIR/fixpath2.log
AC_MSG_ERROR([fixpath did not work!])
fi
AC_MSG_RESULT([yes])
rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
fi
AC_SUBST(FIXPATH)

7
common/autoconf/build-performance.m4
View File

@ -336,11 +336,4 @@ AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
AC_MSG_CHECKING([whether to use sjavac])
AC_MSG_RESULT([$ENABLE_SJAVAC])
AC_SUBST(ENABLE_SJAVAC)
if test "x$ENABLE_SJAVAC" = xyes; then
SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
else
SJAVAC_SERVER_DIR=
fi
AC_SUBST(SJAVAC_SERVER_DIR)
])

4
common/autoconf/configure.ac
View File

@ -261,7 +261,7 @@ CUSTOM_LATE_HOOK
# We're messing a bit with internal autoconf variables to put the config.status
# in the output directory instead of the current directory.
CONFIG_STATUS="$OUTPUT_ROOT/config.status"
CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
# Create the actual output files. Now the main work of configure is done.
AC_OUTPUT
@ -269,7 +269,7 @@ CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
# Try to move the config.log file to the output directory.
if test -e ./config.log; then
$MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
$MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
fi
# Make the compare script executable

81
common/autoconf/generated-configure.sh
View File

@ -632,7 +632,6 @@ LIBOBJS
CFLAGS_CCACHE
CCACHE
USE_PRECOMPILED_HEADER
SJAVAC_SERVER_DIR
ENABLE_SJAVAC
SJAVAC_SERVER_JAVA_FLAGS
SJAVAC_SERVER_JAVA
@ -884,6 +883,7 @@ CHECK_TOOLSDIR_GMAKE
CHECK_MAKE
CHECK_GMAKE
PKGHANDLER
CONFIGURESUPPORT_OUTPUTDIR
OUTPUT_ROOT
CONF_NAME
SPEC
@ -4365,7 +4365,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1428017006
DATE_WHEN_GENERATED=1428676283
###############################################################################
#
@ -15266,6 +15266,8 @@ $as_echo "in build directory with custom name" >&6; }
fi
OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
$MKDIR -p "$OUTPUT_ROOT"
CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
$MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
if test ! -d "$OUTPUT_ROOT"; then
as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
fi
@ -15450,6 +15452,7 @@ $as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is inval
OUTPUT_ROOT=$OUTPUT_ROOT
# The spec.gmk file contains all variables for the make system.
ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
@ -27622,7 +27625,7 @@ $as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
$as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
# We need to create a couple of temporary files.
VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
$MKDIR -p $VS_ENV_TMP_DIR
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
@ -43136,50 +43139,69 @@ $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
$as_echo_n "checking if fixpath can be created... " >&6; }
FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
# Important to keep the .exe suffix on Cygwin for Hotspot makefiles
FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
FIXPATH="$FIXPATH_BIN -c"
elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
# Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
# @ was chosen as separator to minimize risk of other tools messing around with it
all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" \
| tr ' ' '\n' | grep '^/./' | sort | uniq`
fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
fi
rm -f $OUTPUT_ROOT/fixpath*
cd $OUTPUT_ROOT
$CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
FIXPATH_SRC_W="$FIXPATH_SRC"
FIXPATH_BIN_W="$FIXPATH_BIN"
unix_path="$FIXPATH_SRC_W"
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
windows_path=`$CYGPATH -m "$unix_path"`
FIXPATH_SRC_W="$windows_path"
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
windows_path=`cmd //c echo $unix_path`
FIXPATH_SRC_W="$windows_path"
fi
unix_path="$FIXPATH_BIN_W"
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
windows_path=`$CYGPATH -m "$unix_path"`
FIXPATH_BIN_W="$windows_path"
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
windows_path=`cmd //c echo $unix_path`
FIXPATH_BIN_W="$windows_path"
fi
$RM -rf $FIXPATH_BIN $FIXPATH_DIR
$MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
cd $FIXPATH_DIR
$CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
cd $CURDIR
if test ! -x $OUTPUT_ROOT/fixpath.exe; then
if test ! -x $FIXPATH_BIN; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
cat $OUTPUT_ROOT/fixpath1.log
as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
cat $FIXPATH_DIR/fixpath1.log
as_fn_error $? "Could not create $FIXPATH_BIN" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
$as_echo_n "checking if fixpath.exe works... " >&6; }
cd $OUTPUT_ROOT
$FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
cd $FIXPATH_DIR
$FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
> $FIXPATH_DIR/fixpath2.log 2>&1
cd $CURDIR
if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
if test ! -x $FIXPATH_DIR/fixpath2.exe; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
cat $OUTPUT_ROOT/fixpath2.log
cat $FIXPATH_DIR/fixpath2.log
as_fn_error $? "fixpath did not work!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
fi
@ -51415,13 +51437,6 @@ $as_echo_n "checking whether to use sjavac... " >&6; }
$as_echo "$ENABLE_SJAVAC" >&6; }
if test "x$ENABLE_SJAVAC" = xyes; then
SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
else
SJAVAC_SERVER_DIR=
fi
# Can the C/C++ compiler use precompiled headers?
@ -51849,7 +51864,7 @@ $as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
# We're messing a bit with internal autoconf variables to put the config.status
# in the output directory instead of the current directory.
CONFIG_STATUS="$OUTPUT_ROOT/config.status"
CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
# Create the actual output files. Now the main work of configure is done.
cat >confcache <<\_ACEOF
@ -53017,7 +53032,7 @@ fi
# Try to move the config.log file to the output directory.
if test -e ./config.log; then
$MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
$MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
fi
# Make the compare script executable

7
common/autoconf/spec.gmk.in
View File

@ -59,7 +59,7 @@ SPEC:=@SPEC@
MAKE := @MAKE@
# The default make arguments
MAKE_ARGS = $(MAKE_LOG_FLAGS) -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" LOG_LEVEL=$(LOG_LEVEL)
OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
@ -231,13 +231,14 @@ BUILD_OUTPUT:=@BUILD_OUTPUT@
# Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
SUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/support
BUILDTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/buildtools
MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/makesupport
HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
# This does not get overridden in a bootcycle build
CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
HOTSPOT_DIST=@HOTSPOT_DIST@
@ -259,7 +260,7 @@ MEMORY_SIZE:=@MEMORY_SIZE@
ENABLE_SJAVAC:=@ENABLE_SJAVAC@
# Store sjavac server synchronization files here, and
# the sjavac server log files.
SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@
SJAVAC_SERVER_DIR=$(MAKESUPPORT_OUTPUTDIR)/javacservers
# Number of parallel jobs to use for compilation
JOBS?=@JOBS@

2
common/autoconf/toolchain_windows.m4
View File

@ -270,7 +270,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
# We need to create a couple of temporary files.
VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
$MKDIR -p $VS_ENV_TMP_DIR
# Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).

1
corba/.hgtags
View File

@ -301,3 +301,4 @@ d469c5ad0c763e325a78e0af3016878a57dfc5cc jdk9-b54
ef4afd6832b00b8687832c2a36c90e43750ebe40 jdk9-b56
d8ebf1a5b18ccbc849f5bf0f80aa3d78583eee68 jdk9-b57
86dd5de1f5cb09073019bd629e22cfcd012d8b4b jdk9-b58
cda6ae062f85fac5555f4e1318885b0ecd998bd1 jdk9-b59

4
corba/src/java.corba/share/classes/javax/activity/package.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<!--
Copyright (c) 2004, 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
@ -30,7 +30,7 @@ questions.
<body bgcolor="white">
Contains Activity service related exceptions thrown by the ORB machinery during
unmarshalling.
<p>
@since 1.5
</body>
</html>

4
corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2013, 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
@ -232,6 +232,8 @@ Tie#deactivate}
* and <tt>loader</tt> is non-null, then call <tt>loader.loadClass(className)</tt>.
* <LI>If a class was successfully loaded by step 1, 2, 3, or 4, then
* return the loaded class, else throw <tt>ClassNotFoundException</tt>.
* </UL>
*
* @param className the name of the class.
* @param remoteCodebase a space-separated list of URLs at which
* the class might be found. May be null.

8
corba/src/java.corba/share/classes/org/omg/CORBA/Any.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2004, 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
@ -52,21 +52,21 @@ import org.omg.CORBA.portable.IDLEntity;
* </OL>
*
* <P>
* <a name="anyOps"</a>
* <a name="anyOps"></a>
* A large part of the <code>Any</code> class consists of pairs of methods
* for inserting values into and extracting values from an
* <code>Any</code> object.
* <P>
* For a given primitive type X, these methods are:
* <dl>
* <dt><code><bold> void insert_X(X x)</bold></code>
* <dt><code><b>void insert_X(X x)</b></code>
* <dd> This method allows the insertion of
* an instance <code>x</code> of primitive type <code>X</code>
* into the <code>value</code> field of the <code>Any</code> object.
* Note that the method
* <code>insert_X</code> also resets the <code>Any</code> object's
* <code>type</code> field if necessary.
* <dt> <code><bold>X extract_X()</bold></code>
* <dt> <code><b>X extract_X()</b></code>
* <dd> This method allows the extraction of an instance of
* type <code>X</code> from the <code>Any</code> object.
* <BR>

6
corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -40,10 +40,10 @@ package org.omg.CORBA;
* <P>
* The class also contains two methods:
* <UL>
* <LI><code>public int <bold>value</bold>()</code> -- which accesses the
* <LI><code>public int <b>value</b>()</code> -- which accesses the
* <code>value</code> field of a <code>CompletionStatus</code> object
* <LI><code>public static CompletionStatus
* <bold>from_int</bold>(int i)</code> --
* <b>from_int</b>(int i)</code> --
* for creating an instance from one of the <code>int</code> members
* </UL>
* @see org.omg.CORBA.SystemException

66
corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 1999, 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
@ -35,7 +35,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
{
/** Reads an IDL <code>Any</code> value from the input stream.
* @return the <code>Any</code> read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -43,7 +43,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL boolean value from the input stream.
* @return the boolean read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -51,7 +51,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL character value from the input stream.
* @return the character read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -59,7 +59,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL wide character value from the input stream.
* @return the wide character read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -67,7 +67,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL octet value from the input stream.
* @return the octet value read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -75,7 +75,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL short from the input stream.
* @return the short read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -83,7 +83,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL unsigned short from the input stream.
* @return the unsigned short read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -91,7 +91,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL long from the input stream.
* @return the long read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -99,7 +99,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL unsigned long from the input stream.
* @return the unsigned long read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -107,7 +107,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL long long from the input stream.
* @return the long long read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -115,7 +115,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an unsigned IDL long long from the input stream.
* @return the unsigned long long read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -123,7 +123,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL float from the input stream.
* @return the float read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -131,7 +131,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL double from the input stream.
* @return the double read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -140,7 +140,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL string from the input stream.
* @return the string read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -148,7 +148,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL wide string from the input stream.
* @return the wide string read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -156,7 +156,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL CORBA::Object from the input stream.
* @return the CORBA::Object read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -164,7 +164,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL Abstract interface from the input stream.
* @return the Abstract interface read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -172,7 +172,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL value type from the input stream.
* @return the value type read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -180,7 +180,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
/** Reads an IDL typecode from the input stream.
* @return the typecode read.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -192,7 +192,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -204,7 +204,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -216,7 +216,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -228,7 +228,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -240,7 +240,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -252,7 +252,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -264,7 +264,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -276,7 +276,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -288,7 +288,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -300,7 +300,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -312,7 +312,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -324,7 +324,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/
@ -336,7 +336,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
* @param offset The index into seq of the first element to read from the
* input stream.
* @param length The number of elements to read from the input stream.
* @throws <code>org.omg.CORBA.MARSHAL</code>
* @throws org.omg.CORBA.MARSHAL
* If an inconsistency is detected, including not having registered
* a streaming policy, then the standard system exception MARSHAL is raised.
*/

61
corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2001, 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
@ -71,7 +71,7 @@ public class LocalObject implements org.omg.CORBA.Object
* to attempt determination of whether two distinct object references
* refer to the same object, since such determination could be impractically
* expensive.
* <P>Default implementation of the org.omg.CORBA.Object method. <P>
* <P>Default implementation of the org.omg.CORBA.Object method.
*
* @param that the object reference with which to check for equivalence
* @return <code>true</code> if this object reference is known to be
@ -87,7 +87,7 @@ public class LocalObject implements org.omg.CORBA.Object
/**
* Always returns <code>false</code>.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @return <code>false</code>
*/
@ -99,9 +99,10 @@ public class LocalObject implements org.omg.CORBA.Object
* Returns a hash value that is consistent for the
* lifetime of the object, using the given number as the maximum.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param maximum an <code>int</code> identifying maximum value of
* the hashcode
* the hashcode
* @return this instance's hashcode
*/
public int _hash(int maximum) {
@ -113,7 +114,7 @@ public class LocalObject implements org.omg.CORBA.Object
* the message "This is a locally constrained object." This method
* does not apply to local objects and is therefore not implemented.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param repository_id a <code>String</code>
* @return NO_IMPLEMENT because this is a locally constrained object
@ -131,7 +132,8 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @return a duplicate of this <code>LocalObject</code> instance.
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@ -145,7 +147,8 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
@ -158,7 +161,7 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param operation a <code>String</code> giving the name of an operation
* to be performed by the request that is returned
@ -175,7 +178,7 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param ctx a <code>Context</code> object containing
* a list of properties
@ -202,7 +205,7 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param ctx a <code>Context</code> object containing
* a list of properties
@ -237,7 +240,8 @@ public class LocalObject implements org.omg.CORBA.Object
* the message "This is a locally constrained object." This method
* does not apply to local objects and is therefore not implemented.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @return NO_IMPLEMENT because this is a locally constrained object
* and this method does not apply to local objects
* @exception NO_IMPLEMENT because this is a locally constrained object
@ -254,7 +258,8 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
@ -275,7 +280,7 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
* @return the ORB instance that created the Delegate contained in this
* <code>ObjectImpl</code>
* @exception NO_IMPLEMENT
@ -291,7 +296,8 @@ public class LocalObject implements org.omg.CORBA.Object
* the message "This is a locally constrained object." This method
* does not apply to local objects and is therefore not implemented.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param policy_type an <code>int</code>
* @return NO_IMPLEMENT because this is a locally constrained object
* and this method does not apply to local objects
@ -310,7 +316,8 @@ public class LocalObject implements org.omg.CORBA.Object
* the message "This is a locally constrained object." This method
* does not apply to local objects and is therefore not implemented.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
@ -347,7 +354,8 @@ public class LocalObject implements org.omg.CORBA.Object
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* Returns <code>true</code> for this <code>LocalObject</code> instance.<P>
* Returns <code>true</code> for this <code>LocalObject</code> instance.
*
* @return <code>true</code> always
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@ -361,7 +369,8 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param operation a <code>String</code> indicating which operation
* to preinvoke
* @param expectedType the class of the type of operation mentioned above
@ -381,7 +390,8 @@ public class LocalObject implements org.omg.CORBA.Object
* Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
* the message "This is a locally constrained object."
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @param servant the servant object on which to post-invoke
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@ -403,8 +413,8 @@ public class LocalObject implements org.omg.CORBA.Object
* <code>org.omg.CORBA.Object</code> method.
* <P>Called by a stub to obtain an OutputStream for
* marshaling arguments. The stub must supply the operation name,
* and indicate if a response is expected (i.e is this a oneway
* call).<P>
* and indicate if a response is expected (i.e is this a oneway call).
*
* @param operation the name of the operation being requested
* @param responseExpected <code>true</code> if a response is expected,
* <code>false</code> if it is a one-way call
@ -433,7 +443,8 @@ public class LocalObject implements org.omg.CORBA.Object
* marshaled reply. If an exception occurs, <code>_invoke</code> may throw an
* <code>ApplicationException</code> object which contains an
* <code>InputStream</code> from
* which the user exception state may be unmarshaled.<P>
* which the user exception state may be unmarshaled.
*
* @param output the <code>OutputStream</code> to invoke
* @return NO_IMPLEMENT because this is a locally constrained object
* and this method does not apply to local objects
@ -470,7 +481,8 @@ public class LocalObject implements org.omg.CORBA.Object
* <code>ApplicationException.getInputStream()</code>.
* A null
* value may also be passed to <code>_releaseReply</code>, in which case the
* method is a no-op.<P>
* method is a no-op.
*
* @param input the reply stream back to the ORB or null
* @exception NO_IMPLEMENT
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@ -485,7 +497,8 @@ public class LocalObject implements org.omg.CORBA.Object
* the message "This is a locally constrained object." This method
* does not apply to local objects and is therefore not implemented.
* This method is the default implementation of the
* <code>org.omg.CORBA.Object</code> method.<P>
* <code>org.omg.CORBA.Object</code> method.
*
* @return NO_IMPLEMENT because this is a locally constrained object
* and this method does not apply to local objects
* @exception NO_IMPLEMENT because this is a locally constrained object

3
corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -63,7 +63,6 @@ package org.omg.CORBA;
* Note also that you can add any number of
* <code>NamedValue</code> objects to this list regardless of
* its original length.
* <P>
* <LI><code>org.omg.CORBA.ORB.create_operation_list</code>
* <PRE>
* org.omg.CORBA.NVList nv = orb.create_operation_list(myOperationDef);

22
corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 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
@ -101,7 +101,7 @@ import sun.reflect.misc.ReflectUtil;
* <P>
* When an ORB instance is being created, the class name of the ORB
* implementation is located using
* the following standard search order:<P>
* the following standard search order:
*
* <OL>
* <LI>check in Applet parameter or application string array, if any
@ -1036,7 +1036,7 @@ abstract public class ORB {
* <P>
* Recursive types can only appear within sequences which can be empty.
* That way marshaling problems, when transmitting the struct in an Any, are avoided.
* <P>
*
* @param id the logical id of the referenced type
* @return the requested TypeCode
*/
@ -1179,7 +1179,7 @@ abstract public class ORB {
* value <tt>true</tt>. If no information for the requested
* services type is available, the operation returns <tt>false</tt>
* (i.e., the service is not supported by this ORB).
* <P>
*
* @param service_type a <code>short</code> indicating the
* service type for which information is being requested
* @param service_info a <code>ServiceInformationHolder</code> object
@ -1203,7 +1203,7 @@ abstract public class ORB {
/**
* Creates a new <code>DynAny</code> object from the given
* <code>Any</code> object.
* <P>
*
* @param value the <code>Any</code> object from which to create a new
* <code>DynAny</code> object
* @return the new <code>DynAny</code> object created from the given
@ -1221,7 +1221,7 @@ abstract public class ORB {
/**
* Creates a basic <code>DynAny</code> object from the given
* <code>TypeCode</code> object.
* <P>
*
* @param type the <code>TypeCode</code> object from which to create a new
* <code>DynAny</code> object
* @return the new <code>DynAny</code> object created from the given
@ -1241,7 +1241,7 @@ abstract public class ORB {
/**
* Creates a new <code>DynStruct</code> object from the given
* <code>TypeCode</code> object.
* <P>
*
* @param type the <code>TypeCode</code> object from which to create a new
* <code>DynStruct</code> object
* @return the new <code>DynStruct</code> object created from the given
@ -1261,7 +1261,7 @@ abstract public class ORB {
/**
* Creates a new <code>DynSequence</code> object from the given
* <code>TypeCode</code> object.
* <P>
*
* @param type the <code>TypeCode</code> object from which to create a new
* <code>DynSequence</code> object
* @return the new <code>DynSequence</code> object created from the given
@ -1282,7 +1282,7 @@ abstract public class ORB {
/**
* Creates a new <code>DynArray</code> object from the given
* <code>TypeCode</code> object.
* <P>
*
* @param type the <code>TypeCode</code> object from which to create a new
* <code>DynArray</code> object
* @return the new <code>DynArray</code> object created from the given
@ -1302,7 +1302,7 @@ abstract public class ORB {
/**
* Creates a new <code>DynUnion</code> object from the given
* <code>TypeCode</code> object.
* <P>
*
* @param type the <code>TypeCode</code> object from which to create a new
* <code>DynUnion</code> object
* @return the new <code>DynUnion</code> object created from the given
@ -1322,7 +1322,7 @@ abstract public class ORB {
/**
* Creates a new <code>DynEnum</code> object from the given
* <code>TypeCode</code> object.
* <P>
*
* @param type the <code>TypeCode</code> object from which to create a new
* <code>DynEnum</code> object
* @return the new <code>DynEnum</code> object created from the given

4
corba/src/java.corba/share/classes/org/omg/CORBA/Object.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 1999, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 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
@ -53,7 +53,7 @@ package org.omg.CORBA;
* <code>org.omg.CORBA.Object</code>
* are provided in the class <code>org.omg.CORBA.portable.ObjectImpl</code>,
* which is the base class for stubs and object implementations.
* <p>
*
* @see org.omg.CORBA.portable.ObjectImpl
*/

4
corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2004, 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
@ -31,7 +31,7 @@ package org.omg.CORBA;
* the client, for access control
* and other purposes. It contains a single attribute, the name of the
* <code>Principal</code>, encoded as a sequence of bytes.
* <P>
*
* @deprecated Deprecated by CORBA 2.2.
*/
@Deprecated

4
corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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,7 +57,7 @@ package org.omg.CORBA;
* Similarly, type information needs to be provided for the response,
* for either the expected result or for an exception, so the methods
* <code>result</code> and <code>except</code> take an <code>Any</code>
* object as a parameter. <p>
* object as a parameter.
*
* @see org.omg.CORBA.DynamicImplementation
* @see org.omg.CORBA.NVList

6
corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2001, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 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,8 +32,8 @@ import org.omg.CORBA.portable.OutputStream;
/**
* The Holder for <tt>Short</tt>. For more information on
* Holder files, see <a href="doc-files/generatedfiles.html#holder">
* "Generated Files: Holder Files"</a>.<P
* A Holder class for a <code>short</code>
* "Generated Files: Holder Files"</a>.
* <P>A Holder class for a <code>short</code>
* that is used to store "out" and "inout" parameters in IDL operations.
* If an IDL operation signature has an IDL <code>short</code> as an "out"
* or "inout" parameter, the programmer must pass an instance of

4
corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java
View File

@ -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.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -52,7 +52,7 @@ package org.omg.CORBA;
* The variable <code>k</code> represents the <code>TCKind</code>
* instance for the IDL type <code>string</code>, which is
* <code>tk_string</code>.
* <P>
*
* <LI>the method <code>value</code> for accessing the
* <code>_value</code> field of a <code>TCKind</code> constant
* <P>Example:

101
corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,7 @@ import org.omg.CORBA.portable.IDLEntity;
/**
* A container for information about a specific CORBA data
* type.
*<P>
* <P>
* <code>TypeCode</code> objects are used:
* <UL>
* <LI>in the Dynamic Invocation Interface -- to indicate the types
@ -59,7 +59,7 @@ import org.omg.CORBA.portable.IDLEntity;
* with the value
* <code>TCKind.tk_sequence</code> and also fields with the values
* <code>boolean</code> and <code>10</code> for the
* type of sequence elements and the length of the sequence. <p>
* type of sequence elements and the length of the sequence.
* </UL>
*
* <code>TypeCode</code> objects can be obtained in various ways:
@ -164,8 +164,7 @@ import org.omg.CORBA.portable.IDLEntity;
*
* Java IDL extends the CORBA specification to allow all operations permitted
* on a <code>struct</code> <code>TypeCode</code> to be permitted
* on an <code>exception</code> <code>TypeCode</code> as well. <p>
*
* on an <code>exception</code> <code>TypeCode</code> as well.
*/
public abstract class TypeCode implements IDLEntity {
@ -175,23 +174,21 @@ public abstract class TypeCode implements IDLEntity {
* they are interchangeable and give identical results when
* <code>TypeCode</code> operations are applied to them.
*
* @param tc the <code>TypeCode</code> object to compare against
* @return <code>true</code> if the type codes are equal;
* @param tc the <code>TypeCode</code> object to compare against
* @return <code>true</code> if the type codes are equal;
* <code>false</code> otherwise
*/
public abstract boolean equal(TypeCode tc);
/**
* Tests to see if the given <code>TypeCode</code> object is
* equivalent to this <code>TypeCode</code> object.
* <P>
*
*
* @param tc the typecode to compare with this typecode
*
* @return <code>true</code> if the given typecode is equivalent to
* this typecode; <code>false</code> otherwise
* Tests to see if the given <code>TypeCode</code> object is
* equivalent to this <code>TypeCode</code> object.
*
*
* @param tc the typecode to compare with this typecode
*
* @return <code>true</code> if the given typecode is equivalent to
* this typecode; <code>false</code> otherwise
*
*/
public abstract boolean equivalent(TypeCode tc);
@ -199,9 +196,9 @@ public abstract class TypeCode implements IDLEntity {
/**
* Strips out all optional name and member name fields,
* but leaves all alias typecodes intact.
* @return a <code>TypeCode</code> object with optional name and
* member name fields stripped out, except for alias typecodes,
* which are left intact
* @return a <code>TypeCode</code> object with optional name and
* member name fields stripped out, except for alias typecodes,
* which are left intact
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
*/
@ -220,7 +217,6 @@ public abstract class TypeCode implements IDLEntity {
* value of the <code>kind</code> field of this
* <code>TypeCode</code> object
*/
public abstract TCKind kind();
/**
@ -239,13 +235,12 @@ public abstract class TypeCode implements IDLEntity {
* also always have a RepositoryId. If there is no RepositoryId, the
* method can return an empty string.
*
* @return the RepositoryId for this <code>TypeCode</code> object
* or an empty string if there is no RepositoryID
* @return the RepositoryId for this <code>TypeCode</code> object
* or an empty string if there is no RepositoryID
* @throws org.omg.CORBA.TypeCodePackage.BadKind if the method
* is invoked on an inappropriate kind of<code>TypeCode</code>
* object
*/
public abstract String id() throws BadKind;
/**
@ -268,7 +263,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on an inappropriate kind of<code>TypeCode</code>
* object
*/
public abstract String name() throws BadKind;
/**
@ -287,7 +281,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
*/
public abstract int member_count() throws BadKind;
/**
@ -312,7 +305,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
*/
public abstract String member_name(int index)
throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
@ -336,7 +328,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
*/
public abstract TypeCode member_type(int index)
throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
@ -344,13 +335,13 @@ public abstract class TypeCode implements IDLEntity {
* Retrieves the label of the union member
* identified by the given index. For the default member,
* the label is the zero octet.
*<P>
* <P>
* The method <code>member_label</code> can only be invoked on union
* <code>TypeCode</code> objects.
*
* @param index index of the union member for which the
* @param index index of the union member for which the
* label is being requested
* @return an <code>Any</code> object describing the label of
* @return an <code>Any</code> object describing the label of
* the requested union member or the zero octet for
* the default member
* @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is
@ -360,7 +351,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on a non-union <code>TypeCode</code>
* object
*/
public abstract Any member_label(int index)
throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
@ -376,7 +366,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on a non-union <code>TypeCode</code>
* object
*/
public abstract TypeCode discriminator_type()
throws BadKind;
@ -393,7 +382,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on a non-union <code>TypeCode</code>
* object
*/
public abstract int default_index() throws BadKind;
/**
@ -412,7 +400,6 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
*/
public abstract int length() throws BadKind;
/**
@ -424,7 +411,7 @@ public abstract class TypeCode implements IDLEntity {
* that multidimensional arrays are represented by nesting
* <code>TypeCode</code> objects, one per dimension.
* For boxed valuetypes, it returns the boxed type.
*<P>
* <P>
* The method <code>content_type</code> can be invoked on sequence, array,
* alias, and boxed valuetype <code>TypeCode</code> objects.
*
@ -436,37 +423,36 @@ public abstract class TypeCode implements IDLEntity {
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
*/
public abstract TypeCode content_type() throws BadKind;
/**
* Returns the number of digits in the fixed type described by this
* <code>TypeCode</code> object. For example, the typecode for
* the number 3000.275d could be <code>fixed<7,3></code>, where
* 7 is the precision and 3 is the scale.
*
* @return the total number of digits
* Returns the number of digits in the fixed type described by this
* <code>TypeCode</code> object. For example, the typecode for
* the number 3000.275d could be <code>fixed&lt;7,3&gt;</code>, where
* 7 is the precision and 3 is the scale.
*
* @return the total number of digits
* @throws org.omg.CORBA.TypeCodePackage.BadKind if this method
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
*
*
*/
public abstract short fixed_digits() throws BadKind ;
/**
* Returns the scale of the fixed type described by this
* <code>TypeCode</code> object. A positive number indicates the
* number of digits to the right of the decimal point.
* For example, the number 3000d could have the
* typecode <code>fixed<4,0></code>, where the first number is
* the precision and the second number is the scale.
* A negative number is also possible and adds zeroes to the
* left of the decimal point. In this case, <code>fixed<1,-3></code>,
* could be the typecode for the number 3000d.
*
* @return the scale of the fixed type that this
* <code>TypeCode</code> object describes
* Returns the scale of the fixed type described by this
* <code>TypeCode</code> object. A positive number indicates the
* number of digits to the right of the decimal point.
* For example, the number 3000d could have the
* typecode <code>fixed&lt;4,0&gt;</code>, where the first number is
* the precision and the second number is the scale.
* A negative number is also possible and adds zeroes to the
* left of the decimal point. In this case, <code>fixed&lt;1,-3&gt;</code>,
* could be the typecode for the number 3000d.
*
* @return the scale of the fixed type that this
* <code>TypeCode</code> object describes
* @throws org.omg.CORBA.TypeCodePackage.BadKind if this method
* is invoked on an inappropriate kind of <code>TypeCode</code>
* object
@ -492,7 +478,6 @@ public abstract class TypeCode implements IDLEntity {
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
*/
abstract public short member_visibility(int index)
throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds ;
@ -512,7 +497,6 @@ public abstract class TypeCode implements IDLEntity {
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
*/
abstract public short type_modifier() throws BadKind ;
/**
@ -528,6 +512,5 @@ public abstract class TypeCode implements IDLEntity {
* @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
* comments for unimplemented features</a>
*/
abstract public TypeCode concrete_base_type() throws BadKind ;
}

128
corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html
View File

@ -55,44 +55,30 @@ file.</li>
<li>
CORBA 2.3.1 chapter 4 with the following replacements from the Portable
Interceptors specification:</li>
<ul>
<li>
section 4.2.3.5 <TT>destroy</TT></li>
<li>
section 4.5.2 <TT>CodeFactory</TT> and <TT>PICurrent</TT> are required</li>
<li>
Section 4.5.3.4 as updated for <TT>register_initial_reference</TT></li>
</ul>
Interceptors specification:
<ul>
<li>section 4.2.3.5 <TT>destroy</TT></li>
<li>section 4.5.2 <TT>CodeFactory</TT> and <TT>PICurrent</TT> are required</li>
<li>Section 4.5.3.4 as updated for <TT>register_initial_reference</TT></li>
</ul>
</li>
<li>
CORBA 2.3.1 chapter 5 with the following update from the Portable Interceptors
specification:</li>
<ul>
<li>
5.5.2 <TT>StringSeq</TT> and <TT>WStringSeq</TT> are required. This adds the
following
classes
to <TT>org.omg.CORBA</TT>:</li>
<ul>
<li>
<TT>StringSeqHolder</TT></li>
<li>
<TT>StringSeqHelper</TT></li>
<li>
<TT>WStringSeqHolder</TT></li>
<li>
<TT>WStringSeqHelper</TT></li>
</ul>
</ul>
specification:
<ul>
<li>
5.5.2 <TT>StringSeq</TT> and <TT>WStringSeq</TT> are required.
This adds the following classes to <TT>org.omg.CORBA</TT>:
<ul>
<li><TT>StringSeqHolder</TT></li>
<li><TT>StringSeqHelper</TT></li>
<li><TT>WStringSeqHolder</TT></li>
<li><TT>WStringSeqHelper</TT></li>
</ul>
</li>
</ul>
</li>
<li>
CORBA 2.3.1 sections 10.6.1 and 10.6.2 are supported for repository IDs.</li>
@ -101,18 +87,13 @@ CORBA 2.3.1 sections 10.6.1 and 10.6.2 are supported for repository IDs.</li>
CORBA 2.3.1 section 10.7 for <TT>TypeCode</TT> APIs.</li>
<li>
CORBA 2.3.1 chapter 11, Portable Object Adapter (POA), with the following updates from the Portable Interceptors specification:</li>
<ul>
<li>
Section 11.3.7 POAs must preserve all policies</li>
<li>
Section 11.3.8.2 again states that POAs must preserve all policies</li>
<li>
Section 11.3.8.26 <tt>POA::id</tt> is required.</li>
</ul>
CORBA 2.3.1 chapter 11, Portable Object Adapter (POA), with the following updates from the Portable Interceptors specification:
<ul>
<li>Section 11.3.7 POAs must preserve all policies</li>
<li>Section 11.3.8.2 again states that POAs must preserve all policies</li>
<li>Section 11.3.8.26 <tt>POA::id</tt> is required.</li>
</ul>
</li>
<li>
CORBA 2.3.1 chapters 13 and 15 define GIOP 1.0, 1.1, and 1.2. The Java SE 6
@ -124,8 +105,7 @@ All of the Interoperable Naming Service is supported.</li>
<li>
Portable Interceptors section 13.8 (the new <TT>Coder</TT>/<TT>Decoder</TT> interfaces)
and
all of chapter 21 (the interceptor specification).</li>
and all of chapter 21 (the interceptor specification).</li>
<li>Section 1.21.8 of the Revised IDL to Java Language Mapping Specification (ptc/00-11-03)
has been changed from the version in the IDL to Java Language Mapping Specification (ptc/00-01-08).</li>
@ -135,40 +115,24 @@ has been changed from the version in the IDL to Java Language Mapping Specifica
Tools</h2>
<ul>
<li>
The IDL to Java compiler (<TT>idlj</TT>) complies with:</li>
<li>The IDL to Java compiler (<TT>idlj</TT>) complies with:
<ul>
<li>CORBA 2.3.1 chapter 3 (IDL definition)</li>
<li>CORBA 2.3.1 chapters 5 and 6 (semantics of Value types)</li>
<li>CORBA 2.3.1 section 10.6.5 (pragmas)</li>
<li>The IDL to Java mapping specification</li>
<li>The Revised IDL to Java language mapping specification section 1.12.1 "local interfaces"</li>
</ul>
</li>
<ul>
<li>
CORBA 2.3.1 chapter 3 (IDL definition)</li>
<li>
CORBA 2.3.1 chapters 5 and 6 (semantics of Value types)</li>
<li>
CORBA 2.3.1 section 10.6.5 (pragmas)</li>
<li>
The IDL to Java mapping specification</li>
<li>
The Revised IDL to Java language mapping specification section 1.12.1 "local interfaces"</li>
</ul>
<li>
The Java to IDL compiler (the IIOP backend for <tt>rmic</tt>) complies with:</li>
<ul>
<li>
CORBA 2.3.1 chapters 5 and 6 (value types)</li>
<li>
The Java to IDL language mapping. Note that this implicitly references
section 1.21 of the IDL to Java language mapping</li>
<li>
IDL generated by the <tt>-idl</tt> flag complies with CORBA 2.3.1 chapter 3.</li>
</ul>
<li>The Java to IDL compiler (the IIOP backend for <tt>rmic</tt>) complies with:
<ul>
<li>CORBA 2.3.1 chapters 5 and 6 (value types)</li>
<li>The Java to IDL language mapping. Note that this implicitly references
section 1.21 of the IDL to Java language mapping</li>
<li>IDL generated by the <tt>-idl</tt> flag complies with CORBA 2.3.1 chapter 3.</li>
</ul>
</li>
</ul>
</body>

118
corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html
View File

@ -8,65 +8,101 @@
<H1>IDL-to-Java Generated Files</H1>
<P>The files that are generated by the IDL-to-Java compiler, in accordance with the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>, which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 according the <a href="compliance.html">compliance</a> document.
<P>The files that are generated by the IDL-to-Java compiler, in accordance with
the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>,
which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6
according the <a href="compliance.html">compliance</a> document.
<P>In general IDL names and identifiers are mapped to Java names and identifiers with no change. Because of the nature of the Java language, a single IDL construct may be mapped to several (differently named) Java constructs. The additional names are constructed by appending a descriptive suffix. For example, the IDL interface <tt>foo</tt> is mapped to the Java interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>, and optionally <tt>fooPOATie</tt>.
<P>In general IDL names and identifiers are mapped to Java names
and identifiers with no change. Because of the nature of the Java language,
a single IDL construct may be mapped to several (differently named) Java constructs.
The additional names are constructed by appending a descriptive suffix.
For example, the IDL interface <tt>foo</tt> is mapped to the Java
interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional
Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>,
and optionally <tt>fooPOATie</tt>.
<P>The mapping in effect reserves the use of several names for its own purposes. These are:
<P>
<P>The mapping in effect reserves the use of several names for its own purposes. These are:
<UL>
<LI>The Java class <tt><a href="#helper">&lt;type&gt;Helper</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type.
<LI>The Java class <tt><a href="#holder">&lt;type&gt;Holder</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type (with certain exceptions such as <tt>typedef</tt> aliases).
<LI>The Java classes <tt>&lt;basicJavaType&gt;Holder</tt>, where <tt>&lt;basicJavaType&gt;</tt> is one of the Java primitive datatypes that is used by one of the IDL basic datatypes.
<LI>The Java classes <tt><a href="#operations">&lt;interface&gt;Operations</tt></a>, <tt>&lt;interface&gt;POA</tt>, and <tt>&lt;interface&gt;POATie</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface type.
<LI>The nested scope Java package name <tt>&lt;interface&gt;Package</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface.
<LI>The Java class <a href="#helper"><tt>&lt;type&gt;Helper</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type.
<LI>The Java class <a href="#holder"><tt>&lt;type&gt;Holder</tt></a>, where <tt>&lt;type&gt;</tt>
is the name of an IDL defined type (with certain exceptions such as <tt>typedef</tt> aliases).
<LI>The Java classes <tt>&lt;basicJavaType&gt;Holder</tt>, where <tt>&lt;basicJavaType&gt;</tt>
is one of the Java primitive datatypes that is used by one of the IDL basic datatypes.
<LI>The Java classes <a href="#operations"><tt>&lt;interface&gt;Operations</tt></a>, <tt>&lt;interface&gt;POA</tt>,
and <tt>&lt;interface&gt;POATie</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface type.
<LI>The nested scope Java package name <tt>&lt;interface&gt;Package</tt>, where <tt>&lt;interface&gt;</tt>
is the name of an IDL interface.
</UL>
<a name="helper">
<H2>Helper Files</H2></a>
<P>
Helper files supply several static methods needed to manipulate the type. These include <tt>Any</tt> insert and extract operations for the type, getting the repository id, getting the typecode, and reading and writing the type from and to a stream.
<H2><a name="helper">Helper Files</a></H2>
<P>The helper class for a mapped IDL interface or abstract interface also include narrow operation(s). The static narrow method allows an <tt>org.omg.CORBA.Object</tt> to be narrowed to the object reference of a more specific type. The IDL exception <tt>CORBA::BAD_PARAM</tt> is thrown if the narrow fails because the object reference does not support the requested type. A different system exception is raised to indicate other kinds of errors. Trying to narrow a null will always succeed with a return value of null.
<P>Helper files supply several static methods needed to manipulate the type.
These include <tt>Any</tt> insert and extract operations for the type,
getting the repository id, getting the typecode, and reading
and writing the type from and to a stream.
<P>The helper class for a mapped IDL interface or abstract interface also
include narrow operation(s). The static narrow method allows an <tt>org.omg.CORBA.Object</tt>
to be narrowed to the object reference of a more specific type.
The IDL exception <tt>CORBA::BAD_PARAM</tt> is thrown if the narrow fails because
the object reference does not support the requested type. A different system exception
is raised to indicate other kinds of errors. Trying to narrow a null will always succeed with a return value of null.
<H2><a name="holder">Holder Files</a></H2>
<P>Support for out and inout parameter passing modes requires the use of additional holder classes.
These classes are available for all of the basic IDL datatypes in the <tt>org.omg.CORBA</tt> package
and are generated for all named user defined IDL types except those defined by typedefs.
(Note that in this context user defined includes types that are defined in OMG specifications
such as those for the Interface Repository, and other OMG services.)
<P>Each holder class has a constructor from an instance, a default constructor, and has
a public instance member, <tt>value</tt> which is the typed value. The default constructor
sets the value field to the default value for the type as defined by the Java language:
false for boolean, 0 for numeric and char types, null for strings, null for object references.
<P>To support portable stubs and skeletons, holder classes also implement
the <tt>org.omg.CORBA.portable.Streamable</tt> interface.
<H2><a name="operations">Operations Files</a></H2>
<P>
<P>A non abstract IDL interface is mapped to two public Java interfaces:
a <em>signature</em> interface and an <em>operations</em> interface.
The signature interface, which extends <tt>IDLEntity</tt>, has the same
name as the IDL interface name and is used as the signature type in method declarations
when interfaces of the specified type are used in other interfaces.
The operations interface has the same name as the IDL interface with the suffix <tt>Operations</tt>
appended to the end and is used in the server-side mapping and as a mechanism
for providing optimized calls for collocated client and servers.
<P>The Java operations interface contains the mapped operation signatures.
The Java signature interface extends the operations interface,
the (mapped) base <tt>org.omg.CORBA.Object</tt>, as well as <tt>org.omg.portable.IDLEntity</tt>.
Methods can be invoked on the signature interface. Interface inheritance
expressed in IDL is reflected in both the Java signature interface and operations interface hierarchies.
<a name="holder">
<H2>Holder Files</H2></a>
<P>
Support for out and inout parameter passing modes requires the use of additional holder classes. These classes are available for all of the basic IDL datatypes in the <tt>org.omg.CORBA</tt> package and are generated for all named user defined IDL types except those defined by typedefs. (Note that in this context user defined includes types that are defined in OMG specifications such as those for the Interface Repository, and other OMG services.)
<H2><a name="stub">Stubs</a></H2>
<P>Each holder class has a constructor from an instance, a default constructor, and has a public instance member, <tt>value</tt> which is the typed value. The default constructor sets the value field to the default value for the type as defined by the Java language: false for boolean, 0 for numeric and char types, null for strings, null for object references.
<P>To support portable stubs and skeletons, holder classes also implement the <tt>org.omg.CORBA.portable.Streamable</tt> interface.
<a name="operations">
<H2>Operations Files</H2></a>
<P>
A non abstract IDL interface is mapped to two public Java interfaces: a <em>signature</em> interface and an <em>operations</em> interface. The signature interface, which extends <tt>IDLEntity</tt>, has the same name as the IDL interface name and is used as the signature type in method declarations when interfaces of the specified type are used in other interfaces. The operations interface has the same name as the IDL interface with the suffix <tt>Operations</tt> appended to the end and is used in the server-side mapping and as a mechanism for providing optimized calls for collocated client and servers.
<P>The Java operations interface contains the mapped operation signatures. The Java signature interface extends the operations interface, the (mapped) base <tt>org.omg.CORBA.Object</tt>, as well as <tt>org.omg.portable.IDLEntity</tt>. Methods can be invoked on the signature interface. Interface inheritance expressed in IDL is reflected in both the Java signature interface and operations interface hierarchies.
<a name="stub">
<H2>Stubs</H2></a>
<P>For the mapping of a non-object-oriented language, there will be a programming interface to the stubs for each interface type. Generally, the stubs will present access to the OMG IDL-defined operations on an object in a way that is easy for programmers to predict once they are familiar with OMG IDL and the language mapping for the particular programming language. The stubs make calls on the rest of the ORB using interfaces that are private to, and presumably optimized for, the particular ORB Core. If more than one ORB is available, there may be different stubs corresponding to the different ORBs. In this case, it is necessary for the ORB and language mapping to cooperate to associate the correct stubs with the particular object reference.
<P>For the mapping of a non-object-oriented language, there will be
a programming interface to the stubs for each interface type. Generally, the stubs
will present access to the OMG IDL-defined operations on an object in a way that is easy
for programmers to predict once they are familiar with OMG IDL and the language mapping
for the particular programming language. The stubs make calls on the rest of the ORB
using interfaces that are private to, and presumably optimized for, the particular ORB Core.
If more than one ORB is available, there may be different stubs corresponding to the different ORBs.
In this case, it is necessary for the ORB and language mapping to cooperate to associate
the correct stubs with the particular object reference.
<P>Object-oriented programming languages, such as Java, C++, and Smalltalk, do not require stub interfaces.
<P><P><BR><BR>
<BR><BR>
</body>
</html>

54
corba/src/java.corba/share/classes/org/omg/CORBA/package.html
View File

@ -6,7 +6,7 @@
<TITLE>package</TITLE>
<!--
/*
* Copyright (c) 1998, 2006, 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
@ -73,7 +73,6 @@ a holder class.
<TT>ORB</TT> Methods</H3>
<P>Before an application can enter the CORBA environment, it must first:
<P>
<UL>
<LI>Be initialized into the ORB and possibly the object adapter (POA) environments.
<LI>Get references to ORB object (for use in future ORB operations)
@ -81,7 +80,6 @@ and perhaps other objects (including the root POA or some Object Adapter objects
</UL>
<P>The following operations are provided to initialize applications and obtain
the appropriate object references:
<P>
<UL>
<LI>Operations providing access to the ORB, which are discussed in this
section.
@ -107,13 +105,13 @@ identifier for the ORB for which the object reference is required,
that provide access to the ORB:
<UL>
<LI>
<TT><bold>init</bold>()</TT>
<TT><b>init</b>()</TT>
<LI>
<TT><bold>init</bold>(String [] args, Properties props)</TT>
<TT><b>init</b>(String [] args, Properties props)</TT>
<LI>
<TT><bold>init</bold>(Applet app, Properties props)</TT>
<TT><b>init</b>(Applet app, Properties props)</TT>
</UL>
<P>Using the <tt>init()</tt> method without parameters initiates
@ -142,11 +140,11 @@ the ORB object interface, providing facilities to list and
resolve initial object references. These are:
<UL>
<LI>
<TT><bold>resolve_initial_references</bold>(String name)</TT>
<TT><b>resolve_initial_references</b>(String name)</TT>
<LI>
<TT><bold>list_initial_services</bold>()</TT>
<TT><b>list_initial_services</b>()</TT>
<LI>
<TT><bold>register_initial_reference</bold>(String id,
<TT><b>register_initial_reference</b>(String id,
org.omg.CORBA.Object obj)</TT>
</UL>
@ -278,7 +276,6 @@ that can be modified. To support portable stubs and skeletons, holder classes
<P>Each holder class has:
<P>
<UL>
<LI>a constructor from an instance
<LI>a default constructor
@ -291,7 +288,6 @@ type's <tt>value</tt> field
<P>The default constructor sets the value field to the default value for the
type as defined by the Java language:
<P>
<UL>
<LI><tt>false</tt> for boolean
<LI><tt>0</tt> for numeric and char types
@ -391,7 +387,6 @@ in the package <TT>org.omg.CORBA</TT> are:
<h2>Helper Classes </h2>
<P>Helper files supply several static methods needed to manipulate the type.
These include:
<P>
<UL>
<LI><tt>Any</tt> insert and extract operations for the type
<LI>getting the repository id
@ -455,14 +450,13 @@ both versions of the <code>narrow</code> method.
<P>The <A HREF="{@docRoot}/../technotes/guides/idl/jidlExample.html"><em>Hello World</em></A>
tutorial uses a <tt>narrow</tt> method that looks
like this:
<P>
<PRE>
// create and initialize the ORB
ORB orb = ORB.init(args, null);
ORB orb = ORB.init(args, null);
// get the root naming context
org.omg.CORBA.Object objRef =
orb.resolve_initial_references("NameService");
orb.resolve_initial_references("NameService");
// Use NamingContextExt instead of NamingContext. This is
// part of latest Inter-Operable naming Service.
NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
@ -554,7 +548,6 @@ abstract public class AccountHelper
}
</PRE>
<P>
<h3>Value Type Helper Classes</h3>
A helper class for a value type includes different renderings of
@ -844,7 +837,7 @@ implementation of an interface repository, the following IR classes and
interfaces have been included for the purpose of creating typecodes (see
create_value_tc, create_struct_tc, create_union_tc and create_exception_tc
methods in interface org.omg.CORBA.ORB):
<BR>&nbs
<BR>&nbsp;
<UL>
<LI>
IRObject
@ -893,20 +886,19 @@ extensions and products.
<P>Some of the API included in <TT>org.omg</TT> subpackages throw
<tt>NO_IMPLEMENT</tt> exceptions for various reasons. Among these reasons
are:
<P>
<UL>
<LI>In some cases, for example <tt>LocalObject</tt>, the complete
implementation according to the specification indicates that
these API should throw <tt>NO_IMPLEMENT</tt>.
<P>
<LI>In most cases, for example methods in <tt>ORB.java</tt>,
methods that throw
<tt>NO_IMPLEMENT</tt> are actually implemented in subclasses
elsewhere in the ORB code.
<P>
<LI>In some cases, for example <tt>_get_interface_def()</tt>
and <tt>_get_interface</tt>, API are really not yet implemented.
</UL>
<UL>
<LI>In some cases, for example <tt>LocalObject</tt>, the complete
implementation according to the specification indicates that
these API should throw <tt>NO_IMPLEMENT</tt>.
<LI>In most cases, for example methods in <tt>ORB.java</tt>,
methods that throw
<tt>NO_IMPLEMENT</tt> are actually implemented in subclasses
elsewhere in the ORB code.
<LI>In some cases, for example <tt>_get_interface_def()</tt>
and <tt>_get_interface</tt>, API are really not yet implemented.
</UL>

4
corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 1999, 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
@ -56,7 +56,7 @@ public interface InvokeHandler {
* <p>5. Marshal reply into OutputStream returned by
* ResponseHandler.
* <p>6. Return OutputStream to ORB.
* <p>
*
* @param method The method name.
* @param input The <code>InputStream</code> containing the marshalled arguments.
* @param handler The <code>ResponseHandler</code> which the servant uses

64
corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<!--
Copyright (c) 1998, 2006, 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
@ -46,57 +46,51 @@ Some methods throw NO_IMPLEMENT() exceptions by default, but ORB vendors
can override them to provide real implementations. The ORB included in
Sun's release of the Java[tm] Platform, Standard Edition 6, includes
implementations for the following methods.
<p>
<h2>List of Unimplemented Features in Package
<code>org.omg.CORBA.portable</code></h2>
<p>
<h3>Unimplemented Interfaces in package <code>org.omg.CORBA.portable</code></h3>
<ul>
<code>
<li>InvokeHandler
<li>ResponseHandler
</code>
<li><code>InvokeHandler</code>
<li><code>ResponseHandler</code>
</ul>
<p>
<h3>Unimplemented Methods in package <code>org.omg.CORBA.portable</code></h3>
<ul>
<code>
<li>InputStream
<li><code>InputStream</code>
<ul>
<li>public int read()
<li>public.math.BigDecimal read_fixed()
<li>public org.omg.CORBA.Context read_Context()
<li>public org.omg.CORBA.Object read_Object(java.lang.Class clz)
<li>public org.omg.CORBA.ORB orb()
<li><code>public int read()</code>
<li><code>public.math.BigDecimal read_fixed()</code>
<li><code>public org.omg.CORBA.Context read_Context()</code>
<li><code>public org.omg.CORBA.Object read_Object(java.lang.Class clz)</code>
<li><code>public org.omg.CORBA.ORB orb()</code>
</ul>
<li>OutputStream
<li><code>OutputStream</code>
<ul>
<li>public org.omg.CORBA.ORB orb()
<li>public void write_Context(org.omg.CORBA.Context ctx,
org.omg.CORBA.ContextList contexts)
<li>public void write_fixed(java.math.BigDecimal value)
<li>public void write(int b)
<li><code>public org.omg.CORBA.ORB orb()</code>
<li><code>public void write_Context(org.omg.CORBA.Context ctx,
org.omg.CORBA.ContextList contexts)</code>
<li><code>public void write_fixed(java.math.BigDecimal value)</code>
<li><code>public void write(int b)</code>
</ul>
<li>Delegate
<li><code>Delegate</code>
<ul>
<li>public void releaseReply(org.omg.CORBA.Object self, InputStream input)
<li>public InputStream invoke(org.omg.CORBA.Object self, OutputStream output)
<li>public OutputStream request(org.omg.CORBA.Object self, String operation,
boolean responseExpected)
<li>public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self,
<li><code>public void releaseReply(org.omg.CORBA.Object self, InputStream input)</code>
<li><code>public InputStream invoke(org.omgl.CORBA.Object self, OutputStream output)</code>
<li><code>public OutputStream request(org.omg.CORBA.Object self, String operation,
boolean responseExpected)</code>
<li><code>public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self,
org.omg.CORBA.Policy[] policies,
org.omg.CORBA.SetOverrideType set_add)
<li>public org.omg.CORBA.DomainManager[] get_domain_managers(
org.omg.CORBA.Object
self)
<li>public org.omg.CORBA.Policy get_policy(org.omg.CORBA.Object self,
int policy_type)
org.omg.CORBA.SetOverrideType set_add)</code>
<li><code>public org.omg.CORBA.DomainManager[] get_domain_managers(
org.omg.CORBA.Objectself)</code>
<li><code>public org.omg.CORBA.Policy get_policy(org.omg.CORBA.Object self,
int policy_type)</code>
</ul>
</code>
</ul>
@since JDK1.2
@serial exclude
</body>
</html>

22
corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html
View File

@ -6,7 +6,7 @@
<title>package</title>
<!--
/*
* Copyright (c) 1999, 2006, 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
@ -43,23 +43,21 @@ breaking the JCK tests.
<P>For a precise list of supported sections of official specifications with which
the Java[tm] Platform, Standard Edition 6, ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<P>
<a name="unimpl"></a>
The following methods in the abstract class
<code>org.omg.CORBA_2_3.ORB</code> are unimplemented:
<UL>
<code>
<LI>public org.omg.CORBA.portable.ValueFactory
<b>register_value_factory(String id, org.omg.CORBA.portable.ValueFactory
factory)</b>
<LI>public void <b>unregister_value_factory(String id)</b>
<LI>public org.omg.CORBA.portable.ValueFactory
<b>lookup_value_factory(String id)</b>
<LI>public org.omg.CORBA.Object <b>get_value_def(String repid)</b>
<LI>public void <b>set_delegate(java.lang.Object wrapper)</b>
</code>
<LI><code>public org.omg.CORBA.portable.ValueFactory
<b>register_value_factory(String id, org.omg.CORBA.portable.ValueFactory
factory)</b></code>
<LI><code>public void <b>unregister_value_factory(String id)</b></code>
<LI><code>public org.omg.CORBA.portable.ValueFactory
<b>lookup_value_factory(String id)</b></code>
<LI><code>public org.omg.CORBA.Object <b>get_value_def(String repid)</b></code>
<LI><code>public void <b>set_delegate(java.lang.Object wrapper)</b></code>
</UL>
@since JDK 1.3
<br>

2
corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java
View File

@ -77,7 +77,7 @@ public abstract class InputStream extends org.omg.CORBA.portable.InputStream {
*
* throw SecurityException if SecurityManager is installed and
* enableSubclassImplementation SerializablePermission
* is not granted or jdk.corba.allowOutputStreamSubclass system
* is not granted or jdk.corba.allowInputStreamSubclass system
* property is either not set or is set to 'false'
*/
public InputStream() {

5
corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
/*
* Copyright (c) 1999, 2001, 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
@ -26,7 +26,6 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-->
</head>
@ -34,7 +33,7 @@
Provides methods for the input and output of value types, and contains
other updates to the <code>org/omg/CORBA/portable</code> package.
<p>
@since 1.3
@serial exclude
</body>

11
corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
/*
* 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
@ -32,21 +32,20 @@
<body bgcolor="white">
<P>This package contains the following classes, which are used in
<tt>org.omg.CosNaming.NamingContextExt</tt>:
<P>
<UL>
<LI><tt>AddressHelper</tt>
<LI><tt>AddressHelper</tt>
<LI><tt>StringNameHelper</tt>
<LI><tt>URLStringHelper</tt>
<LI><tt>InvalidAddress</tt>
</UL>
<H3>Package Specification</H3>
<P>For a precise list of supported sections of official specifications with which
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

6
corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
/*
* 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
@ -32,7 +32,6 @@
<body bgcolor="white">
<P>This package contains Exception classes for the <tt>org.omg.CosNaming</tt>
package. The list of exception classes are:
<P>
<UL>
<LI><tt>AlreadyBound</tt>
<LI><tt>CannotProceed</tt>
@ -40,6 +39,7 @@
<LI><tt>NotEmpty</tt>
<LI><tt>NotFound</tt>
<LI><tt>NotFoundReason</tt>
</UL>
<H3>Package Specification</H3>
@ -48,7 +48,7 @@
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

234
corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -64,12 +64,12 @@ module CosNaming
Istring id;
Istring kind;
};
/**
* A name is a sequence of name components.
*/
typedef sequence <NameComponent> Name;
/**
* Specifies whether the given binding is for a object (that is not a
* naming context) or for a naming context.
@ -79,7 +79,7 @@ module CosNaming
nobject, // name is bound to an object
ncontext // name is bound to a naming context
};
/**
* A name-to-object association is called a Binding.
*/
@ -89,12 +89,12 @@ module CosNaming
BindingType binding_type; // whether name is bound to an object
// or a naming context
};
/**
* List of Bindings.
*/
typedef sequence <Binding> BindingList;
typedef sequence <Binding> BindingList;
/**
* The BindingIterator interface allows a client to iterate through
* the bindings using the next_one or next_n operations.
@ -112,24 +112,24 @@ module CosNaming
* @param b the returned binding
*/
boolean next_one(out Binding b);
/**
* This operation returns at most the requested number of bindings.
*
* @param how_many the maximum number of bindings tro return <p>
* @param how_many the maximum number of bindings to return
*
* @param bl the returned bindings
*/
boolean next_n(in unsigned long how_many,
out BindingList bl);
out BindingList bl);
// Destroy binding iterator
/**
* This operation destroys the iterator.
*/
void destroy();
};
/**
* A naming context is an object that contains a set of name bindings in
* which each name is unique. Different names can be bound to an object
@ -151,7 +151,7 @@ module CosNaming
not_context,
not_object
};
/**
* Indicates the name does not identify a binding.
*/
@ -160,7 +160,7 @@ module CosNaming
NotFoundReason why;
Name rest_of_name;
};
/**
* Indicates that the implementation has given up for some reason.
* The client, however, may be able to continue the operation at the
@ -171,130 +171,130 @@ module CosNaming
NamingContext cxt;
Name rest_of_name;
};
/**
* Indicates the name is invalid.
*/
exception InvalidName
{};
{};
/**
* Indicates an object is already bound to the specified name. Only
* one object can be bound to a particular name in a context.
*/
exception AlreadyBound
{};
/**
* Indicates that the Naming Context contains bindings.
*/
exception NotEmpty
{};
/**
* Creates a binding of a name and an object in the naming context.
* Naming contexts that are bound using bind do not participate in name
* resolution when compound names are passed to be resolved.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @param obj The Object to bind with the given name<p>
* @param obj The Object to bind with the given name.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates
* the name does not identify a binding.<p>
* the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
* Indicates that the implementation has given up for some reason.
* The client, however, may be able to continue the operation
* at the returned naming context.<p>
* at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName
* Indicates that the name is invalid. <p>
* Indicates that the name is invalid.
*
* @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
* Indicates an object is already bound to the specified name.<p>
* Indicates an object is already bound to the specified name.
*/
void bind(in Name n,
in Object obj)
in Object obj)
raises(NotFound,
CannotProceed,
InvalidName,
AlreadyBound);
CannotProceed,
InvalidName,
AlreadyBound);
/**
* Names an object that is a naming context. Naming contexts that
* are bound using bind_context() participate in name resolution
* when compound names are passed to be resolved.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @param nc NamingContect object to bind with the given name <p>
* @param nc NamingContect object to bind with the given name.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
* given up for some reason. The client, however, may be able to
* continue the operation at the returned naming context.<p>
* continue the operation at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
*
* @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already
* bound to the specified name.<p>
* bound to the specified name.
*/
void bind_context(in Name n,
in NamingContext nc)
in NamingContext nc)
raises(NotFound,
CannotProceed,
InvalidName,
AlreadyBound);
CannotProceed,
InvalidName,
AlreadyBound);
/**
* Creates a binding of a name and an object in the naming context
* even if the name is already bound in the context. Naming contexts
* that are bound using rebind do not participate in name resolution
* when compound names are passed to be resolved.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @param obj The Object to rebind with the given name <p>
* @param obj The Object to rebind with the given name.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
* given up for some reason. The client, however, may be able to
* continue the operation at the returned naming context.<p>
* continue the operation at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
*/
void rebind(in Name n,
in Object obj)
in Object obj)
raises(NotFound,
CannotProceed,
InvalidName);
CannotProceed,
InvalidName);
/**
* Creates a binding of a name and a naming context in the naming
* context even if the name is already bound in the context. Naming
* contexts that are bound using rebind_context() participate in name
* resolution when compound names are passed to be resolved.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @param nc NamingContect object to rebind with the given name <p>
* @param nc NamingContect object to rebind with the given name.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
* given up for some reason. The client, however, may be able to
* continue the operation at the returned naming context.<p>
* continue the operation at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
*/
void rebind_context(in Name n,
in NamingContext nc)
in NamingContext nc)
raises(NotFound,
CannotProceed,
InvalidName);
CannotProceed,
InvalidName);
/**
* The resolve operation is the process of retrieving an object
@ -304,39 +304,39 @@ module CosNaming
* to the appropriate type. That is, clients typically cast the returned
* object from Object to a more specialized interface.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
* given up for some reason. The client, however, may be able to
* continue the operation at the returned naming context.<p>
* continue the operation at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
*/
Object resolve(in Name n)
raises(NotFound,
CannotProceed,
InvalidName);
CannotProceed,
InvalidName);
/**
* The unbind operation removes a name binding from a context.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
* given up for some reason. The client, however, may be able to
* continue the operation at the returned naming context.<p>
* continue the operation at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
*/
void unbind(in Name n)
raises(NotFound,
CannotProceed,
InvalidName);
CannotProceed,
InvalidName);
/**
* The list operation allows a client to iterate through a set of
* bindings in a naming context. <p>
@ -351,15 +351,15 @@ module CosNaming
* bindings, the binding iterator is a nil object reference.
* </ul>
*
* @param how_many the maximum number of bindings to return <p>
* @param how_many the maximum number of bindings to return.
*
* @param bl the returned list of bindings <p>
* @param bl the returned list of bindings.
*
* @param bi the returned binding iterator <p>
* @param bi the returned binding iterator.
*/
void list(in unsigned long how_many,
out BindingList bl,
out BindingIterator bi);
out BindingList bl,
out BindingIterator bi);
/**
* This operation returns a naming context implemented by the same
@ -367,7 +367,7 @@ module CosNaming
* The new context is not bound to any name.
*/
NamingContext new_context();
/**
* This operation creates a new context and binds it to the name
* supplied as an argument. The newly-created context is implemented
@ -375,25 +375,25 @@ module CosNaming
* is, the naming server that implements the context denoted by the
* name argument excluding the last component).
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
* @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
*
* @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already
* bound to the specified name.<p>
* bound to the specified name.
*
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
* given up for some reason. The client, however, may be able to
* continue the operation at the returned naming context.<p>
* continue the operation at the returned naming context.
*
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
* @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
*/
NamingContext bind_new_context(in Name n)
raises(NotFound,
AlreadyBound,
CannotProceed,
InvalidName);
AlreadyBound,
CannotProceed,
InvalidName);
/**
* The destroy operation deletes a naming context. If the naming
* context contains bindings, the NotEmpty exception is raised.
@ -402,7 +402,7 @@ module CosNaming
*/
void destroy()
raises(NotEmpty);
};
@ -413,7 +413,7 @@ module CosNaming
* part of Interoperable Naming Service.
* Different names can be bound to an object in the same or different
* contexts at the same time. Using <tt>NamingContextExt</tt>, you can use
* URL-based names to bind and resolve. <p>
* URL-based names to bind and resolve.
*
* See <a href="http://www.omg.org/technology/documents/formal/naming_service.htm">
* CORBA COS
@ -425,86 +425,84 @@ module CosNaming
* StringName is the Stringified Name, Array of Name Components
* represented as a String.
*/
typedef string StringName;
typedef string StringName;
/**
* Address is the Host and Port information represented as a String.
*/
typedef string Address;
typedef string Address;
/**
* URLString is the URL address (corbaloc: or corbaname:) represented as
* a String.
*/
typedef string URLString;
typedef string URLString;
/**
* This operation creates a stringified name from the array of Name
* components.
*
* @param n Name of the object <p>
* @param n Name of the object.
*
* @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
* Indicates the name does not identify a binding.<p>
* Indicates the name does not identify a binding.
*
*/
StringName to_string( in Name n ) raises (InvalidName);
StringName to_string( in Name n ) raises (InvalidName);
/**
* This operation converts a Stringified Name into an equivalent array
* of Name Components.
* of Name Components.
*
* @param sn Stringified Name of the object <p>
* @param sn Stringified Name of the object.
*
* @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
* Indicates the name does not identify a binding.<p>
* Indicates the name does not identify a binding.
*
*/
Name to_name( in StringName sn ) raises (InvalidName);
Name to_name( in StringName sn ) raises (InvalidName);
/**
* Indicates the invalid Stringified name for the object, The
* reason could be invalid syntax.
*/
exception InvalidAddress
{ };
exception InvalidAddress
{ };
/**
* This operation creates a URL based "iiopname://" format name
* from the Stringified Name of the object.
*
* @param addr internet based address of the host machine where Name Service is running <p>
* @param sn Stringified Name of the object <p>
* @param addr internet based address of the host machine where Name Service is running.
* @param sn Stringified Name of the object.
*
* @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
* Indicates the name does not identify a binding.<p>
* Indicates the name does not identify a binding.
* @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress
* Indicates the internet based address of the host machine is
* incorrect <p>
*
*/
URLString to_url( in Address addr, in StringName sn )
raises( InvalidAddress, InvalidName );
* Indicates the internet based address of the host machine is incorrect
*/
URLString to_url( in Address addr, in StringName sn )
raises( InvalidAddress, InvalidName );
/**
* This operation resolves the Stringified name into the object
* reference.
*
* @param sn Stringified Name of the object <p>
* @param sn Stringified Name of the object.
*
* @exception org.omg.CosNaming.NamingContextPackage.NotFound
* Indicates there is no object reference for the given name. <p>
* Indicates there is no object reference for the given name.
* @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
* Indicates that the given compound name is incorrect <p>
* Indicates that the given compound name is incorrect.
* @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
* Indicates the name does not identify a binding.<p>
* Indicates the name does not identify a binding.
*
*/
Object resolve_str( in StringName sn)
raises( NotFound, CannotProceed,
InvalidName);
Object resolve_str( in StringName sn)
raises( NotFound, CannotProceed,
InvalidName);
};

76
corba/src/java.corba/share/classes/org/omg/CosNaming/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
/*
* Copyright (c) 1998, 2006, 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
@ -32,20 +32,20 @@
Provides a naming service for Java&nbsp;IDL. The Object Request Broker Daemon
(ORBD) also includes both a transient and persistent naming service.
<P>
The package and all its classes and interfaces
were generated by running the tool <code>idlj</code> on the file
<code>nameservice.idl</code>, which is a module written in OMG IDL.
<H3>Package Specification</H3>
<P>For a precise list of supported sections of official specifications with which
the Java[tm] Platform, Standard Edition 6, ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<P>
<H2>Interfaces</H2>
The package <tt>org.omg.CosNaming</tt> contains two public interfaces
and several auxiliary classes.
@ -62,7 +62,7 @@ support in Java[tm] SE 6</A>.
interface supplies the main functionality for the naming service, and
<code>BindingIterator</code> provides a means of iterating through a list
of name/object reference bindings.
<P>
<H2>Auxiliary Classes</H2>
In order to map an OMG IDL interface to the Java programming language,
the idlj compiler creates Java classes that can be thought of
@ -70,13 +70,13 @@ support in Java[tm] SE 6</A>.
Comments for the generated auxiliary classes
used by the interfaces <code>NamingContext</code> and
<code>BindingIterator</code> are included here.
<P>
<H3>Classes Used by <code>NamingContext</code> and
<code>BindingIterator</code></H3>
The following are classes used by
the naming service. (Helper and holder classes, which are
generated for each of the classes listed here, are discussed below.)
<UL>
<LI><code>public final class <B>NameComponent</B></code> --
a building block for names. (Names are bound to object references
@ -89,8 +89,7 @@ support in Java[tm] SE 6</A>.
A <code><B>NameComponent</B></code> object consists of two fields:
<OL>
<LI><code><B>id</B></code> -- a <code>String</code> used as an identifier
<LI><code><B>kind</B></code> -- a <code>String</code> that can be used for
any
<LI><code><B>kind</B></code> -- a <code>String</code> that can be used for any
descriptive purpose. Its importance is that it
can be used to describe an object without affecting syntax.
The C programming language, for example, uses the the syntactic convention
@ -102,16 +101,15 @@ any
<code>"c_source"</code>, <code>"object_code"</code>,
<code>"executable"</code>,
<code>"postscript"</code>, and <code>""</code>. It is not unusual
for the <code>kind</code> field to be the empty string.
for the <code>kind</code> field to be the empty string.
</OL>
<P>
In a name, each <code>NameComponent</code> object except the last denotes
a <code>NamingContext</code> object; the last <code>NameComponent</code>
object denotes the bound object reference.
This is similar to a path name, in which the last name is the
file name, and all names before it are directory names.<p>
<P>
file name, and all names before it are directory names.
<LI><code>public final class <B>Binding</B></code> --
an object that associates a name with an object reference or a
naming context.
@ -125,45 +123,44 @@ any
</OL>
<P>
The interface <code>NamingContext</code> has methods for
binding/unbinding names with object references or naming contexts,
for listing bindings,
binding/unbinding names with object references or naming contexts,
for listing bindings,
and for resolving bindings (given a name, the method
<code>resolve</code> returns the object reference bound to it).
<P>
<LI><code>public final class <B>BindingType</B></code> --
<LI><code>public final class <B>BindingType</B></code> --
an object that specifies whether the given <code>Binding</code>
object is a binding between a name and an object reference (that is,
not a naming context) or between a name and a naming context.
<P>
The class<code>BindingType</code> consists of two methods and
four constants. Two of these constants are
<code>BindingType</code> objects, and two are <code>int</code>s.
<P>
The <code>BindingType</code> objects
four constants. Two of these constants are
<code>BindingType</code> objects, and two are <code>int</code>s.
<P>
The <code>BindingType</code> objects
can be passed to the constructor for the class
<code>Binding</code> or used as parameters or return values. These
<code>BindingType</code> objects are:
<code>BindingType</code> objects are:
<UL>
<LI><code>public static final BindingType <B>nobject</B></code> --
to indicate that the binding is with an object reference
to indicate that the binding is with an object reference
<LI><code>public static final BindingType <B>ncontext</B></code> --
to indicate that the binding is with a naming context
to indicate that the binding is with a naming context
</UL>
<P>
The <code>int</code> constants can be supplied to the method
<code>from_int</code> to create <code>BindingType</code> objects,
or they can be return values for the method <code>value</code>.
These constants are:
<UL>
The <code>int</code> constants can be supplied to the method
<code>from_int</code> to create <code>BindingType</code> objects,
or they can be return values for the method <code>value</code>.
These constants are:
<UL>
<LI><code>public static final int <B>_nobject</B></code>
<LI><code>public static final int <B>_ncontext</B></code>
</UL>
</UL>
If the method <code>from_int</code> is supplied with anything other
than <code>_nobject</code>
than <code>_nobject</code>
or <code>_ncontext</code>, it will throw
the exception <code>org.omg.CORBA.BAD_PARAM</code>.
<P>Usage is as follows:
the exception <code>org.omg.CORBA.BAD_PARAM</code>.
<P>Usage is as follows:
<PRE>
BindingType btObject = from_int(_nobject);
BindingType btContext = from_int(_ncontext);
@ -182,9 +179,9 @@ any
int bt = BindingType.value();
</PRE>
</UL>
<H3>Holder Classes</H3>
OMG IDL uses OUT and INOUT parameters for returning values from operations.
The mapping to the Java programming language, which does not have OUT
and INOUT parameters, creates a special class for each type, called
@ -308,7 +305,6 @@ Context&gt;</code>.
This associates <code>NameService</code> with the Root Naming
Context of the <code>CosNaming</code> implementation that you
want to use.
<P>
<LI>Start the standalone Bootstrap server using the following command:
<pre>
<code>
@ -340,13 +336,13 @@ For an overview and examples of how to use the
<code>CosNaming</code> API, please see:
<ul>
<li><a href="../../../../technotes/guides/idl/tnameserv.html">
Naming Service</a>
Naming Service</a>
</ul>
<p>
For an overview of Java&nbsp;IDL, please see:
<ul>
<li><a href="../../../../technotes/guides/idl/index.html">
Java&nbsp;IDL home page</a>
Java&nbsp;IDL home page</a>
</ul>
@since JDK1.3

4
corba/src/java.corba/share/classes/org/omg/Dynamic/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
/*
* 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
@ -45,7 +45,7 @@ refer to that OMG specification for further details.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
/*
* 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
@ -48,7 +48,7 @@ refer to that OMG specification for further details.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -46,7 +46,7 @@ refer to that OMG specification for further details.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

14
corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
@ -197,22 +197,14 @@ exported through the <code>Object</code>
interface may raise the standard NO_IMPLEMENT exception.
An attempt to use a <code>DynAny</code> object with the DII may raise the NO_IMPLEMENT
exception.
<P>
<H3>Package Specification</H3>
<P>For a precise list of supported sections of official specifications with which
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -42,7 +42,7 @@ specified in the IOP::CodeFactory interface (as part of the Portable
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -45,7 +45,7 @@ refer to that OMG specification for further details.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/IOP/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -52,7 +52,7 @@ Portable Interceptors.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/Messaging/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -47,7 +47,7 @@ Portable Interceptors.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

14
corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl
View File

@ -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
@ -258,14 +258,14 @@ module IOP {
* <p>
* The <code>TAG_ALTERNATE_IIOP_ADDRESS</code> component has an
* associated value of type:
* <code>
* <pre>
* <pre>
* <code>
* struct {
* string HostID,
* short Port
* };
* </pre>
* </code>
* };
* </code>
* </pre>
* encoded as a CDR encapsulation.
* <p>
* Zero or more instances of the <code>TAG_ALTERNATE_IIOP_ADDRESS</code>
@ -601,7 +601,7 @@ module IOP {
/**
* Create a <code>Codec</code> of the given encoding.
* <p>
*
* @param enc The encoding for which to create a <code>Codec</code>.
* @return A <code>Codec</code> obtained with the given encoding.
* @exception UnknownEncoding thrown if this factory cannot create a

18
corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2010, 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
@ -479,7 +479,7 @@ module PortableInterceptor {
* On the client:
* <ul>
* <li>Within the <code>receive_reply</code> interception point, this
* will only return <code>SUCCESSFUL</code></li>.
* will only return <code>SUCCESSFUL</code>.</li>
* <li>Within the <code>receive_exception</code> interception point,
* this will be either <code>SYSTEM_EXCEPTION</code> or
* <code>USER_EXCEPTION</code>.</li>
@ -545,7 +545,7 @@ module PortableInterceptor {
/**
* Returns a copy of the service context with the given ID that
* is associated with the request.
* <p>
*
* @param id The <code>IOP.ServiceId</code> of the service context
* which is to be returned.
* @return The <code>IOP.ServiceContext</code> obtained with the
@ -579,7 +579,6 @@ module PortableInterceptor {
* validity of each attribute or operation. If it is not valid, attempting
* to access it will result in a <code>BAD_INV_ORDER</code> being thrown
* with a standard minor code of 14.
* <p>
*
* <table border=1 summary="Shows the validity of each attribute or operation">
* <thead>
@ -934,7 +933,6 @@ module PortableInterceptor {
* of each attribute or operation. If it is not valid, attempting to access
* it will result in a <code>BAD_INV_ORDER</code> being thrown with a
* standard minor code of 14.
* <p>
*
*
* <table border=1 summary="Shows the validity of each attribute or operation">
@ -1028,7 +1026,7 @@ module PortableInterceptor {
* <td>yes</td> <td>yes</td> <td>yes</td> <td>yes</td> <td>yes</td></tr>
*
* <tr><td><b>arguments</b></td>
* <td>no </td> <td>yes<sub>1</sub</td>
* <td>no </td> <td>yes<sub>1</sub></td>
* <td>yes</td> <td>no<sub>2</sub></td>
* <td>no<sub>2</sub>
* </td></tr>
@ -1133,7 +1131,7 @@ module PortableInterceptor {
* servant, which may no longer be available to the ORB. For example,
* if the object's adapter is a POA that uses a
* <code>ServantLocator</code>, then the ORB invokes the interception
* point after it calls <code>ServantLocator.postinvoke()</code></li>.
* point after it calls <code>ServantLocator.postinvoke()</code>.</li>
* </ol>
*
* @see ServerRequestInterceptor
@ -1889,7 +1887,7 @@ module PortableInterceptor {
* @param type An int specifying the type of policy being created.
* @param value An any containing data with which to construct the
* <code>CORBA.Policy</code>.
* @return A <code>CORBA.Policy<code> object of the specified type and
* @return A <code>CORBA.Policy</code> object of the specified type and
* value.
*/
CORBA::Policy create_policy
@ -2124,7 +2122,7 @@ module PortableInterceptor {
* <p>
* A client-side logging service written by company X, for example, may
* have the following ORBInitializer implementation:
* <code><pre>
* <pre><code>
* package com.x.logging;
*
* import org.omg.PortableInterceptor.Interceptor;
@ -2144,7 +2142,7 @@ module PortableInterceptor {
* // This service does not need two init points.
* }
* }
* </pre></code>
* </code></pre>
* To run a program called <code>MyApp</code> using this logging
* service, the user could type:
* <blockquote><code>

4
corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -44,7 +44,7 @@ refer to that OMG specification for further details.
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

28
corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
Copyright (c) 2000, 2006, 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
@ -56,41 +56,39 @@ for how to go about registering interceptors.
<h2>Known limitations / unimplemented methods in package
<code>org.omg.PortableInterceptor</code></h2>
<code>
<ul>
<li>
<b>RequestInfo</b>
<code><b>RequestInfo</b></code>
<ul>
<li><b>sync_scope()</b>: Always returns SYNC_WITH_TRANSPORT</li>
<li><b>arguments()</b>: Only supported for DII/DSI calls</li>
<li><b>exceptions()</b>: Only supported for DII calls on client side.
<li><code><b>sync_scope()</b></code>: Always returns SYNC_WITH_TRANSPORT</li>
<li><code><b>arguments()</b></code>: Only supported for DII/DSI calls</li>
<li><code><b>exceptions()</b></code>: Only supported for DII calls on client side.
Not supported on server-side.</li>
<li><b>contexts()</b>: Only supported for DII calls on client side.
<li><code><b>contexts()</b></code>: Only supported for DII calls on client side.
Not supported on server-side since our ORB does not send contexts.
</li>
<li><b>operation_context()</b>: Only supported for DII calls
<li><code><b>operation_context()</b></code>: Only supported for DII calls
on client side. Not supported on server-side since ORB
does not send contexts.</li>
<li><b>result()</b>: Only supported for DII/DSI calls</li>
<li><code><b>result()</b></code>: Only supported for DII/DSI calls</li>
</ul>
</li>
<li>
<b>ClientRequestInfo</b>
<code><b>ClientRequestInfo</b></code>
<ul>
<li><b>received_exception_id()</b>: Always returns null in the
<li><code><b>received_exception_id()</b></code>: Always returns null in the
DII case</li>
<li><b>get_request_policy(int type)</b>: Not implemented.</li>
<li><code><b>get_request_policy(int type)</b></code>: Not implemented.</li>
</ul>
</li>
<li>
<b>ServerRequestInfo</b>
<code><b>ServerRequestInfo</b></code>
<ul>
<li><b>sending_exception()</b>: Does not support user exceptions on
<li><code><b>sending_exception()</b></code>: Does not support user exceptions on
the server side in non-DSI case.</li>
</ul>
</li>
</ul>
</code>
<h2>Package Specification</h2>
<P>For a precise list of supported sections of official OMG specifications with which

4
corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -53,7 +53,7 @@
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -43,7 +43,7 @@ Encapsulates the processing
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

5
corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -36,7 +36,6 @@
between different ORB products.
<P>The Portable Object Adaptor (POA) is designed to meet the following goals:
<P>
<UL>
<LI>Allow programmers to construct object implementations that are portable between different ORB products.
<LI>Provide support for objects with persistent identities.
@ -66,7 +65,7 @@ be invoked by the application programmer, as well as methods which are invoked b
the Java[tm] Platform, Standard Edition 6, ORB complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>
@serial exclude

9
corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
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
@ -43,13 +43,6 @@ follows exactly the same pattern as the other holder classes for basic types.
the Java[tm] Platform, Standard Edition 6 complies, see <A
HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.4
<br>

63
corba/src/java.corba/share/classes/org/omg/PortableServer/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
Copyright (c) 2000, 2006, 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
@ -52,12 +52,10 @@ defined by the <TT>PortableServer</TT> module for the POA. In Java, the
the Java[tm] Platform, Standard Edition 6 complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
<H2>POA-related Interfaces</H2>
<P>The <TT>PortableServer</TT> module defines the following POA-related interfaces:
<P>
<UL>
<LI><TT>POA</TT>
<LI><TT>POAManager</TT>
@ -79,12 +77,18 @@ support in Java[tm] SE 6</A>.
<H3>Operations classes</H3>
<P>Each of the interfaces listed above has an associated <code>Operations</code> interface. The <code>Operations</code> interface is generated by the <code>idlj</code> compiler and contains the method signatures for methods defined in its associated interface. The <code>Operations</code> interface can be accessed by both the client and the server, while its associated interface can only be called by the client.
<P>Each of the interfaces listed above has an associated <code>Operations</code> interface.
The <code>Operations</code> interface is generated by the <code>idlj</code> compiler and
contains the method signatures for methods defined in its associated interface.
The <code>Operations</code> interface can be accessed by both the client and the server,
while its associated interface can only be called by the client.
<H3>Value Classes</H3>
Classes ending in the suffix <code>PolicyValue</code> provide the values used for the <code>create_POA</code> call, which sets the policy for the POA. See the <a href="#sampleserver">sample code</a> below for a demonstration. <code>PolicyValue</code> files include the following:
<P>
Classes ending in the suffix <code>PolicyValue</code> provide the values used
for the <code>create_POA</code> call, which sets the policy for the POA. See
the <a href="#sampleserver">sample code</a> below for a demonstration.
<code>PolicyValue</code> files include the following:
<UL>
<LI><code>IdAssignmentPolicyValue</code>
<LI><code>IdUniquenessPolicyValue</code>
@ -98,8 +102,11 @@ Classes ending in the suffix <code>PolicyValue</code> provide the values used fo
<H3>Helper Classes</H3>
<P>Helper classes, which are generated for all user-defined types in an OMG IDL
interface, supply static methods needed to manipulate those types. There is only one method in a helper class that an application programmer uses: the <code>narrow</code> method. Only Java interfaces mapped from IDL interfaces will have a helper class that includes a <code>narrow</code> method, so in the <code>PortableServer</code> package, only the following classes have a <code>narrow</code> method:
<P>
interface, supply static methods needed to manipulate those types.
There is only one method in a helper class that an application programmer uses:
the <code>narrow</code> method. Only Java interfaces mapped from IDL interfaces
will have a helper class that includes a <code>narrow</code> method, so in
the <code>PortableServer</code> package, only the following classes have a <code>narrow</code> method:
<UL>
<LI><code>ForwardRequestHelper</code>
<LI><code>ServantActivatorHelper</code>
@ -113,22 +120,31 @@ interface, supply static methods needed to manipulate those types. There is onl
<H3>Exceptions</H3>
<P>The <code>ForwardRequest</code> exception indicates to the ORB
that it is responsible for delivering the current request and subsequent <code>ForwardRequest</code> requests to the object denoted in the
<code>forward_reference</code> member of the exception.
that it is responsible for delivering the current request and
subsequent <code>ForwardRequest</code> requests to the object denoted in the
<code>forward_reference</code> member of the exception.
<H3>Interfaces Implemented by the Application Programmer</H3>
<P>Most of what <code>PortableServer</code> does is transparent to the user. The result is that programmers will use only a few of the interfaces mentioned above. The remaining interfaces will be provided by the ORB implementation. The interfaces of interest to application programmers are the following:
<P>
<P>Most of what <code>PortableServer</code> does is transparent to the user.
The result is that programmers will use only a few of the interfaces mentioned above.
The remaining interfaces will be provided by the ORB implementation.
The interfaces of interest to application programmers are the following:
<ul>
<LI><code>AdapterActivator</code>
<P>Adapter activators are associated with POAs. An adapter activator supplies a POA with the ability to create child POAs on demand, as a side-effect of receiving a request that names the child POA (or one of its children), or when <code>find_POA</code> is called with an activate parameter value of <code>TRUE</code>. An application server that creates all its needed POAs at the beginning of execution does not need to use or provide an adapter activator; it is necessary only for the case in which POAs need to be created during request processing.
<P>
<LI><code>ServantLocator</code>
<P>When the POA has the <code>NON_RETAIN</code> policy, it uses servant managers that are <code>ServantLocator</code>s.
<P>
<LI><code>ServantActivator</code>
<P>When the POA has the <code>RETAIN</code> policy, it uses servant managers that are <code>ServantActivator</code>s.
<LI><code>AdapterActivator</code>
<P>Adapter activators are associated with POAs.
An adapter activator supplies a POA with the ability to create child POAs on demand,
as a side-effect of receiving a request that names the child POA (or one of its children),
or when <code>find_POA</code> is called with an activate parameter value of <code>TRUE</code>.
An application server that creates all its needed POAs at the beginning of execution
does not need to use or provide an adapter activator; it is necessary
only for the case in which POAs need to be created during request processing.
<LI><code>ServantLocator</code>
<P>When the POA has the <code>NON_RETAIN</code> policy,
it uses servant managers that are <code>ServantLocator</code>s.
<LI><code>ServantActivator</code>
<P>When the POA has the <code>RETAIN</code> policy,
it uses servant managers that are <code>ServantActivator</code>s.
</ul>
@ -141,13 +157,11 @@ follows exactly the same pattern as the other holder classes for basic types.
<H2>Related Documentation</H2>
<P>For an overview of Java IDL, please see:
<P>
<LI><A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
<A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
<H2>Example Code</H2>
<a name="sampleserver"></a>
<H3>Example Server Code</H3>
<P>
<PRE>
import javax.naming.InitialContext;
import javax.naming.Context;
@ -209,9 +223,6 @@ public class HelloServer {
<P>
@since 1.4
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/SendingContext/package.html
View File

@ -3,7 +3,7 @@
<head>
<!--
Copyright (c) 1999, 2006, 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
@ -68,7 +68,7 @@
the Java[tm] Platform, Standard Edition 6 ORB complies, see <A
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
support in Java[tm] SE 6</A>.
<p>
@since 1.3
<br>
@serial exclude

4
corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html
View File

@ -3,7 +3,7 @@
<title>org.omg.stub.java.rmi package</title>
<!--
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
@ -32,7 +32,7 @@
<body bgcolor="white">
Contains RMI-IIOP Stubs for the Remote types that occur in the
<tt>java.rmi</tt> package.
<p>
@since 1.3
<br>
@serial exclude

1
hotspot/.hgtags
View File

@ -461,3 +461,4 @@ be49ab55e5c498c5077bbf58c2737100d1992339 jdk9-b55
fd2d5ec7e7b16c7bf4043a7fe7cfd8af96b819e2 jdk9-b56
56a85ffe743d3f9d70ba25d6ce82ddd2ad1bf33c jdk9-b57
ee878f3d6732856f7725c590312bfbe2ffa52cc7 jdk9-b58
96bcaec07cb165782bae1b9a1f28450b37a10e3a jdk9-b59

29
hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java
View File

@ -37,7 +37,9 @@ public class GenCollectedHeap extends SharedHeap {
private static CIntegerField nGensField;
private static AddressField youngGenField;
private static AddressField oldGenField;
private static AddressField genSpecsField;
private static AddressField youngGenSpecField;
private static AddressField oldGenSpecField;
private static GenerationFactory genFactory;
@ -55,9 +57,12 @@ public class GenCollectedHeap extends SharedHeap {
nGensField = type.getCIntegerField("_n_gens");
youngGenField = type.getAddressField("_young_gen");
oldGenField = type.getAddressField("_old_gen");
genSpecsField = type.getAddressField("_gen_specs");
genFactory = new GenerationFactory();
Type collectorPolicyType = db.lookupType("GenCollectorPolicy");
youngGenSpecField = collectorPolicyType.getAddressField("_young_gen_spec");
oldGenSpecField = collectorPolicyType.getAddressField("_old_gen_spec");
}
public GenCollectedHeap(Address addr) {
@ -115,21 +120,23 @@ public class GenCollectedHeap extends SharedHeap {
/** Package-private access to GenerationSpecs */
GenerationSpec spec(int level) {
if (Assert.ASSERTS_ENABLED) {
Assert.that((level >= 0) && (level < nGens()), "Index " + level +
" out of range (should be between 0 and " + nGens() + ")");
Assert.that((level == 0) || (level == 1), "Index " + level +
" out of range (should be 0 or 1)");
}
if ((level < 0) || (level >= nGens())) {
if ((level != 0) && (level != 1)) {
return null;
}
Address ptrList = genSpecsField.getValue(addr);
if (ptrList == null) {
return null;
if (level == 0) {
return (GenerationSpec)
VMObjectFactory.newObject(GenerationSpec.class,
youngGenSpecField.getAddress());
} else {
return (GenerationSpec)
VMObjectFactory.newObject(GenerationSpec.class,
oldGenSpecField.getAddress());
}
return (GenerationSpec)
VMObjectFactory.newObject(GenerationSpec.class,
ptrList.getAddressAt(level * VM.getVM().getAddressSize()));
}
public CollectedHeapName kind() {

9
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -52,9 +52,10 @@ void ConcurrentMarkSweepPolicy::initialize_alignments() {
}
void ConcurrentMarkSweepPolicy::initialize_generations() {
_generations = NEW_C_HEAP_ARRAY(GenerationSpecPtr, number_of_generations(), mtGC);
_generations[0] = new GenerationSpec(Generation::ParNew, _initial_young_size, _max_young_size);
_generations[1] = new GenerationSpec(Generation::ConcurrentMarkSweep, _initial_old_size, _max_old_size);
_young_gen_spec = new GenerationSpec(Generation::ParNew, _initial_young_size,
_max_young_size, _gen_alignment);
_old_gen_spec = new GenerationSpec(Generation::ConcurrentMarkSweep,
_initial_old_size, _max_old_size, _gen_alignment);
}
void ConcurrentMarkSweepPolicy::initialize_size_policy(size_t init_eden_size,

82
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
View File

@ -65,8 +65,6 @@
#include "services/memoryService.hpp"
#include "services/runtimeService.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
// statics
CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
bool CMSCollector::_full_gc_requested = false;
@ -1593,7 +1591,7 @@ void CMSCollector::acquire_control_and_collect(bool full,
bitMapLock()->lock_without_safepoint_check();
if (TraceCMSState) {
gclog_or_tty->print_cr("CMS foreground collector has asked for control "
INTPTR_FORMAT " with first state %d", Thread::current(), first_state);
INTPTR_FORMAT " with first state %d", p2i(Thread::current()), first_state);
gclog_or_tty->print_cr(" gets control with state %d", _collectorState);
}
@ -1763,27 +1761,27 @@ void CMSCollector::print_eden_and_survivor_chunk_arrays() {
// Eden
if (_eden_chunk_array != NULL) {
gclog_or_tty->print_cr("eden " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
eden_space->bottom(), eden_space->top(),
eden_space->end(), eden_space->capacity());
p2i(eden_space->bottom()), p2i(eden_space->top()),
p2i(eden_space->end()), eden_space->capacity());
gclog_or_tty->print_cr("_eden_chunk_index=" SIZE_FORMAT ", "
"_eden_chunk_capacity=" SIZE_FORMAT,
_eden_chunk_index, _eden_chunk_capacity);
for (size_t i = 0; i < _eden_chunk_index; i++) {
gclog_or_tty->print_cr("_eden_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
i, _eden_chunk_array[i]);
i, p2i(_eden_chunk_array[i]));
}
}
// Survivor
if (_survivor_chunk_array != NULL) {
gclog_or_tty->print_cr("survivor " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
from_space->bottom(), from_space->top(),
from_space->end(), from_space->capacity());
p2i(from_space->bottom()), p2i(from_space->top()),
p2i(from_space->end()), from_space->capacity());
gclog_or_tty->print_cr("_survivor_chunk_index=" SIZE_FORMAT ", "
"_survivor_chunk_capacity=" SIZE_FORMAT,
_survivor_chunk_index, _survivor_chunk_capacity);
for (size_t i = 0; i < _survivor_chunk_index; i++) {
gclog_or_tty->print_cr("_survivor_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
i, _survivor_chunk_array[i]);
i, p2i(_survivor_chunk_array[i]));
}
}
}
@ -1890,7 +1888,7 @@ void CMSCollector::collect_in_background(GCCause::Cause cause) {
while (_collectorState != Idling) {
if (TraceCMSState) {
gclog_or_tty->print_cr("Thread " INTPTR_FORMAT " in CMS state %d",
Thread::current(), _collectorState);
p2i(Thread::current()), _collectorState);
}
// The foreground collector
// holds the Heap_lock throughout its collection.
@ -1924,7 +1922,7 @@ void CMSCollector::collect_in_background(GCCause::Cause cause) {
if (TraceCMSState) {
gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT
" exiting collection CMS state %d",
Thread::current(), _collectorState);
p2i(Thread::current()), _collectorState);
}
return;
} else {
@ -2031,7 +2029,7 @@ void CMSCollector::collect_in_background(GCCause::Cause cause) {
}
if (TraceCMSState) {
gclog_or_tty->print_cr(" Thread " INTPTR_FORMAT " done - next CMS state %d",
Thread::current(), _collectorState);
p2i(Thread::current()), _collectorState);
}
assert(_foregroundGCShouldWait, "block post-condition");
}
@ -2054,7 +2052,7 @@ void CMSCollector::collect_in_background(GCCause::Cause cause) {
if (TraceCMSState) {
gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT
" exiting collection CMS state %d",
Thread::current(), _collectorState);
p2i(Thread::current()), _collectorState);
}
if (PrintGC && Verbose) {
_cmsGen->print_heap_change(prev_used);
@ -2112,7 +2110,7 @@ bool CMSCollector::waitForForegroundGC() {
CGC_lock->notify();
if (TraceCMSState) {
gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT " waiting at CMS state %d",
Thread::current(), _collectorState);
p2i(Thread::current()), _collectorState);
}
while (_foregroundGCIsActive) {
CGC_lock->wait(Mutex::_no_safepoint_check_flag);
@ -2124,7 +2122,7 @@ bool CMSCollector::waitForForegroundGC() {
}
if (TraceCMSState) {
gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT " continuing at CMS state %d",
Thread::current(), _collectorState);
p2i(Thread::current()), _collectorState);
}
return res;
}
@ -2356,13 +2354,13 @@ bool CMSCollector::is_cms_reachable(HeapWord* addr) {
// Clear the marking bit map array before starting, but, just
// for kicks, first report if the given address is already marked
gclog_or_tty->print_cr("Start: Address " PTR_FORMAT " is%s marked", addr,
gclog_or_tty->print_cr("Start: Address " PTR_FORMAT " is%s marked", p2i(addr),
_markBitMap.isMarked(addr) ? "" : " not");
if (verify_after_remark()) {
MutexLockerEx x(verification_mark_bm()->lock(), Mutex::_no_safepoint_check_flag);
bool result = verification_mark_bm()->isMarked(addr);
gclog_or_tty->print_cr("TransitiveMark: Address " PTR_FORMAT " %s marked", addr,
gclog_or_tty->print_cr("TransitiveMark: Address " PTR_FORMAT " %s marked", p2i(addr),
result ? "IS" : "is NOT");
return result;
} else {
@ -2377,13 +2375,13 @@ CMSCollector::print_on_error(outputStream* st) {
CMSCollector* collector = ConcurrentMarkSweepGeneration::_collector;
if (collector != NULL) {
CMSBitMap* bitmap = &collector->_markBitMap;
st->print_cr("Marking Bits: (CMSBitMap*) " PTR_FORMAT, bitmap);
st->print_cr("Marking Bits: (CMSBitMap*) " PTR_FORMAT, p2i(bitmap));
bitmap->print_on_error(st, " Bits: ");
st->cr();
CMSBitMap* mut_bitmap = &collector->_modUnionTable;
st->print_cr("Mod Union Table: (CMSBitMap*) " PTR_FORMAT, mut_bitmap);
st->print_cr("Mod Union Table: (CMSBitMap*) " PTR_FORMAT, p2i(mut_bitmap));
mut_bitmap->print_on_error(st, " Bits: ");
}
}
@ -2406,7 +2404,7 @@ class VerifyMarkedClosure: public BitMapClosure {
HeapWord* addr = _marks->offsetToHeapWord(offset);
if (!_marks->isMarked(addr)) {
oop(addr)->print_on(gclog_or_tty);
gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", p2i(addr));
_failed = true;
}
return true;
@ -2474,7 +2472,7 @@ bool CMSCollector::verify_after_remark(bool silent) {
// presumably, a mutation to A failed to be picked up by preclean/remark?
verify_after_remark_work_2();
} else {
warning("Unrecognized value %d for CMSRemarkVerifyVariant",
warning("Unrecognized value " UINTX_FORMAT " for CMSRemarkVerifyVariant",
CMSRemarkVerifyVariant);
}
if (!silent) gclog_or_tty->print(" done] ");
@ -5056,7 +5054,7 @@ void CMSCollector::merge_survivor_plab_arrays(ContiguousSpace* surv,
for (size_t i = 0; i < total - 1; i++) {
if (PrintCMSStatistics > 0) {
gclog_or_tty->print(" (chunk" SIZE_FORMAT ":" INTPTR_FORMAT ") ",
i, _survivor_chunk_array[i]);
i, p2i(_survivor_chunk_array[i]));
}
assert(_survivor_chunk_array[i] < _survivor_chunk_array[i+1],
"Not sorted");
@ -5700,8 +5698,8 @@ void ConcurrentMarkSweepGeneration::setNearLargestChunk() {
gclog_or_tty->print_cr(
"CMS: Large Block: " PTR_FORMAT ";"
" Proximity: " PTR_FORMAT " -> " PTR_FORMAT,
largestAddr,
_cmsSpace->nearLargestChunk(), minAddr + nearLargestOffset);
p2i(largestAddr),
p2i(_cmsSpace->nearLargestChunk()), p2i(minAddr + nearLargestOffset));
}
_cmsSpace->set_nearLargestChunk(minAddr + nearLargestOffset);
}
@ -6184,7 +6182,7 @@ void MarkRefsIntoVerifyClosure::do_oop(oop obj) {
_verification_bm->mark(addr);
if (!_cms_bm->isMarked(addr)) {
oop(addr)->print();
gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr);
gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", p2i(addr));
fatal("... aborting");
}
}
@ -6979,7 +6977,7 @@ void PushAndMarkVerifyClosure::do_oop(oop obj) {
if (!_cms_bm->isMarked(addr)) {
oop(addr)->print();
gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)",
addr);
p2i(addr));
fatal("... aborting");
}
@ -7375,16 +7373,16 @@ SweepClosure::SweepClosure(CMSCollector* collector,
"sweep _limit out of bounds");
if (CMSTraceSweeper) {
gclog_or_tty->print_cr("\n====================\nStarting new sweep with limit " PTR_FORMAT,
_limit);
p2i(_limit));
}
}
void SweepClosure::print_on(outputStream* st) const {
tty->print_cr("_sp = [" PTR_FORMAT "," PTR_FORMAT ")",
_sp->bottom(), _sp->end());
tty->print_cr("_limit = " PTR_FORMAT, _limit);
tty->print_cr("_freeFinger = " PTR_FORMAT, _freeFinger);
NOT_PRODUCT(tty->print_cr("_last_fc = " PTR_FORMAT, _last_fc);)
p2i(_sp->bottom()), p2i(_sp->end()));
tty->print_cr("_limit = " PTR_FORMAT, p2i(_limit));
tty->print_cr("_freeFinger = " PTR_FORMAT, p2i(_freeFinger));
NOT_PRODUCT(tty->print_cr("_last_fc = " PTR_FORMAT, p2i(_last_fc));)
tty->print_cr("_inFreeRange = %d, _freeRangeInFreeLists = %d, _lastFreeRangeCoalesced = %d",
_inFreeRange, _freeRangeInFreeLists, _lastFreeRangeCoalesced);
}
@ -7428,7 +7426,7 @@ SweepClosure::~SweepClosure() {
}
if (CMSTraceSweeper) {
gclog_or_tty->print_cr("end of sweep with _limit = " PTR_FORMAT "\n================",
_limit);
p2i(_limit));
}
}
#endif // PRODUCT
@ -7437,7 +7435,7 @@ void SweepClosure::initialize_free_range(HeapWord* freeFinger,
bool freeRangeInFreeLists) {
if (CMSTraceSweeper) {
gclog_or_tty->print("---- Start free range at " PTR_FORMAT " with free block (%d)\n",
freeFinger, freeRangeInFreeLists);
p2i(freeFinger), freeRangeInFreeLists);
}
assert(!inFreeRange(), "Trampling existing free range");
set_inFreeRange(true);
@ -7501,14 +7499,14 @@ size_t SweepClosure::do_blk_careful(HeapWord* addr) {
// coalesced chunk to the appropriate free list.
if (inFreeRange()) {
assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", p2i(freeFinger())));
flush_cur_free_chunk(freeFinger(),
pointer_delta(addr, freeFinger()));
if (CMSTraceSweeper) {
gclog_or_tty->print("Sweep: last chunk: ");
gclog_or_tty->print("put_free_blk " PTR_FORMAT " ("SIZE_FORMAT") "
"[coalesced:%d]\n",
freeFinger(), pointer_delta(addr, freeFinger()),
p2i(freeFinger()), pointer_delta(addr, freeFinger()),
lastFreeRangeCoalesced() ? 1 : 0);
}
}
@ -7652,7 +7650,7 @@ void SweepClosure::do_already_free_chunk(FreeChunk* fc) {
// the midst of a free range, we are coalescing
print_free_block_coalesced(fc);
if (CMSTraceSweeper) {
gclog_or_tty->print(" -- pick up free block " PTR_FORMAT " (" SIZE_FORMAT ")\n", fc, size);
gclog_or_tty->print(" -- pick up free block " PTR_FORMAT " (" SIZE_FORMAT ")\n", p2i(fc), size);
}
// remove it from the free lists
_sp->removeFreeChunkFromFreeLists(fc);
@ -7714,7 +7712,7 @@ size_t SweepClosure::do_garbage_chunk(FreeChunk* fc) {
// this will be swept up when we hit the end of the
// free range
if (CMSTraceSweeper) {
gclog_or_tty->print(" -- pick up garbage " PTR_FORMAT " (" SIZE_FORMAT ")\n", fc, size);
gclog_or_tty->print(" -- pick up garbage " PTR_FORMAT " (" SIZE_FORMAT ")\n", p2i(fc), size);
}
// If the chunk is being coalesced and the current free range is
// in the free lists, remove the current free range so that it
@ -7807,7 +7805,7 @@ void SweepClosure::do_post_free_or_garbage_chunk(FreeChunk* fc,
}
if (CMSTraceSweeper) {
gclog_or_tty->print_cr(" -- pick up another chunk at " PTR_FORMAT " (" SIZE_FORMAT ")", fc, chunkSize);
gclog_or_tty->print_cr(" -- pick up another chunk at " PTR_FORMAT " (" SIZE_FORMAT ")", p2i(fc), chunkSize);
}
HeapWord* const fc_addr = (HeapWord*) fc;
@ -7906,14 +7904,14 @@ void SweepClosure::lookahead_and_flush(FreeChunk* fc, size_t chunk_size) {
err_msg("eob = " PTR_FORMAT " eob-1 = " PTR_FORMAT " _limit = " PTR_FORMAT
" out of bounds wrt _sp = [" PTR_FORMAT "," PTR_FORMAT ")"
" when examining fc = " PTR_FORMAT "(" SIZE_FORMAT ")",
eob, eob-1, _limit, _sp->bottom(), _sp->end(), fc, chunk_size));
p2i(eob), p2i(eob-1), p2i(_limit), p2i(_sp->bottom()), p2i(_sp->end()), p2i(fc), chunk_size));
if (eob >= _limit) {
assert(eob == _limit || fc->is_free(), "Only a free chunk should allow us to cross over the limit");
if (CMSTraceSweeper) {
gclog_or_tty->print_cr("_limit " PTR_FORMAT " reached or crossed by block "
"[" PTR_FORMAT "," PTR_FORMAT ") in space "
"[" PTR_FORMAT "," PTR_FORMAT ")",
_limit, fc, eob, _sp->bottom(), _sp->end());
p2i(_limit), p2i(fc), p2i(eob), p2i(_sp->bottom()), p2i(_sp->end()));
}
// Return the storage we are tracking back into the free lists.
if (CMSTraceSweeper) {
@ -7937,7 +7935,7 @@ void SweepClosure::flush_cur_free_chunk(HeapWord* chunk, size_t size) {
}
if (CMSTraceSweeper) {
gclog_or_tty->print_cr(" -- add free block " PTR_FORMAT " (" SIZE_FORMAT ") to free lists",
chunk, size);
p2i(chunk), size);
}
// A new free range is going to be starting. The current
// free range has not been added to the free lists yet or
@ -8010,7 +8008,7 @@ bool debug_verify_chunk_in_free_list(FreeChunk* fc) {
void SweepClosure::print_free_block_coalesced(FreeChunk* fc) const {
if (CMSTraceSweeper) {
gclog_or_tty->print_cr("Sweep:coal_free_blk " PTR_FORMAT " (" SIZE_FORMAT ")",
fc, fc->size());
p2i(fc), fc->size());
}
}

4
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp
View File

@ -27,8 +27,6 @@
#include "memory/freeBlockDictionary.hpp"
#include "utilities/copy.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
#ifndef PRODUCT
#define baadbabeHeapWord badHeapWordVal
@ -74,5 +72,5 @@ void FreeChunk::verifyList() const {
void FreeChunk::print_on(outputStream* st) {
st->print_cr("Next: " PTR_FORMAT " Prev: " PTR_FORMAT " %s",
next(), prev(), cantCoalesce() ? "[can't coalesce]" : "");
p2i(next()), p2i(prev()), cantCoalesce() ? "[can't coalesce]" : "");
}

6
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp
View File

@ -28,8 +28,6 @@
#include "oops/markOop.inline.hpp"
#include "oops/oop.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
/////////////////////////////////////////////////////////////////////////
//// PromotionInfo
/////////////////////////////////////////////////////////////////////////
@ -360,6 +358,6 @@ void PromotionInfo::print_on(outputStream* st) const {
void SpoolBlock::print_on(outputStream* st) const {
st->print("[" PTR_FORMAT "," PTR_FORMAT "), " SIZE_FORMAT " HeapWords -> " PTR_FORMAT,
this, (HeapWord*)displacedHdr + bufferSize,
bufferSize, nextSpoolBlock);
p2i(this), p2i((HeapWord*)displacedHdr + bufferSize),
bufferSize, p2i(nextSpoolBlock));
}

2
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
View File

@ -34,8 +34,6 @@
#include "runtime/os.hpp"
#include "utilities/dtrace.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
//////////////////////////////////////////////////////////
// Methods in abstract class VM_CMS_Operation
//////////////////////////////////////////////////////////

7
hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
View File

@ -2088,10 +2088,7 @@ void ConcurrentMark::cleanup() {
_cleanup_times.add((end - start) * 1000.0);
if (G1Log::fine()) {
g1h->print_size_transition(gclog_or_tty,
start_used_bytes,
g1h->used(),
g1h->capacity());
g1h->g1_policy()->print_heap_transition(start_used_bytes);
}
// Clean up will have freed any regions completely full of garbage.
@ -2584,7 +2581,7 @@ class G1RemarkThreadsClosure : public ThreadClosure {
public:
G1RemarkThreadsClosure(G1CollectedHeap* g1h, CMTask* task) :
_cm_obj(task), _cm_cl(g1h, g1h->concurrent_mark(), task), _code_cl(&_cm_cl, !CodeBlobToOopClosure::FixRelocations),
_thread_parity(SharedHeap::heap()->strong_roots_parity()) {}
_thread_parity(Threads::thread_claim_parity()) {}
void do_thread(Thread* thread) {
if (thread->is_Java_thread()) {

2
hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
View File

@ -31,8 +31,6 @@
#include "services/memTracker.hpp"
#include "utilities/copy.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
void G1CardCountsMappingChangedListener::on_commit(uint start_idx, size_t num_regions, bool zero_filled) {
if (zero_filled) {
return;

2
hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp
View File

@ -33,8 +33,6 @@
#include "utilities/hashtable.inline.hpp"
#include "utilities/stack.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
class CodeRootSetTable : public Hashtable<nmethod*, mtGC> {
friend class G1CodeRootSetTest;
typedef HashtableEntry<nmethod*, mtGC> Entry;

38
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View File

@ -66,7 +66,6 @@
#include "memory/iterator.hpp"
#include "memory/referenceProcessor.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/vmThread.hpp"
@ -403,25 +402,6 @@ HeapRegion* G1CollectedHeap::pop_dirty_cards_region()
return hr;
}
#ifdef ASSERT
// A region is added to the collection set as it is retired
// so an address p can point to a region which will be in the
// collection set but has not yet been retired. This method
// therefore is only accurate during a GC pause after all
// regions have been retired. It is used for debugging
// to check if an nmethod has references to objects that can
// be move during a partial collection. Though it can be
// inaccurate, it is sufficient for G1 because the conservative
// implementation of is_scavengable() for G1 will indicate that
// all nmethods must be scanned during a partial collection.
bool G1CollectedHeap::is_in_partial_collection(const void* p) {
if (p == NULL) {
return false;
}
return heap_region_containing(p)->in_collection_set();
}
#endif
// Returns true if the reference points to an object that
// can move in an incremental collection.
bool G1CollectedHeap::is_scavengable(const void* p) {
@ -1748,7 +1728,7 @@ void G1CollectedHeap::shrink(size_t shrink_bytes) {
G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
SharedHeap(policy_),
SharedHeap(),
_g1_policy(policy_),
_dirty_card_queue_set(false),
_into_cset_dirty_card_queue_set(false),
@ -3732,7 +3712,14 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty);
uint active_workers = workers()->active_workers();
uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
workers()->active_workers(),
Threads::number_of_non_daemon_threads());
assert(UseDynamicNumberOfGCThreads ||
active_workers == workers()->total_workers(),
"If not dynamic should be using all the workers");
workers()->set_active_workers(active_workers);
double pause_start_sec = os::elapsedTime();
g1_policy()->phase_times()->note_gc_start(active_workers, mark_in_progress());
log_gc_header();
@ -5430,15 +5417,10 @@ void G1CollectedHeap::evacuate_collection_set(EvacuationInfo& evacuation_info) {
hot_card_cache->reset_hot_cache_claimed_index();
hot_card_cache->set_use_cache(false);
uint n_workers;
n_workers =
AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
workers()->active_workers(),
Threads::number_of_non_daemon_threads());
const uint n_workers = workers()->active_workers();
assert(UseDynamicNumberOfGCThreads ||
n_workers == workers()->total_workers(),
"If not dynamic should be using all the workers");
workers()->set_active_workers(n_workers);
set_par_threads(n_workers);

6
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
View File

@ -1008,7 +1008,7 @@ public:
// Set _n_par_threads according to a policy TBD.
void set_par_threads();
virtual CollectedHeap::Name kind() const {
virtual Name kind() const {
return CollectedHeap::G1CollectedHeap;
}
@ -1379,10 +1379,6 @@ public:
inline bool is_in_young(const oop obj);
#ifdef ASSERT
virtual bool is_in_partial_collection(const void* p);
#endif
virtual bool is_scavengable(const void* addr);
// We don't need barriers for initializing stores to objects

18
hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
View File

@ -1201,11 +1201,21 @@ void G1CollectorPolicy::record_heap_size_info_at_start(bool full) {
}
}
void G1CollectorPolicy::print_heap_transition(size_t bytes_before) {
size_t bytes_after = _g1->used();
size_t capacity = _g1->capacity();
gclog_or_tty->print(" " SIZE_FORMAT "%s->" SIZE_FORMAT "%s(" SIZE_FORMAT "%s)",
byte_size_in_proper_unit(bytes_before),
proper_unit_for_byte_size(bytes_before),
byte_size_in_proper_unit(bytes_after),
proper_unit_for_byte_size(bytes_after),
byte_size_in_proper_unit(capacity),
proper_unit_for_byte_size(capacity));
}
void G1CollectorPolicy::print_heap_transition() {
_g1->print_size_transition(gclog_or_tty,
_heap_used_bytes_before_gc,
_g1->used(),
_g1->capacity());
print_heap_transition(_heap_used_bytes_before_gc);
}
void G1CollectorPolicy::print_detailed_heap_transition(bool full) {

2
hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
View File

@ -700,6 +700,8 @@ public:
void record_heap_size_info_at_start(bool full);
// Print heap sizing transition (with less and more detail).
void print_heap_transition(size_t bytes_before);
void print_heap_transition();
void print_detailed_heap_transition(bool full = false);

56
hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
View File

@ -154,28 +154,28 @@ class WorkerDataArray : public CHeapObj<mtGC> {
_has_new_data = true;
}
double average(){
calculate_totals();
double average(uint active_threads){
calculate_totals(active_threads);
return _average;
}
T sum() {
calculate_totals();
T sum(uint active_threads) {
calculate_totals(active_threads);
return _sum;
}
T minimum() {
calculate_totals();
T minimum(uint active_threads) {
calculate_totals(active_threads);
return _min;
}
T maximum() {
calculate_totals();
T maximum(uint active_threads) {
calculate_totals(active_threads);
return _max;
}
void reset() PRODUCT_RETURN;
void verify() PRODUCT_RETURN;
void verify(uint active_threads) PRODUCT_RETURN;
void set_enabled(bool enabled) { _enabled = enabled; }
@ -183,7 +183,7 @@ class WorkerDataArray : public CHeapObj<mtGC> {
private:
void calculate_totals(){
void calculate_totals(uint active_threads){
if (!_has_new_data) {
return;
}
@ -191,13 +191,14 @@ class WorkerDataArray : public CHeapObj<mtGC> {
_sum = (T)0;
_min = _data[0];
_max = _min;
for (uint i = 0; i < _length; ++i) {
assert(active_threads <= _length, "Wrong number of active threads");
for (uint i = 0; i < active_threads; ++i) {
T val = _data[i];
_sum += val;
_min = MIN2(_min, val);
_max = MAX2(_max, val);
}
_average = (double)_sum / (double)_length;
_average = (double)_sum / (double)active_threads;
_has_new_data = false;
}
};
@ -226,17 +227,18 @@ void WorkerDataArray<T>::reset() {
}
template <class T>
void WorkerDataArray<T>::verify() {
void WorkerDataArray<T>::verify(uint active_threads) {
if (!_enabled) {
return;
}
for (uint i = 0; i < _length; i++) {
assert(active_threads <= _length, "Wrong number of active threads");
for (uint i = 0; i < active_threads; i++) {
assert(_data[i] != WorkerDataArray<T>::uninitialized(),
err_msg("Invalid data for worker %u in '%s'", i, _title));
}
if (_thread_work_items != NULL) {
_thread_work_items->verify();
_thread_work_items->verify(active_threads);
}
}
@ -321,7 +323,7 @@ void G1GCPhaseTimes::note_gc_end() {
}
for (int i = 0; i < GCParPhasesSentinel; i++) {
_gc_par_phases[i]->verify();
_gc_par_phases[i]->verify(_active_gc_threads);
}
}
@ -378,7 +380,7 @@ void G1GCPhaseTimes::record_thread_work_item(GCParPhases phase, uint worker_i, s
// return the average time for a phase in milliseconds
double G1GCPhaseTimes::average_time_ms(GCParPhases phase) {
return _gc_par_phases[phase]->average() * 1000.0;
return _gc_par_phases[phase]->average(_active_gc_threads) * 1000.0;
}
double G1GCPhaseTimes::get_time_ms(GCParPhases phase, uint worker_i) {
@ -386,15 +388,15 @@ double G1GCPhaseTimes::get_time_ms(GCParPhases phase, uint worker_i) {
}
double G1GCPhaseTimes::sum_time_ms(GCParPhases phase) {
return _gc_par_phases[phase]->sum() * 1000.0;
return _gc_par_phases[phase]->sum(_active_gc_threads) * 1000.0;
}
double G1GCPhaseTimes::min_time_ms(GCParPhases phase) {
return _gc_par_phases[phase]->minimum() * 1000.0;
return _gc_par_phases[phase]->minimum(_active_gc_threads) * 1000.0;
}
double G1GCPhaseTimes::max_time_ms(GCParPhases phase) {
return _gc_par_phases[phase]->maximum() * 1000.0;
return _gc_par_phases[phase]->maximum(_active_gc_threads) * 1000.0;
}
size_t G1GCPhaseTimes::get_thread_work_item(GCParPhases phase, uint worker_i) {
@ -404,22 +406,22 @@ size_t G1GCPhaseTimes::get_thread_work_item(GCParPhases phase, uint worker_i) {
size_t G1GCPhaseTimes::sum_thread_work_items(GCParPhases phase) {
assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
return _gc_par_phases[phase]->thread_work_items()->sum();
return _gc_par_phases[phase]->thread_work_items()->sum(_active_gc_threads);
}
double G1GCPhaseTimes::average_thread_work_items(GCParPhases phase) {
assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
return _gc_par_phases[phase]->thread_work_items()->average();
return _gc_par_phases[phase]->thread_work_items()->average(_active_gc_threads);
}
size_t G1GCPhaseTimes::min_thread_work_items(GCParPhases phase) {
assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
return _gc_par_phases[phase]->thread_work_items()->minimum();
return _gc_par_phases[phase]->thread_work_items()->minimum(_active_gc_threads);
}
size_t G1GCPhaseTimes::max_thread_work_items(GCParPhases phase) {
assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
return _gc_par_phases[phase]->thread_work_items()->maximum();
return _gc_par_phases[phase]->thread_work_items()->maximum(_active_gc_threads);
}
class G1GCParPhasePrinter : public StackObj {
@ -455,14 +457,16 @@ class G1GCParPhasePrinter : public StackObj {
}
void print_time_values(LineBuffer& buf, G1GCPhaseTimes::GCParPhases phase_id, WorkerDataArray<double>* phase) {
for (uint i = 0; i < phase->_length; ++i) {
uint active_length = _phase_times->_active_gc_threads;
for (uint i = 0; i < active_length; ++i) {
buf.append(" %.1lf", _phase_times->get_time_ms(phase_id, i));
}
buf.print_cr();
}
void print_count_values(LineBuffer& buf, G1GCPhaseTimes::GCParPhases phase_id, WorkerDataArray<size_t>* thread_work_items) {
for (uint i = 0; i < thread_work_items->_length; ++i) {
uint active_length = _phase_times->_active_gc_threads;
for (uint i = 0; i < active_length; ++i) {
buf.append(" " SIZE_FORMAT, _phase_times->get_thread_work_item(phase_id, i));
}
buf.print_cr();

12
hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
View File

@ -27,8 +27,6 @@
#include "gc_implementation/g1/heapRegion.hpp"
#include "utilities/ostream.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
const char* G1HRPrinter::action_name(ActionType action) {
switch(action) {
case Alloc: return "ALLOC";
@ -85,18 +83,18 @@ void G1HRPrinter::print(ActionType action, RegionType type,
if (type_str != NULL) {
if (top != NULL) {
gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
action_str, type_str, bottom, top);
action_str, type_str, p2i(bottom), p2i(top));
} else {
gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
action_str, type_str, bottom);
action_str, type_str, p2i(bottom));
}
} else {
if (top != NULL) {
gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
action_str, bottom, top);
action_str, p2i(bottom), p2i(top));
} else {
gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
action_str, bottom);
action_str, p2i(bottom));
}
}
}
@ -105,7 +103,7 @@ void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
const char* action_str = action_name(action);
gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
action_str, bottom, end);
action_str, p2i(bottom), p2i(end));
}
void G1HRPrinter::print(PhaseType phase, size_t phase_num) {

5
hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2014, 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
@ -33,6 +33,7 @@
#include "gc_implementation/g1/g1MarkSweep.hpp"
#include "gc_implementation/g1/g1RootProcessor.hpp"
#include "gc_implementation/g1/g1StringDedup.hpp"
#include "gc_implementation/shared/markSweep.inline.hpp"
#include "gc_implementation/shared/gcHeapSummary.hpp"
#include "gc_implementation/shared/gcTimer.hpp"
#include "gc_implementation/shared/gcTrace.hpp"
@ -217,7 +218,7 @@ class G1AdjustPointersClosure: public HeapRegionClosure {
// We must adjust the pointers on the single H object.
oop obj = oop(r->bottom());
// point all the oops to the new location
obj->adjust_pointers();
MarkSweep::adjust_pointers(obj);
}
} else {
// This really ought to be "as_CompactibleSpace"...

1
hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp
View File

@ -27,7 +27,6 @@
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
#include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/prefetch.inline.hpp"
G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)

8
hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
View File

@ -39,8 +39,6 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/intHisto.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
#define CARD_REPEAT_HISTO 0
#if CARD_REPEAT_HISTO
@ -156,9 +154,9 @@ public:
"RS names card " SIZE_FORMAT_HEX ": "
"[" PTR_FORMAT ", " PTR_FORMAT ")",
_worker_i,
card_region->bottom(), card_region->end(),
p2i(card_region->bottom()), p2i(card_region->end()),
card_index,
card_start, card_start + G1BlockOffsetSharedArray::N_words);
p2i(card_start), p2i(card_start + G1BlockOffsetSharedArray::N_words));
}
void scan_strong_code_roots(HeapRegion* r) {
@ -428,7 +426,7 @@ bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap",
p2i(card_ptr),
_ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
_ct_bs->addr_for(card_ptr),
p2i(_ct_bs->addr_for(card_ptr)),
_g1->addr_to_region(_ct_bs->addr_for(card_ptr))));
// If the card is no longer dirty, nothing to do.

52
hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
View File

@ -39,8 +39,6 @@
#include "runtime/atomic.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
int HeapRegion::LogOfHRGrainBytes = 0;
int HeapRegion::LogOfHRGrainWords = 0;
size_t HeapRegion::GrainBytes = 0;
@ -505,7 +503,7 @@ class VerifyStrongCodeRootOopClosure: public OopClosure {
gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
"["PTR_FORMAT", "PTR_FORMAT") is above "
"top "PTR_FORMAT,
(void *)obj, _hr->bottom(), _hr->end(), _hr->top());
p2i(obj), p2i(_hr->bottom()), p2i(_hr->end()), p2i(_hr->top()));
_failures = true;
return;
}
@ -540,7 +538,7 @@ public:
if (!nm->is_alive()) {
gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
PTR_FORMAT" in its strong code roots",
_hr->bottom(), _hr->end(), nm);
p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
_failures = true;
} else {
VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
@ -549,12 +547,12 @@ public:
gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
PTR_FORMAT" in its strong code roots "
"with no pointers into region",
_hr->bottom(), _hr->end(), nm);
p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
_failures = true;
} else if (oop_cl.failures()) {
gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
"failures for nmethod "PTR_FORMAT,
_hr->bottom(), _hr->end(), nm);
p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
_failures = true;
}
}
@ -589,7 +587,7 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
if (strong_code_roots_length > 0) {
gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
"but has "SIZE_FORMAT" code root entries",
bottom(), end(), strong_code_roots_length);
p2i(bottom()), p2i(end()), strong_code_roots_length);
*failures = true;
}
return;
@ -624,7 +622,7 @@ void HeapRegion::print_on(outputStream* st) const {
st->print(" ");
st->print(" TS %5d", _gc_time_stamp);
st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT,
prev_top_at_mark_start(), next_top_at_mark_start());
p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()));
G1OffsetTableContigSpace::print_on(st);
}
@ -687,23 +685,23 @@ public:
gclog_or_tty->print_cr("Field "PTR_FORMAT
" of live obj "PTR_FORMAT" in region "
"["PTR_FORMAT", "PTR_FORMAT")",
p, (void*) _containing_obj,
from->bottom(), from->end());
p2i(p), p2i(_containing_obj),
p2i(from->bottom()), p2i(from->end()));
print_object(gclog_or_tty, _containing_obj);
gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
(void*) obj);
p2i(obj));
} else {
HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
gclog_or_tty->print_cr("Field "PTR_FORMAT
" of live obj "PTR_FORMAT" in region "
"["PTR_FORMAT", "PTR_FORMAT")",
p, (void*) _containing_obj,
from->bottom(), from->end());
p2i(p), p2i(_containing_obj),
p2i(from->bottom()), p2i(from->end()));
print_object(gclog_or_tty, _containing_obj);
gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
"["PTR_FORMAT", "PTR_FORMAT")",
(void*) obj, to->bottom(), to->end());
p2i(obj), p2i(to->bottom()), p2i(to->end()));
print_object(gclog_or_tty, obj);
}
gclog_or_tty->print_cr("----------");
@ -741,12 +739,12 @@ public:
gclog_or_tty->print_cr("Field "PTR_FORMAT" "
"of obj "PTR_FORMAT", "
"in region "HR_FORMAT,
p, (void*) _containing_obj,
p2i(p), p2i(_containing_obj),
HR_FORMAT_PARAMS(from));
_containing_obj->print_on(gclog_or_tty);
gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
"in region "HR_FORMAT,
(void*) obj,
p2i(obj),
HR_FORMAT_PARAMS(to));
obj->print_on(gclog_or_tty);
gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
@ -783,7 +781,7 @@ void HeapRegion::verify(VerifyOption vo,
!g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size ("
SIZE_FORMAT" words) in a %shumongous region",
p, g1->is_humongous(obj_size) ? "" : "non-",
p2i(p), g1->is_humongous(obj_size) ? "" : "non-",
obj_size, is_region_humongous ? "" : "non-");
*failures = true;
return;
@ -797,12 +795,12 @@ void HeapRegion::verify(VerifyOption vo,
ClassLoaderDataGraph::unload_list_contains(klass));
if (!is_metaspace_object) {
gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
"not metadata", klass, (void *)obj);
"not metadata", p2i(klass), p2i(obj));
*failures = true;
return;
} else if (!klass->is_klass()) {
gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
"not a klass", klass, (void *)obj);
"not a klass", p2i(klass), p2i(obj));
*failures = true;
return;
} else {
@ -817,7 +815,7 @@ void HeapRegion::verify(VerifyOption vo,
}
}
} else {
gclog_or_tty->print_cr(PTR_FORMAT" no an oop", (void *)obj);
gclog_or_tty->print_cr(PTR_FORMAT" no an oop", p2i(obj));
*failures = true;
return;
}
@ -832,7 +830,7 @@ void HeapRegion::verify(VerifyOption vo,
if (p != top()) {
gclog_or_tty->print_cr("end of last object "PTR_FORMAT" "
"does not match top "PTR_FORMAT, p, top());
"does not match top "PTR_FORMAT, p2i(p), p2i(top()));
*failures = true;
return;
}
@ -849,7 +847,7 @@ void HeapRegion::verify(VerifyOption vo,
if (b_start_1 != p) {
gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" "
" yielded "PTR_FORMAT", expecting "PTR_FORMAT,
addr_1, b_start_1, p);
p2i(addr_1), p2i(b_start_1), p2i(p));
*failures = true;
return;
}
@ -861,7 +859,7 @@ void HeapRegion::verify(VerifyOption vo,
if (b_start_2 != p) {
gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" "
" yielded "PTR_FORMAT", expecting "PTR_FORMAT,
addr_2, b_start_2, p);
p2i(addr_2), p2i(b_start_2), p2i(p));
*failures = true;
return;
}
@ -875,7 +873,7 @@ void HeapRegion::verify(VerifyOption vo,
if (b_start_3 != p) {
gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" "
" yielded "PTR_FORMAT", expecting "PTR_FORMAT,
addr_3, b_start_3, p);
p2i(addr_3), p2i(b_start_3), p2i(p));
*failures = true;
return;
}
@ -887,7 +885,7 @@ void HeapRegion::verify(VerifyOption vo,
if (b_start_4 != p) {
gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" "
" yielded "PTR_FORMAT", expecting "PTR_FORMAT,
addr_4, b_start_4, p);
p2i(addr_4), p2i(b_start_4), p2i(p));
*failures = true;
return;
}
@ -896,7 +894,7 @@ void HeapRegion::verify(VerifyOption vo,
if (is_region_humongous && object_num > 1) {
gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
"but has "SIZE_FORMAT", objects",
bottom(), end(), object_num);
p2i(bottom()), p2i(end()), object_num);
*failures = true;
return;
}
@ -947,7 +945,7 @@ void G1OffsetTableContigSpace::print() const {
print_short();
gclog_or_tty->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", "
INTPTR_FORMAT ", " INTPTR_FORMAT ")",
bottom(), top(), _offsets.threshold(), end());
p2i(bottom()), p2i(top()), p2i(_offsets.threshold()), p2i(end()));
}
HeapWord* G1OffsetTableContigSpace::initialize_threshold() {

32
hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
View File

@ -37,8 +37,6 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/growableArray.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
class PerRegionTable: public CHeapObj<mtGC> {
friend class OtherRegionsTable;
friend class HeapRegionRemSetIterator;
@ -93,10 +91,10 @@ protected:
if (G1TraceHeapRegionRememberedSet) {
gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").",
from,
p2i(from),
UseCompressedOops
? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
: (void *)oopDesc::load_decode_heap_oop((oop*)from));
? p2i(oopDesc::load_decode_heap_oop((narrowOop*)from))
: p2i(oopDesc::load_decode_heap_oop((oop*)from)));
}
HeapRegion* loc_hr = hr();
@ -412,17 +410,17 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
if (G1TraceHeapRegionRememberedSet) {
gclog_or_tty->print_cr("ORT::add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
from,
p2i(from),
UseCompressedOops
? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
: (void *)oopDesc::load_decode_heap_oop((oop*)from));
? p2i(oopDesc::load_decode_heap_oop((narrowOop*)from))
: p2i(oopDesc::load_decode_heap_oop((oop*)from)));
}
int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
if (G1TraceHeapRegionRememberedSet) {
gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = %d)",
_hr->bottom(), from_card,
p2i(_hr->bottom()), from_card,
FromCardCache::at(tid, cur_hrm_ind));
}
@ -471,7 +469,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
"[" PTR_FORMAT "...) for ref " PTR_FORMAT ".\n",
align_size_down(uintptr_t(from),
CardTableModRefBS::card_size),
_hr->bottom(), from);
p2i(_hr->bottom()), p2i(from));
}
}
if (G1TraceHeapRegionRememberedSet) {
@ -533,7 +531,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
"[" PTR_FORMAT "...) for ref " PTR_FORMAT ".\n",
align_size_down(uintptr_t(from),
CardTableModRefBS::card_size),
_hr->bottom(), from);
p2i(_hr->bottom()), p2i(from));
}
}
assert(contains_reference(from), "We just added it!");
@ -602,8 +600,8 @@ PerRegionTable* OtherRegionsTable::delete_region_table() {
if (G1TraceHeapRegionRememberedSet) {
gclog_or_tty->print("Coarsened entry in region [" PTR_FORMAT "...] "
"for region [" PTR_FORMAT "...] (" SIZE_FORMAT " coarse entries).\n",
_hr->bottom(),
max->hr()->bottom(),
p2i(_hr->bottom()),
p2i(max->hr()->bottom()),
_n_coarse_entries);
}
}
@ -857,7 +855,7 @@ void HeapRegionRemSet::print() {
while (iter.has_next(card_index)) {
HeapWord* card_start =
G1CollectedHeap::heap()->bot_shared()->address_for_index(card_index);
gclog_or_tty->print_cr(" Card " PTR_FORMAT, card_start);
gclog_or_tty->print_cr(" Card " PTR_FORMAT, p2i(card_start));
}
if (iter.n_yielded() != occupied()) {
gclog_or_tty->print_cr("Yielded disagrees with occupied:");
@ -1152,8 +1150,8 @@ void HeapRegionRemSet::print_recorded() {
}
gclog_or_tty->print("Added card " PTR_FORMAT " to region [" PTR_FORMAT "...]"
" for ref " PTR_FORMAT ".\n",
_recorded_cards[i], _recorded_regions[i]->bottom(),
_recorded_oops[i]);
p2i(_recorded_cards[i]), p2i(_recorded_regions[i]->bottom()),
p2i(_recorded_oops[i]));
}
}
@ -1240,7 +1238,7 @@ void HeapRegionRemSet::test() {
while (iter.has_next(card_index)) {
HeapWord* card_start =
G1CollectedHeap::heap()->bot_shared()->address_for_index(card_index);
gclog_or_tty->print_cr(" Card " PTR_FORMAT ".", card_start);
gclog_or_tty->print_cr(" Card " PTR_FORMAT ".", p2i(card_start));
sum++;
}
guarantee(sum == 11 - 3 + 2048, "Failure");

13
hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
View File

@ -27,8 +27,6 @@
#include "gc_implementation/g1/heapRegionRemSet.hpp"
#include "gc_implementation/g1/heapRegionSet.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
uint FreeRegionList::_unrealistically_long_length = 0;
void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
@ -84,7 +82,7 @@ void HeapRegionSetBase::verify_end() {
void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
out->cr();
out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
out->print_cr("Set: %s ("PTR_FORMAT")", name(), p2i(this));
out->print_cr(" Region Assumptions");
out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous()));
out->print_cr(" free : %s", BOOL_TO_STR(regions_free()));
@ -106,7 +104,7 @@ void FreeRegionList::set_unrealistically_long_length(uint len) {
}
void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail);
msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, p2i(_head), p2i(_tail));
}
void FreeRegionList::remove_all() {
@ -277,8 +275,8 @@ void FreeRegionList::clear() {
void FreeRegionList::print_on(outputStream* out, bool print_contents) {
HeapRegionSetBase::print_on(out, print_contents);
out->print_cr(" Linking");
out->print_cr(" head : "PTR_FORMAT, _head);
out->print_cr(" tail : "PTR_FORMAT, _tail);
out->print_cr(" head : "PTR_FORMAT, p2i(_head));
out->print_cr(" tail : "PTR_FORMAT, p2i(_tail));
if (print_contents) {
out->print_cr(" Contents");
@ -306,7 +304,8 @@ void FreeRegionList::verify_list() {
count++;
guarantee(count < _unrealistically_long_length,
hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u", name(), count, curr, prev0, prev1, length()));
hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u",
name(), count, p2i(curr), p2i(prev0), p2i(prev1), length()));
if (curr->next() != NULL) {
guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");

4
hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp
View File

@ -32,8 +32,6 @@
#include "runtime/thread.hpp"
#include "runtime/vmThread.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
void ObjPtrQueue::flush() {
// The buffer might contain refs into the CSet. We have to filter it
// first before we flush it, otherwise we might end up with an
@ -182,7 +180,7 @@ void ObjPtrQueue::print(const char* name,
void** buf, size_t index, size_t sz) {
gclog_or_tty->print_cr(" SATB BUFFER [%s] buf: "PTR_FORMAT" "
"index: "SIZE_FORMAT" sz: "SIZE_FORMAT,
name, buf, index, sz);
name, p2i(buf), index, sz);
}
#endif // PRODUCT

2
hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp
View File

@ -29,8 +29,6 @@
#include "gc_implementation/g1/survRateGroup.hpp"
#include "memory/allocation.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
SurvRateGroup::SurvRateGroup(G1CollectorPolicy* g1p,
const char* name,
size_t summary_surv_rates_len) :

12
hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp
View File

@ -36,8 +36,6 @@
#include "runtime/virtualspace.hpp"
#include "runtime/vmThread.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
void CardTableModRefBS::non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr,
OopsInGenClosure* cl,
CardTableRS* ct,
@ -153,8 +151,7 @@ process_stride(Space* sp,
// result of the dirty card iteration below.
OrderAccess::storestore();
// We do not call the non_clean_card_iterate_serial() version because
// we want to clear the cards: clear_cl here does the work of finding
// We want to clear the cards: clear_cl here does the work of finding
// contiguous dirty ranges of cards to process and clear.
clear_cl.do_MemRegion(chunk_mr);
@ -376,13 +373,14 @@ process_chunk_boundaries(Space* sp,
" does not exceed used.end() = " PTR_FORMAT ","
" yet last_chunk_index_to_check " INTPTR_FORMAT
" exceeds last_chunk_index " INTPTR_FORMAT,
last_block, last_block + last_block_size,
used.end(),
p2i(last_block), p2i(last_block + last_block_size),
p2i(used.end()),
last_chunk_index_to_check, last_chunk_index));
assert(sp->used_region().end() > used.end(),
err_msg("Expansion did not happen: "
"[" PTR_FORMAT "," PTR_FORMAT ") -> [" PTR_FORMAT "," PTR_FORMAT ")",
sp->used_region().start(), sp->used_region().end(), used.start(), used.end()));
p2i(sp->used_region().start()), p2i(sp->used_region().end()),
p2i(used.start()), p2i(used.end())));
NOISY(tty->print_cr(" process_chunk_boundary: heap expanded; explicitly bounding last_chunk");)
last_chunk_index_to_check = last_chunk_index;
}

5
hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
View File

@ -46,7 +46,6 @@
#include "memory/space.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/handles.hpp"
#include "runtime/handles.inline.hpp"
@ -56,8 +55,6 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/workgroup.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
@ -1213,7 +1210,7 @@ oop ParNewGeneration::copy_to_survivor_space(
if (TraceScavenge) {
gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}",
is_in_reserved(new_obj) ? "copying" : "tenuring",
new_obj->klass()->internal_name(), (void *)old, (void *)new_obj, new_obj->size());
new_obj->klass()->internal_name(), p2i(old), p2i(new_obj), new_obj->size());
}
#endif

7
hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp
View File

@ -26,12 +26,11 @@
#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
#include "gc_implementation/parallelScavenge/psTasks.hpp"
#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.psgc.inline.hpp"
#include "runtime/prefetch.inline.hpp"
// Checks an individual oop for missing precise marks. Mark
@ -291,7 +290,7 @@ void CardTableExtension::scavenge_contents_parallel(ObjectStartArray* start_arra
Prefetch::write(p, interval);
oop m = oop(p);
assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
m->push_contents(pm);
pm->push_contents(m);
p += m->size();
}
pm->drain_stacks_cond_depth();
@ -299,7 +298,7 @@ void CardTableExtension::scavenge_contents_parallel(ObjectStartArray* start_arra
while (p < to) {
oop m = oop(p);
assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
m->push_contents(pm);
pm->push_contents(m);
p += m->size();
}
pm->drain_stacks_cond_depth();

56
hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp
View File

@ -32,8 +32,6 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/orderAccess.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
//
// GCTask
//
@ -101,7 +99,7 @@ void GCTask::destruct() {
NOT_PRODUCT(
void GCTask::print(const char* message) const {
tty->print(INTPTR_FORMAT " <- " INTPTR_FORMAT "(%u) -> " INTPTR_FORMAT,
newer(), this, affinity(), older());
p2i(newer()), p2i(this), affinity(), p2i(older()));
}
)
@ -113,7 +111,7 @@ GCTaskQueue* GCTaskQueue::create() {
GCTaskQueue* result = new GCTaskQueue(false);
if (TraceGCTaskQueue) {
tty->print_cr("GCTaskQueue::create()"
" returns " INTPTR_FORMAT, result);
" returns " INTPTR_FORMAT, p2i(result));
}
return result;
}
@ -123,7 +121,7 @@ GCTaskQueue* GCTaskQueue::create_on_c_heap() {
if (TraceGCTaskQueue) {
tty->print_cr("GCTaskQueue::create_on_c_heap()"
" returns " INTPTR_FORMAT,
result);
p2i(result));
}
return result;
}
@ -134,7 +132,7 @@ GCTaskQueue::GCTaskQueue(bool on_c_heap) :
if (TraceGCTaskQueue) {
tty->print_cr("[" INTPTR_FORMAT "]"
" GCTaskQueue::GCTaskQueue() constructor",
this);
p2i(this));
}
}
@ -147,7 +145,7 @@ void GCTaskQueue::destroy(GCTaskQueue* that) {
tty->print_cr("[" INTPTR_FORMAT "]"
" GCTaskQueue::destroy()"
" is_c_heap_obj: %s",
that,
p2i(that),
that->is_c_heap_obj() ? "true" : "false");
}
// That instance may have been allocated as a CHeapObj,
@ -173,7 +171,7 @@ void GCTaskQueue::enqueue(GCTask* task) {
tty->print_cr("[" INTPTR_FORMAT "]"
" GCTaskQueue::enqueue(task: "
INTPTR_FORMAT ")",
this, task);
p2i(this), p2i(task));
print("before:");
}
assert(task != NULL, "shouldn't have null task");
@ -200,7 +198,7 @@ void GCTaskQueue::enqueue(GCTaskQueue* list) {
tty->print_cr("[" INTPTR_FORMAT "]"
" GCTaskQueue::enqueue(list: "
INTPTR_FORMAT ")",
this, list);
p2i(this), p2i(list));
print("before:");
list->print("list:");
}
@ -234,14 +232,14 @@ void GCTaskQueue::enqueue(GCTaskQueue* list) {
GCTask* GCTaskQueue::dequeue() {
if (TraceGCTaskQueue) {
tty->print_cr("[" INTPTR_FORMAT "]"
" GCTaskQueue::dequeue()", this);
" GCTaskQueue::dequeue()", p2i(this));
print("before:");
}
assert(!is_empty(), "shouldn't dequeue from empty list");
GCTask* result = remove();
assert(result != NULL, "shouldn't have NULL task");
if (TraceGCTaskQueue) {
tty->print_cr(" return: " INTPTR_FORMAT, result);
tty->print_cr(" return: " INTPTR_FORMAT, p2i(result));
print("after:");
}
return result;
@ -251,7 +249,7 @@ GCTask* GCTaskQueue::dequeue() {
GCTask* GCTaskQueue::dequeue(uint affinity) {
if (TraceGCTaskQueue) {
tty->print_cr("[" INTPTR_FORMAT "]"
" GCTaskQueue::dequeue(%u)", this, affinity);
" GCTaskQueue::dequeue(%u)", p2i(this), affinity);
print("before:");
}
assert(!is_empty(), "shouldn't dequeue from empty list");
@ -275,7 +273,7 @@ GCTask* GCTaskQueue::dequeue(uint affinity) {
result = remove();
}
if (TraceGCTaskQueue) {
tty->print_cr(" return: " INTPTR_FORMAT, result);
tty->print_cr(" return: " INTPTR_FORMAT, p2i(result));
print("after:");
}
return result;
@ -345,7 +343,7 @@ void GCTaskQueue::print(const char* message) const {
" remove_end: " INTPTR_FORMAT
" length: %d"
" %s",
this, insert_end(), remove_end(), length(), message);
p2i(this), p2i(insert_end()), p2i(remove_end()), length(), message);
uint count = 0;
for (GCTask* element = insert_end();
element != NULL;
@ -486,7 +484,7 @@ void GCTaskManager::set_active_gang() {
assert(!all_workers_active() || active_workers() == ParallelGCThreads,
err_msg("all_workers_active() is incorrect: "
"active %d ParallelGCThreads %d", active_workers(),
"active %d ParallelGCThreads " UINTX_FORMAT, active_workers(),
ParallelGCThreads));
if (TraceDynamicGCThreads) {
gclog_or_tty->print_cr("GCTaskManager::set_active_gang(): "
@ -598,7 +596,7 @@ void GCTaskManager::add_task(GCTask* task) {
MutexLockerEx ml(monitor(), Mutex::_no_safepoint_check_flag);
if (TraceGCTaskManager) {
tty->print_cr("GCTaskManager::add_task(" INTPTR_FORMAT " [%s])",
task, GCTask::Kind::to_string(task->kind()));
p2i(task), GCTask::Kind::to_string(task->kind()));
}
queue()->enqueue(task);
// Notify with the lock held to avoid missed notifies.
@ -678,7 +676,7 @@ GCTask* GCTaskManager::get_task(uint which) {
assert(result != NULL, "shouldn't have null task");
if (TraceGCTaskManager) {
tty->print_cr("GCTaskManager::get_task(%u) => " INTPTR_FORMAT " [%s]",
which, result, GCTask::Kind::to_string(result->kind()));
which, p2i(result), GCTask::Kind::to_string(result->kind()));
tty->print_cr(" %s", result->name());
}
if (!result->is_idle_task()) {
@ -864,7 +862,7 @@ void IdleGCTask::do_it(GCTaskManager* manager, uint which) {
tty->print_cr("[" INTPTR_FORMAT "]"
" IdleGCTask:::do_it()"
" should_wait: %s",
this, wait_for_task->should_wait() ? "true" : "false");
p2i(this), wait_for_task->should_wait() ? "true" : "false");
}
MutexLockerEx ml(manager->monitor(), Mutex::_no_safepoint_check_flag);
if (TraceDynamicGCThreads) {
@ -878,7 +876,7 @@ void IdleGCTask::do_it(GCTaskManager* manager, uint which) {
tty->print_cr("[" INTPTR_FORMAT "]"
" IdleGCTask::do_it()"
" [" INTPTR_FORMAT "] (%s)->wait()",
this, manager->monitor(), manager->monitor()->name());
p2i(this), p2i(manager->monitor()), manager->monitor()->name());
}
manager->monitor()->wait(Mutex::_no_safepoint_check_flag, 0);
}
@ -890,7 +888,7 @@ void IdleGCTask::do_it(GCTaskManager* manager, uint which) {
tty->print_cr("[" INTPTR_FORMAT "]"
" IdleGCTask::do_it() returns"
" should_wait: %s",
this, wait_for_task->should_wait() ? "true" : "false");
p2i(this), wait_for_task->should_wait() ? "true" : "false");
}
// Release monitor().
}
@ -1000,7 +998,7 @@ WaitForBarrierGCTask::WaitForBarrierGCTask(bool on_c_heap) :
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::WaitForBarrierGCTask()"
" monitor: " INTPTR_FORMAT,
this, monitor());
p2i(this), p2i(monitor()));
}
}
@ -1011,9 +1009,9 @@ void WaitForBarrierGCTask::destroy(WaitForBarrierGCTask* that) {
" WaitForBarrierGCTask::destroy()"
" is_c_heap_obj: %s"
" monitor: " INTPTR_FORMAT,
that,
p2i(that),
that->is_c_heap_obj() ? "true" : "false",
that->monitor());
p2i(that->monitor()));
}
that->destruct();
if (that->is_c_heap_obj()) {
@ -1028,7 +1026,7 @@ void WaitForBarrierGCTask::destruct() {
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::destruct()"
" monitor: " INTPTR_FORMAT,
this, monitor());
p2i(this), p2i(monitor()));
}
this->BarrierGCTask::destruct();
// Clean up that should be in the destructor,
@ -1044,7 +1042,7 @@ void WaitForBarrierGCTask::do_it(GCTaskManager* manager, uint which) {
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::do_it() waiting for idle"
" monitor: " INTPTR_FORMAT,
this, monitor());
p2i(this), p2i(monitor()));
}
{
// First, wait for the barrier to arrive.
@ -1062,7 +1060,7 @@ void WaitForBarrierGCTask::do_it(GCTaskManager* manager, uint which) {
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::do_it()"
" [" INTPTR_FORMAT "] (%s)->notify_all()",
this, monitor(), monitor()->name());
p2i(this), p2i(monitor()), monitor()->name());
}
monitor()->notify_all();
// Release monitor().
@ -1074,7 +1072,7 @@ void WaitForBarrierGCTask::wait_for(bool reset) {
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::wait_for()"
" should_wait: %s",
this, should_wait() ? "true" : "false");
p2i(this), should_wait() ? "true" : "false");
}
{
// Grab the lock and check again.
@ -1084,7 +1082,7 @@ void WaitForBarrierGCTask::wait_for(bool reset) {
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::wait_for()"
" [" INTPTR_FORMAT "] (%s)->wait()",
this, monitor(), monitor()->name());
p2i(this), p2i(monitor()), monitor()->name());
}
monitor()->wait(Mutex::_no_safepoint_check_flag, 0);
}
@ -1096,7 +1094,7 @@ void WaitForBarrierGCTask::wait_for(bool reset) {
tty->print_cr("[" INTPTR_FORMAT "]"
" WaitForBarrierGCTask::wait_for() returns"
" should_wait: %s",
this, should_wait() ? "true" : "false");
p2i(this), should_wait() ? "true" : "false");
}
// Release monitor().
}

4
hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp
View File

@ -34,8 +34,6 @@
#include "runtime/os.hpp"
#include "runtime/thread.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
GCTaskThread::GCTaskThread(GCTaskManager* manager,
uint which,
uint processor_id) :
@ -79,7 +77,7 @@ void GCTaskThread::print_task_time_stamps() {
tty->print_cr("GC-Thread %u entries: %d", id(), _time_stamp_index);
for(uint i=0; i<_time_stamp_index; i++) {
GCTaskTimeStamp* time_stamp = time_stamp_at(i);
tty->print_cr("\t[ %s " INT64_FORMAT " " INT64_FORMAT " ]",
tty->print_cr("\t[ %s " JLONG_FORMAT " " JLONG_FORMAT " ]",
time_stamp->name(),
time_stamp->entry_time(),
time_stamp->exit_time());

11
hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
View File

@ -203,17 +203,6 @@ bool ParallelScavengeHeap::is_scavengable(const void* addr) {
return is_in_young((oop)addr);
}
#ifdef ASSERT
// Don't implement this by using is_in_young(). This method is used
// in some cases to check that is_in_young() is correct.
bool ParallelScavengeHeap::is_in_partial_collection(const void *p) {
assert(is_in_reserved(p) || p == NULL,
"Does not work if address is non-null and outside of the heap");
// The order of the generations is old (low addr), young (high addr)
return p >= old_gen()->reserved().end();
}
#endif
// There are two levels of allocation policy here.
//
// When an allocation request fails, the requesting thread must invoke a VM

8
hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2013, 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
@ -83,7 +83,7 @@ class ParallelScavengeHeap : public CollectedHeap {
MarkSweep
};
ParallelScavengeHeap::Name kind() const {
virtual Name kind() const {
return CollectedHeap::ParallelScavengeHeap;
}
@ -141,10 +141,6 @@ class ParallelScavengeHeap : public CollectedHeap {
bool is_in_reserved(const void* p) const;
#ifdef ASSERT
virtual bool is_in_partial_collection(const void *p);
#endif
bool is_in_young(oop p); // reserved part
bool is_in_old(oop p); // reserved part

17
hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
View File

@ -27,6 +27,7 @@
#include "code/codeCache.hpp"
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/pcTasks.hpp"
#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
#include "gc_implementation/shared/gcTimer.hpp"
#include "gc_implementation/shared/gcTraceTime.hpp"
@ -34,7 +35,6 @@
#include "memory/universe.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "prims/jvmtiExport.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/jniHandles.hpp"
@ -42,8 +42,6 @@
#include "runtime/vmThread.hpp"
#include "services/management.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
//
// ThreadRootsMarkingTask
//
@ -221,12 +219,11 @@ void StealMarkingTask::do_it(GCTaskManager* manager, uint which) {
int random_seed = 17;
do {
while (ParCompactionManager::steal_objarray(which, &random_seed, task)) {
ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
k->oop_follow_contents(cm, task.obj(), task.index());
cm->follow_contents((objArrayOop)task.obj(), task.index());
cm->follow_marking_stacks();
}
while (ParCompactionManager::steal(which, &random_seed, obj)) {
obj->follow_contents(cm);
cm->follow_contents(obj);
cm->follow_marking_stacks();
}
} while (!terminator()->offer_termination());
@ -257,7 +254,7 @@ void StealRegionCompactionTask::do_it(GCTaskManager* manager, uint which) {
which_stack_index = which;
assert(manager->active_workers() == ParallelGCThreads,
err_msg("all_workers_active has been incorrectly set: "
" active %d ParallelGCThreads %d", manager->active_workers(),
" active %d ParallelGCThreads " UINTX_FORMAT, manager->active_workers(),
ParallelGCThreads));
} else {
which_stack_index = ParCompactionManager::pop_recycled_stack_index();
@ -269,7 +266,7 @@ void StealRegionCompactionTask::do_it(GCTaskManager* manager, uint which) {
gclog_or_tty->print_cr("StealRegionCompactionTask::do_it "
"region_stack_index %d region_stack = " PTR_FORMAT " "
" empty (%d) use all workers %d",
which_stack_index, ParCompactionManager::region_list(which_stack_index),
which_stack_index, p2i(ParCompactionManager::region_list(which_stack_index)),
cm->region_stack()->is_empty(),
use_all_workers);
}
@ -336,7 +333,7 @@ void DrainStacksCompactionTask::do_it(GCTaskManager* manager, uint which) {
which_stack_index = which;
assert(manager->active_workers() == ParallelGCThreads,
err_msg("all_workers_active has been incorrectly set: "
" active %d ParallelGCThreads %d", manager->active_workers(),
" active %d ParallelGCThreads " UINTX_FORMAT, manager->active_workers(),
ParallelGCThreads));
} else {
which_stack_index = stack_index();
@ -370,7 +367,7 @@ void DrainStacksCompactionTask::do_it(GCTaskManager* manager, uint which) {
void* old_region_stack = (void*) cm->region_stack();
int old_region_stack_index = cm->region_stack_index();
gclog_or_tty->print_cr("Pushing region stack " PTR_FORMAT "/%d",
old_region_stack, old_region_stack_index);
p2i(old_region_stack), old_region_stack_index);
}
cm->set_region_stack(NULL);

2
hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp
View File

@ -35,8 +35,6 @@
#include <math.h>
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size,
size_t init_promo_size,
size_t init_survivor_size,

12
hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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,12 +28,11 @@
#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psOldGen.hpp"
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "utilities/stack.inline.hpp"
@ -180,17 +179,16 @@ void ParCompactionManager::follow_marking_stacks() {
// Drain the overflow stack first, to allow stealing from the marking stack.
oop obj;
while (marking_stack()->pop_overflow(obj)) {
obj->follow_contents(this);
follow_contents(obj);
}
while (marking_stack()->pop_local(obj)) {
obj->follow_contents(this);
follow_contents(obj);
}
// Process ObjArrays one at a time to avoid marking stack bloat.
ObjArrayTask task;
if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) {
ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
k->oop_follow_contents(this, task.obj(), task.index());
follow_contents((objArrayOop)task.obj(), task.index());
}
} while (!marking_stacks_empty());

6
hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -196,6 +196,10 @@ private:
// Process tasks remaining on any stack
void drain_region_stacks();
void follow_contents(oop obj);
void follow_contents(objArrayOop array, int index);
void update_contents(oop obj);
};
inline ParCompactionManager* ParCompactionManager::manager_array(int index) {

17
hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 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
@ -27,6 +27,8 @@
#include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
void ParCompactionManager::push_objarray(oop obj, size_t index)
{
@ -46,4 +48,17 @@ void ParCompactionManager::push_region(size_t index)
region_stack()->push(index);
}
inline void ParCompactionManager::follow_contents(oop obj) {
obj->follow_contents(this);
}
inline void ParCompactionManager::follow_contents(objArrayOop obj, int index) {
ObjArrayKlass* k = (ObjArrayKlass*)obj->klass();
k->oop_follow_contents(this, obj, index);
}
inline void ParCompactionManager::update_contents(oop obj) {
obj->update_contents(this);
}
#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP

4
hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
View File

@ -54,8 +54,6 @@
#include "utilities/events.hpp"
#include "utilities/stack.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
elapsedTimer PSMarkSweep::_accumulated_time;
jlong PSMarkSweep::_time_of_last_gc = 0;
CollectorCounters* PSMarkSweep::_counters = NULL;
@ -670,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc() {
jlong ret_val = now - _time_of_last_gc;
// XXX See note in genCollectedHeap::millis_since_last_gc().
if (ret_val < 0) {
NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
NOT_PRODUCT(warning("time warp: " JLONG_FORMAT, ret_val);)
return 0;
}
return ret_val;

6
hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2013, 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
@ -303,7 +303,7 @@ void PSMarkSweepDecorator::adjust_pointers() {
while (q < end) {
// point all the oops to the new location
size_t size = oop(q)->adjust_pointers();
size_t size = MarkSweep::adjust_pointers(oop(q));
q += size;
}
@ -324,7 +324,7 @@ void PSMarkSweepDecorator::adjust_pointers() {
if (oop(q)->is_gc_marked()) {
// q is alive
// point all the oops to the new location
size_t size = oop(q)->adjust_pointers();
size_t size = MarkSweep::adjust_pointers(oop(q));
debug_only(prev_q = q);
q += size;
} else {

8
hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
View File

@ -33,8 +33,6 @@
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
inline const char* PSOldGen::select_name() {
return UseParallelOldGC ? "ParOldGen" : "PSOldGen";
}
@ -440,9 +438,9 @@ void PSOldGen::print_on(outputStream* st) const {
capacity_in_bytes()/K, used_in_bytes()/K);
}
st->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
virtual_space()->low_boundary(),
virtual_space()->high(),
virtual_space()->high_boundary());
p2i(virtual_space()->low_boundary()),
p2i(virtual_space()->high()),
p2i(virtual_space()->high_boundary()));
st->print(" object"); object_space()->print_on(st);
}

58
hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
View File

@ -50,7 +50,6 @@
#include "memory/referenceProcessor.hpp"
#include "oops/methodData.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/safepoint.hpp"
@ -63,8 +62,6 @@
#include <math.h>
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
// All sizes are in HeapWords.
const size_t ParallelCompactData::Log2RegionSize = 16; // 64K words
const size_t ParallelCompactData::RegionSize = (size_t)1 << Log2RegionSize;
@ -223,7 +220,7 @@ print_generic_summary_region(size_t i, const ParallelCompactData::RegionData* c)
REGION_IDX_FORMAT " " PTR_FORMAT " "
REGION_DATA_FORMAT " " REGION_DATA_FORMAT " "
REGION_DATA_FORMAT " " REGION_IDX_FORMAT " %d",
i, c->data_location(), dci, c->destination(),
i, p2i(c->data_location()), dci, p2i(c->destination()),
c->partial_obj_size(), c->live_obj_size(),
c->data_size(), c->source_region(), c->destination_count());
@ -273,7 +270,7 @@ print_initial_summary_region(size_t i,
tty->print(SIZE_FORMAT_W(5) " " PTR_FORMAT " "
SIZE_FORMAT_W(5) " " SIZE_FORMAT_W(5) " "
SIZE_FORMAT_W(5) " " SIZE_FORMAT_W(5) " %d",
i, c->destination(),
i, p2i(c->destination()),
c->partial_obj_size(), c->live_obj_size(),
c->data_size(), c->source_region(), c->destination_count());
if (newline) tty->cr();
@ -634,13 +631,13 @@ ParallelCompactData::summarize_split_space(size_t src_region,
const char * split_type = partial_obj_size == 0 ? "easy" : "hard";
gclog_or_tty->print_cr("%s split: src=" PTR_FORMAT " src_c=" SIZE_FORMAT
" pos=" SIZE_FORMAT,
split_type, source_next, split_region,
split_type, p2i(source_next), split_region,
partial_obj_size);
gclog_or_tty->print_cr("%s split: dst=" PTR_FORMAT " dst_c=" SIZE_FORMAT
" tn=" PTR_FORMAT,
split_type, split_destination,
split_type, p2i(split_destination),
addr_to_region_idx(split_destination),
*target_next);
p2i(*target_next));
if (partial_obj_size != 0) {
HeapWord* const po_beg = split_info.destination();
@ -649,8 +646,8 @@ ParallelCompactData::summarize_split_space(size_t src_region,
"po_beg=" PTR_FORMAT " " SIZE_FORMAT " "
"po_end=" PTR_FORMAT " " SIZE_FORMAT,
split_type,
po_beg, addr_to_region_idx(po_beg),
po_end, addr_to_region_idx(po_end));
p2i(po_beg), addr_to_region_idx(po_beg),
p2i(po_end), addr_to_region_idx(po_end));
}
}
@ -667,8 +664,8 @@ bool ParallelCompactData::summarize(SplitInfo& split_info,
HeapWord* const source_next_val = source_next == NULL ? NULL : *source_next;
tty->print_cr("sb=" PTR_FORMAT " se=" PTR_FORMAT " sn=" PTR_FORMAT
"tb=" PTR_FORMAT " te=" PTR_FORMAT " tn=" PTR_FORMAT,
source_beg, source_end, source_next_val,
target_beg, target_end, *target_next);
p2i(source_beg), p2i(source_end), p2i(source_next_val),
p2i(target_beg), p2i(target_end), p2i(*target_next));
}
size_t cur_region = addr_to_region_idx(source_beg);
@ -1133,9 +1130,9 @@ PSParallelCompact::compute_dense_prefix_via_density(const SpaceId id,
const size_t cur_deadwood = pointer_delta(dense_prefix, region_destination);
if (TraceParallelOldGCDensePrefix && Verbose) {
tty->print_cr("c#=" SIZE_FORMAT_W(4) " dst=" PTR_FORMAT " "
"dp=" SIZE_FORMAT_W(8) " " "cdw=" SIZE_FORMAT_W(8),
sd.region(cp), region_destination,
dense_prefix, cur_deadwood);
"dp=" PTR_FORMAT " " "cdw=" SIZE_FORMAT_W(8),
sd.region(cp), p2i(region_destination),
p2i(dense_prefix), cur_deadwood);
}
if (cur_deadwood >= deadwood_goal) {
@ -1201,7 +1198,7 @@ void PSParallelCompact::print_dense_prefix_stats(const char* const algorithm,
"d2l=" SIZE_FORMAT " d2l%%=%6.4f "
"d2r=" SIZE_FORMAT " l2r=" SIZE_FORMAT
" ratio=%10.8f",
algorithm, addr, region_idx,
algorithm, p2i(addr), region_idx,
space_live,
dead_to_left, dead_to_left_pct,
dead_to_right, live_to_right,
@ -1469,7 +1466,7 @@ PSParallelCompact::fill_with_live_objects(SpaceId id, HeapWord* const start,
{
if (TraceParallelOldGCSummaryPhase) {
tty->print_cr("fill_with_live_objects [" PTR_FORMAT " " PTR_FORMAT ") "
SIZE_FORMAT, start, start + words, words);
SIZE_FORMAT, p2i(start), p2i(start + words), words);
}
ObjectStartArray* const start_array = _space_info[id].start_array();
@ -1811,9 +1808,9 @@ PSParallelCompact::summarize_space(SpaceId id, bool maximum_compaction)
tty->print_cr("id=%d cap=" SIZE_FORMAT " dp=" PTR_FORMAT " "
"dp_region=" SIZE_FORMAT " " "dp_count=" SIZE_FORMAT " "
"cr_count=" SIZE_FORMAT " " "nt=" PTR_FORMAT,
id, space->capacity_in_words(), dense_prefix_end,
id, space->capacity_in_words(), p2i(dense_prefix_end),
dp_region, dp_words / region_size,
cr_words / region_size, new_top);
cr_words / region_size, p2i(new_top));
}
}
@ -1831,10 +1828,10 @@ void PSParallelCompact::summary_phase_msg(SpaceId dst_space_id,
SIZE_FORMAT "-" SIZE_FORMAT,
src_space_id, space_names[src_space_id],
dst_space_id, space_names[dst_space_id],
src_beg, src_end,
p2i(src_beg), p2i(src_end),
_summary_data.addr_to_region_idx(src_beg),
_summary_data.addr_to_region_idx(src_end),
dst_beg, dst_end,
p2i(dst_beg), p2i(dst_end),
_summary_data.addr_to_region_idx(dst_beg),
_summary_data.addr_to_region_idx(dst_end));
}
@ -2234,8 +2231,8 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
heap->trace_heap_after_gc(&_gc_tracer);
if (PrintGCTaskTimeStamps) {
gclog_or_tty->print_cr("VM-Thread " INT64_FORMAT " " INT64_FORMAT " "
INT64_FORMAT,
gclog_or_tty->print_cr("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " "
JLONG_FORMAT,
marking_start.ticks(), compaction_start.ticks(),
collection_exit.ticks());
gc_task_manager()->print_task_time_stamps();
@ -2754,7 +2751,7 @@ void PSParallelCompact::verify_complete(SpaceId space_id) {
const RegionData* const c = sd.region(cur_region);
if (!c->completed()) {
warning("region " SIZE_FORMAT " not filled: "
"destination_count=" SIZE_FORMAT,
"destination_count=%u",
cur_region, c->destination_count());
issued_a_warning = true;
}
@ -2764,7 +2761,7 @@ void PSParallelCompact::verify_complete(SpaceId space_id) {
const RegionData* const c = sd.region(cur_region);
if (!c->available()) {
warning("region " SIZE_FORMAT " not empty: "
"destination_count=" SIZE_FORMAT,
"destination_count=%u",
cur_region, c->destination_count());
issued_a_warning = true;
}
@ -2776,6 +2773,11 @@ void PSParallelCompact::verify_complete(SpaceId space_id) {
}
#endif // #ifdef ASSERT
inline void UpdateOnlyClosure::do_addr(HeapWord* addr) {
_start_array->allocate_block(addr);
compaction_manager()->update_contents(oop(addr));
}
// Update interior oops in the ranges of regions [beg_region, end_region).
void
PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm,
@ -2876,7 +2878,7 @@ void PSParallelCompact::update_deferred_objects(ParCompactionManager* cm,
if (start_array != NULL) {
start_array->allocate_block(addr);
}
oop(addr)->update_contents(cm);
cm->update_contents(oop(addr));
assert(oop(addr)->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(oop(addr))));
}
}
@ -3294,7 +3296,7 @@ jlong PSParallelCompact::millis_since_last_gc() {
jlong ret_val = now - _time_of_last_gc;
// XXX See note in genCollectedHeap::millis_since_last_gc().
if (ret_val < 0) {
NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
NOT_PRODUCT(warning("time warp: " JLONG_FORMAT, ret_val);)
return 0;
}
return ret_val;
@ -3360,7 +3362,7 @@ MoveAndUpdateClosure::do_addr(HeapWord* addr, size_t words) {
}
oop moved_oop = (oop) destination();
moved_oop->update_contents(compaction_manager());
compaction_manager()->update_contents(moved_oop);
assert(moved_oop->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(moved_oop)));
update_state(words);

26
hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
View File

@ -1025,9 +1025,6 @@ class PSParallelCompact : AllStatic {
bool maximum_heap_compaction,
ParallelOldTracer *gc_tracer);
template <class T>
static inline void follow_root(ParCompactionManager* cm, T* p);
// Compute the dense prefix for the designated space. This is an experimental
// implementation currently not used in production.
static HeapWord* compute_dense_prefix_via_density(const SpaceId id,
@ -1335,23 +1332,6 @@ inline bool PSParallelCompact::is_marked(oop obj) {
return mark_bitmap()->is_marked(obj);
}
template <class T>
inline void PSParallelCompact::follow_root(ParCompactionManager* cm, T* p) {
assert(!Universe::heap()->is_in_reserved(p),
"roots shouldn't be things within the heap");
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (mark_bitmap()->is_unmarked(obj)) {
if (mark_obj(obj)) {
obj->follow_contents(cm);
}
}
}
cm->follow_marking_stacks();
}
template <class T>
inline void PSParallelCompact::mark_and_push(ParCompactionManager* cm, T* p) {
T heap_oop = oopDesc::load_heap_oop(p);
@ -1524,12 +1504,6 @@ class UpdateOnlyClosure: public ParMarkBitMapClosure {
inline void do_addr(HeapWord* addr);
};
inline void UpdateOnlyClosure::do_addr(HeapWord* addr)
{
_start_array->allocate_block(addr);
oop(addr)->update_contents(compaction_manager());
}
class FillClosure: public ParMarkBitMapClosure
{
public:

7
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
View File

@ -33,11 +33,8 @@
#include "memory/memRegion.hpp"
#include "memory/padded.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.psgc.inline.hpp"
#include "utilities/stack.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
PaddedEnd<PSPromotionManager>* PSPromotionManager::_manager_array = NULL;
OopStarTaskQueueSet* PSPromotionManager::_stack_array_depth = NULL;
PSOldGen* PSPromotionManager::_old_gen = NULL;
@ -325,7 +322,7 @@ oop PSPromotionManager::oop_promotion_failed(oop obj, markOop obj_mark) {
_promotion_failed_info.register_copy_failure(obj->size());
obj->push_contents(this);
push_contents(obj);
// Save the mark if needed
PSScavenge::oop_promotion_failed(obj, obj_mark);
@ -342,7 +339,7 @@ oop PSPromotionManager::oop_promotion_failed(oop obj, markOop obj_mark) {
gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " (%d)}",
"promotion-failure",
obj->klass()->internal_name(),
(void *)obj, obj->size());
p2i(obj), obj->size());
}
#endif

4
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, 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
@ -212,6 +212,8 @@ class PSPromotionManager VALUE_OBJ_CLASS_SPEC {
template <class T> inline void claim_or_forward_depth(T* p);
TASKQUEUE_STATS_ONLY(inline void record_steal(StarTask& p);)
void push_contents(oop obj);
};
#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP

7
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2014, 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
@ -91,6 +91,9 @@ inline void PSPromotionManager::promotion_trace_event(oop new_obj, oop old_obj,
}
}
inline void PSPromotionManager::push_contents(oop obj) {
obj->push_contents(this);
}
//
// This method is pretty bulky. It would be nice to split it up
// into smaller submethods, but we need to be careful not to hurt
@ -227,7 +230,7 @@ oop PSPromotionManager::copy_to_survivor_space(oop o) {
TASKQUEUE_STATS_ONLY(++_arrays_chunked; ++_masked_pushes);
} else {
// we'll just push its contents
new_obj->push_contents(this);
push_contents(new_obj);
}
} else {
// We lost, someone else "owns" this object

9
hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
View File

@ -46,7 +46,6 @@
#include "memory/referenceProcessor.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.psgc.inline.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/handles.inline.hpp"
@ -56,8 +55,6 @@
#include "services/memoryService.hpp"
#include "utilities/stack.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
HeapWord* PSScavenge::_to_space_top_before_gc = NULL;
int PSScavenge::_consecutive_skipped_scavenges = 0;
ReferenceProcessor* PSScavenge::_ref_processor = NULL;
@ -551,8 +548,8 @@ bool PSScavenge::invoke_no_policy() {
if (PrintTenuringDistribution) {
gclog_or_tty->cr();
gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold "
UINTX_FORMAT " (max threshold " UINTX_FORMAT ")",
gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold %u"
" (max threshold " UINTX_FORMAT ")",
size_policy->calculated_survivor_size_in_bytes(),
_tenuring_threshold, MaxTenuringThreshold);
}
@ -694,7 +691,7 @@ bool PSScavenge::invoke_no_policy() {
scavenge_exit.update();
if (PrintGCTaskTimeStamps) {
tty->print_cr("VM-Thread " INT64_FORMAT " " INT64_FORMAT " " INT64_FORMAT,
tty->print_cr("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " " JLONG_FORMAT,
scavenge_entry.ticks(), scavenge_midpoint.ticks(),
scavenge_exit.ticks());
gc_task_manager()->print_task_time_stamps();

1
hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
View File

@ -35,7 +35,6 @@
#include "memory/iterator.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.psgc.inline.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/thread.hpp"
#include "runtime/vmThread.hpp"

Some files were not shown because too many files have changed in this diff Show More