From 82dae2bcb8c196ecce63abff041d02acbd086c50 Mon Sep 17 00:00:00 2001 From: Jason Feng Date: Fri, 27 Sep 2019 15:27:59 -0400 Subject: [PATCH] Re-organize com.ibm.tools.attach.target classes Moved com.ibm.tools.attach.target to openj9.internal; Also moved openj9.tools.attach.diagnostics.base to openj9.internal.tools.attach.diagnostics.base; Updated references accordingly. Signed-off-by: Jason Feng --- .../share/classes/module-info.java.extra | 4 +- .../base/DiagnosticProperties.java | 4 +- .../diagnostics/base/DiagnosticUtils.java | 4 +- .../tools/attach/target/Advertisement.java | 8 ++-- .../tools/attach/target/AttachHandler.java | 10 ++-- .../tools/attach/target/Attachment.java | 10 ++-- .../attach/target/AttachmentConnection.java | 4 +- .../tools/attach/target/Command.java | 4 +- .../tools/attach/target/CommonDirectory.java | 8 ++-- .../tools/attach/target/FileLock.java | 8 ++-- .../tools/attach/target/FilelockTimer.java | 4 +- .../internal}/tools/attach/target/IPC.java | 6 +-- .../IbmAttachOperationFailedException.java | 2 +- .../internal}/tools/attach/target/Reply.java | 6 +-- .../tools/attach/target/Response.java | 6 +-- .../tools/attach/target/TargetDirectory.java | 8 ++-- .../tools/attach/target/WaitLoop.java | 8 ++-- .../tools/attach/target/package-info.java | 4 +- .../attach/attacher/OpenJ9AttachProvider.java | 10 ++-- .../attach/attacher/OpenJ9VirtualMachine.java | 23 +++++---- .../OpenJ9VirtualMachineDescriptor.java | 6 +-- .../attacher/AttacherDiagnosticsProvider.java | 6 +-- .../tools/attach/diagnostics/tools/Jcmd.java | 2 +- .../tools/attach/diagnostics/tools/Jmap.java | 8 ++-- .../attach/diagnostics/tools/Jstack.java | 8 ++-- .../tools/attach/diagnostics/tools/Util.java | 4 +- .../ExtendedOperatingSystemMXBeanImpl.java | 2 +- .../internal/ExtendedRuntimeMXBeanImpl.java | 2 +- runtime/jcl/common/attach.c | 42 ++++++++-------- runtime/jcl/common/dump.c | 2 +- runtime/jcl/common/jclvm.c | 2 +- runtime/jcl/common/mgmtthread.c | 4 +- runtime/jcl/exports.cmake | 46 +++++++++--------- runtime/jcl/uma/attach_exports.xml | 42 ++++++++-------- .../jcl/uma/se6_vm-side_natives_exports.xml | 6 +-- runtime/oti/j9java8packages.gperf | 4 +- runtime/oti/j9java8packages.h | 4 +- runtime/oti/jclprots.h | 48 +++++++++---------- runtime/vm/BytecodeInterpreter.hpp | 2 +- runtime/vm/bindnatv.cpp | 2 +- runtime/vm/jniinv.c | 2 +- test/functional/JLM_Tests/build.xml | 2 +- test/functional/Java10andUp/build.xml | 2 +- test/functional/Java11andUp/build.xml | 2 +- test/functional/Java8andUp/build.xml | 2 +- test/functional/Java8andUp/playlist.xml | 4 +- .../openj9/test/fileLock/NativeFileLock.java | 4 +- test/functional/Java9andUp/build.xml | 2 +- .../openj9/test/attachAPI/TargetManager.java | 8 ++-- .../cmdLineTests/jvmtitests/build.xml | 2 +- .../ibm/jvmti/tests/util/attachingAgent.java | 4 +- 51 files changed, 208 insertions(+), 209 deletions(-) rename jcl/src/java.base/share/classes/openj9/{ => internal}/tools/attach/diagnostics/base/DiagnosticProperties.java (99%) rename jcl/src/java.base/share/classes/openj9/{ => internal}/tools/attach/diagnostics/base/DiagnosticUtils.java (99%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/Advertisement.java (97%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/AttachHandler.java (99%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/Attachment.java (98%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/AttachmentConnection.java (98%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/Command.java (97%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/CommonDirectory.java (98%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/FileLock.java (97%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/FilelockTimer.java (97%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/IPC.java (99%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/IbmAttachOperationFailedException.java (98%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/Reply.java (97%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/Response.java (95%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/TargetDirectory.java (98%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/WaitLoop.java (97%) rename jcl/src/java.base/share/classes/{com/ibm => openj9/internal}/tools/attach/target/package-info.java (99%) diff --git a/jcl/src/java.base/share/classes/module-info.java.extra b/jcl/src/java.base/share/classes/module-info.java.extra index 8ec341a25cd..c7de5925681 100644 --- a/jcl/src/java.base/share/classes/module-info.java.extra +++ b/jcl/src/java.base/share/classes/module-info.java.extra @@ -29,9 +29,9 @@ exports com.ibm.jit.crypto to ibm.crypto.hdwrcca; exports com.ibm.sharedclasses.spi to openj9.sharedclasses, java.management, java.rmi; exports com.ibm.oti.vm to java.management, jdk.attach, jdk.management, openj9.jvm, openj9.sharedclasses; exports com.ibm.oti.util to java.management, jdk.attach, jdk.jcmd, jdk.management, openj9.sharedclasses; -exports com.ibm.tools.attach.target to jdk.attach, jdk.jcmd, jdk.management; +exports openj9.internal.tools.attach.target to jdk.attach, jdk.jcmd, jdk.management; exports openj9.management.internal to java.management, openj9.jvm; -exports openj9.tools.attach.diagnostics.base to jdk.attach, jdk.jcmd; +exports openj9.internal.tools.attach.diagnostics.base to jdk.attach, jdk.jcmd; exports jdk.internal.org.objectweb.asm to openj9.dtfj, openj9.dtfjview; // Following allows dtfj/dtfjview modules invoke module addReads & addExports programmatically via reflection APIs exports jdk.internal.module to openj9.dtfj, openj9.dtfjview; diff --git a/jcl/src/java.base/share/classes/openj9/tools/attach/diagnostics/base/DiagnosticProperties.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/diagnostics/base/DiagnosticProperties.java similarity index 99% rename from jcl/src/java.base/share/classes/openj9/tools/attach/diagnostics/base/DiagnosticProperties.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/diagnostics/base/DiagnosticProperties.java index 5303ee2bbf1..8dac5d4c471 100644 --- a/jcl/src/java.base/share/classes/openj9/tools/attach/diagnostics/base/DiagnosticProperties.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/diagnostics/base/DiagnosticProperties.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package openj9.tools.attach.diagnostics.base; +package openj9.internal.tools.attach.diagnostics.base; import java.io.IOException; import java.io.PrintWriter; @@ -30,7 +30,7 @@ import java.security.PrivilegedAction; import java.util.Comparator; import java.util.Properties; -import com.ibm.tools.attach.target.IPC; +import openj9.internal.tools.attach.target.IPC; /** * Augments Properties with convenience methods to add ints, booleans, and diff --git a/jcl/src/java.base/share/classes/openj9/tools/attach/diagnostics/base/DiagnosticUtils.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/diagnostics/base/DiagnosticUtils.java similarity index 99% rename from jcl/src/java.base/share/classes/openj9/tools/attach/diagnostics/base/DiagnosticUtils.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/diagnostics/base/DiagnosticUtils.java index e4914821f35..72ca23711aa 100644 --- a/jcl/src/java.base/share/classes/openj9/tools/attach/diagnostics/base/DiagnosticUtils.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/diagnostics/base/DiagnosticUtils.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package openj9.tools.attach.diagnostics.base; +package openj9.internal.tools.attach.diagnostics.base; import java.io.PrintWriter; import java.io.StringWriter; @@ -32,7 +32,7 @@ import java.util.function.Predicate; import com.ibm.oti.vm.VM; -import com.ibm.tools.attach.target.IPC; +import openj9.internal.tools.attach.target.IPC; import openj9.management.internal.InvalidDumpOptionExceptionBase; import openj9.management.internal.LockInfoBase; diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Advertisement.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java similarity index 97% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Advertisement.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java index 850971cff30..a70c651381e 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Advertisement.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java @@ -1,5 +1,5 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others * @@ -27,8 +27,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import static com.ibm.tools.attach.target.IPC.loggingStatus; -import static com.ibm.tools.attach.target.IPC.LOGGING_DISABLED; +import static openj9.internal.tools.attach.target.IPC.loggingStatus; +import static openj9.internal.tools.attach.target.IPC.LOGGING_DISABLED; public final class Advertisement { private static final String KEY_ATTACH_NOTIFICATION_SYNC = "attachNotificationSync"; //$NON-NLS-1$ diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachHandler.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java similarity index 99% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachHandler.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java index 917dadc781d..269d9f5007e 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachHandler.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Sidecar16]*/ +/*[INCLUDE-IF Sidecar18-SE]*/ /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others * @@ -21,11 +21,11 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; -import static com.ibm.tools.attach.target.IPC.LOGGING_DISABLED; -import static com.ibm.tools.attach.target.IPC.LOGGING_ENABLED; -import static com.ibm.tools.attach.target.IPC.loggingStatus; +import static openj9.internal.tools.attach.target.IPC.LOGGING_DISABLED; +import static openj9.internal.tools.attach.target.IPC.LOGGING_ENABLED; +import static openj9.internal.tools.attach.target.IPC.loggingStatus; import java.io.File; import java.io.IOException; diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Attachment.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java similarity index 98% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Attachment.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java index 302ac431f91..3bb33e0e5cc 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Attachment.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Sidecar16]*/ +/*[INCLUDE-IF Sidecar18-SE]*/ /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others * @@ -20,7 +20,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; import java.io.ByteArrayInputStream; import java.io.Closeable; @@ -37,14 +37,14 @@ import java.util.Properties; import java.util.ServiceLoader; -import openj9.tools.attach.diagnostics.base.DiagnosticProperties; -import openj9.tools.attach.diagnostics.base.DiagnosticUtils; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticUtils; /*[IF Sidecar19-SE]*/ import jdk.internal.vm.VMSupport; /*[ELSE] Sidecar19-SE import sun.misc.VMSupport; /*[ENDIF] Sidecar19-SE */ -import static com.ibm.tools.attach.target.IPC.LOCAL_CONNECTOR_ADDRESS; +import static openj9.internal.tools.attach.target.IPC.LOCAL_CONNECTOR_ADDRESS; /** * This class handles established connections initiated by another VM diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachmentConnection.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java similarity index 98% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachmentConnection.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java index 77002bd1345..308a30cb742 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/AttachmentConnection.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Sidecar16]*/ +/*[INCLUDE-IF Sidecar18-SE]*/ /******************************************************************************* * Copyright (c) 2009, 2009 IBM Corp. and others * @@ -21,7 +21,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Command.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java similarity index 97% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Command.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java index e541f98bcf6..4f1d7cc3376 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Command.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java @@ -1,5 +1,5 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/CommonDirectory.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java similarity index 98% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/CommonDirectory.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java index a2aa48bf3fa..fafb2ea8336 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/CommonDirectory.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java @@ -1,5 +1,5 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others * @@ -22,8 +22,8 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -import static com.ibm.tools.attach.target.IPC.LOGGING_DISABLED; -import static com.ibm.tools.attach.target.IPC.loggingStatus; +import static openj9.internal.tools.attach.target.IPC.LOGGING_DISABLED; +import static openj9.internal.tools.attach.target.IPC.loggingStatus; import java.io.File; import java.io.FileFilter; diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/FileLock.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java similarity index 97% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/FileLock.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java index d9ad51a76d6..c2ef72a1cf8 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/FileLock.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Sidecar16]*/ +/*[INCLUDE-IF Sidecar18-SE]*/ /******************************************************************************* * Copyright (c) 2010, 2018 IBM Corp. and others * @@ -21,15 +21,15 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.nio.channels.FileChannel; import java.util.TimerTask; -import static com.ibm.tools.attach.target.IPC.LOGGING_DISABLED; -import static com.ibm.tools.attach.target.IPC.loggingStatus; +import static openj9.internal.tools.attach.target.IPC.LOGGING_DISABLED; +import static openj9.internal.tools.attach.target.IPC.loggingStatus; public final class FileLock { long fileDescriptor; diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/FilelockTimer.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java similarity index 97% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/FilelockTimer.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java index 9304ae1652c..efbfb55635b 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/FilelockTimer.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java @@ -1,5 +1,5 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* * Copyright (c) 2009, 2010 IBM Corp. and others diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/IPC.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java similarity index 99% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/IPC.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java index 708b3cc8b3e..66a75afbfd0 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/IPC.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Sidecar16]*/ +/*[INCLUDE-IF Sidecar18-SE]*/ /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others * @@ -21,7 +21,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -46,7 +46,7 @@ import static java.nio.file.attribute.PosixFilePermission.GROUP_WRITE; import static java.nio.file.attribute.PosixFilePermission.OTHERS_READ; import static java.nio.file.attribute.PosixFilePermission.OTHERS_WRITE; -import static openj9.tools.attach.diagnostics.base.DiagnosticProperties.OPENJ9_DIAGNOSTICS_PREFIX; +import static openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties.OPENJ9_DIAGNOSTICS_PREFIX; /** * Utility class for operating system calls diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/IbmAttachOperationFailedException.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java similarity index 98% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/IbmAttachOperationFailedException.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java index 849b287f832..f5d3e2e7349 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/IbmAttachOperationFailedException.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java @@ -1,5 +1,5 @@ /*[INCLUDE-IF Sidecar18-SE]*/ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; import java.io.IOException; /** diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Reply.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java similarity index 97% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Reply.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java index bdaf21e9a55..746b965d047 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Reply.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java @@ -1,7 +1,7 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* - * Copyright (c) 2009, 2018 IBM Corp. and others + * Copyright (c) 2009, 2019 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Response.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java similarity index 95% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Response.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java index 69a06b4c7cf..1e0fe644445 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/Response.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java @@ -1,7 +1,7 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* - * Copyright (c) 2009, 2015 IBM Corp. and others + * Copyright (c) 2009, 2019 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/TargetDirectory.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java similarity index 98% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/TargetDirectory.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java index 7607532696b..5115a062543 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/TargetDirectory.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java @@ -1,5 +1,5 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* * Copyright (c) 2009, 2019 IBM Corp. and others * @@ -24,8 +24,8 @@ import java.io.File; import java.io.IOException; -import static com.ibm.tools.attach.target.IPC.LOGGING_DISABLED; -import static com.ibm.tools.attach.target.IPC.loggingStatus; +import static openj9.internal.tools.attach.target.IPC.LOGGING_DISABLED; +import static openj9.internal.tools.attach.target.IPC.loggingStatus; /** * This class represents the advertisement directory representing a potential attach API target VM. diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/WaitLoop.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java similarity index 97% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/WaitLoop.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java index cac2a594a6f..7c78a42dee7 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/WaitLoop.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java @@ -1,5 +1,5 @@ -/*[INCLUDE-IF Sidecar16]*/ -package com.ibm.tools.attach.target; +/*[INCLUDE-IF Sidecar18-SE]*/ +package openj9.internal.tools.attach.target; /******************************************************************************* * Copyright (c) 2017, 2019 IBM Corp. and others * @@ -23,8 +23,8 @@ *******************************************************************************/ import java.io.IOException; -import static com.ibm.tools.attach.target.IPC.loggingStatus; -import static com.ibm.tools.attach.target.IPC.LOGGING_DISABLED; +import static openj9.internal.tools.attach.target.IPC.loggingStatus; +import static openj9.internal.tools.attach.target.IPC.LOGGING_DISABLED; final class WaitLoop extends Thread { diff --git a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/package-info.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java similarity index 99% rename from jcl/src/java.base/share/classes/com/ibm/tools/attach/target/package-info.java rename to jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java index 75d8433ffde..413a3c3e122 100644 --- a/jcl/src/java.base/share/classes/com/ibm/tools/attach/target/package-info.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Sidecar16]*/ +/*[INCLUDE-IF Sidecar18-SE]*/ /******************************************************************************* * Copyright (c) 2009, 2010 IBM Corp. and others * @@ -144,4 +144,4 @@ *com.ibm.tools.attach.timeoutSpecify the timeout in milliseconds for communication between attacher and attachment. Set to 0 for no timeout. * */ -package com.ibm.tools.attach.target; +package openj9.internal.tools.attach.target; diff --git a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java index 35ae6ebf372..9deacef7fea 100644 --- a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java +++ b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java @@ -32,11 +32,11 @@ import java.util.ArrayList; import java.util.List; -import com.ibm.tools.attach.target.Advertisement; -import com.ibm.tools.attach.target.AttachHandler; -import com.ibm.tools.attach.target.CommonDirectory; -import com.ibm.tools.attach.target.IPC; -import com.ibm.tools.attach.target.TargetDirectory; +import openj9.internal.tools.attach.target.Advertisement; +import openj9.internal.tools.attach.target.AttachHandler; +import openj9.internal.tools.attach.target.CommonDirectory; +import openj9.internal.tools.attach.target.IPC; +import openj9.internal.tools.attach.target.TargetDirectory; import com.sun.tools.attach.AttachNotSupportedException; import com.sun.tools.attach.AttachPermission; import com.sun.tools.attach.VirtualMachineDescriptor; diff --git a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java index b5787156327..2b6d2c54667 100644 --- a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java +++ b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java @@ -42,15 +42,17 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.ibm.tools.attach.target.AttachHandler; -import com.ibm.tools.attach.target.AttachmentConnection; -import com.ibm.tools.attach.target.Command; -import com.ibm.tools.attach.target.CommonDirectory; -import com.ibm.tools.attach.target.FileLock; -import com.ibm.tools.attach.target.IPC; -import com.ibm.tools.attach.target.Reply; -import com.ibm.tools.attach.target.Response; -import com.ibm.tools.attach.target.TargetDirectory; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticUtils; +import openj9.internal.tools.attach.target.AttachHandler; +import openj9.internal.tools.attach.target.AttachmentConnection; +import openj9.internal.tools.attach.target.Command; +import openj9.internal.tools.attach.target.CommonDirectory; +import openj9.internal.tools.attach.target.FileLock; +import openj9.internal.tools.attach.target.IPC; +import openj9.internal.tools.attach.target.Reply; +import openj9.internal.tools.attach.target.Response; +import openj9.internal.tools.attach.target.TargetDirectory; import com.sun.tools.attach.AgentInitializationException; import com.sun.tools.attach.AgentLoadException; import com.sun.tools.attach.AttachNotSupportedException; @@ -59,9 +61,6 @@ import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.spi.AttachProvider; -import openj9.tools.attach.diagnostics.base.DiagnosticProperties; -import openj9.tools.attach.diagnostics.base.DiagnosticUtils; - /** * Handles the initiator end of an attachment to a target VM * diff --git a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java index 44ade64eccf..567985a9d07 100644 --- a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java +++ b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java @@ -25,9 +25,9 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import com.ibm.tools.attach.target.Advertisement; -import com.ibm.tools.attach.target.IPC; -import com.ibm.tools.attach.target.TargetDirectory; +import openj9.internal.tools.attach.target.Advertisement; +import openj9.internal.tools.attach.target.IPC; +import openj9.internal.tools.attach.target.TargetDirectory; import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.spi.AttachProvider; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java index 6eb54e1b193..22979ff532d 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java @@ -30,10 +30,10 @@ import com.ibm.tools.attach.attacher.OpenJ9AttachProvider; import com.ibm.tools.attach.attacher.OpenJ9VirtualMachine; -import com.ibm.tools.attach.target.IPC; -import com.sun.tools.attach.AttachNotSupportedException; -import openj9.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.target.IPC; +import com.sun.tools.attach.AttachNotSupportedException; /** * This class allows a Attach API attacher to query a target JVM about diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java index b92f78ecfe6..9d73ead7cc5 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java @@ -30,8 +30,8 @@ import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.spi.AttachProvider; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticUtils; import openj9.tools.attach.diagnostics.attacher.AttacherDiagnosticsProvider; -import openj9.tools.attach.diagnostics.base.DiagnosticUtils; /** * Jcmd A tool for running diagnostic commands on another Java process diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java index 0537cb26302..e905e5ed280 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java @@ -27,11 +27,11 @@ import java.util.ArrayList; import java.util.List; -import com.ibm.tools.attach.target.AttachHandler; -import com.ibm.tools.attach.target.IPC; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticUtils; +import openj9.internal.tools.attach.target.AttachHandler; +import openj9.internal.tools.attach.target.IPC; import openj9.tools.attach.diagnostics.attacher.AttacherDiagnosticsProvider; -import openj9.tools.attach.diagnostics.base.DiagnosticProperties; -import openj9.tools.attach.diagnostics.base.DiagnosticUtils; /** * JMap A tool for listing heap information about another Java process diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java index 3d45536619b..a04022d830b 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java @@ -29,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -import com.ibm.tools.attach.target.AttachHandler; -import com.ibm.tools.attach.target.IPC; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticUtils; +import openj9.internal.tools.attach.target.AttachHandler; +import openj9.internal.tools.attach.target.IPC; import openj9.tools.attach.diagnostics.attacher.AttacherDiagnosticsProvider; -import openj9.tools.attach.diagnostics.base.DiagnosticProperties; -import openj9.tools.attach.diagnostics.base.DiagnosticUtils; /** * JStack diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java index b6b80dda628..d4b5a3d9e2d 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java @@ -35,14 +35,14 @@ import java.util.Properties; import java.util.stream.Collectors; -import com.ibm.tools.attach.target.IPC; +import openj9.internal.tools.attach.diagnostics.base.DiagnosticProperties; +import openj9.internal.tools.attach.target.IPC; import com.sun.tools.attach.AttachNotSupportedException; import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; import com.sun.tools.attach.spi.AttachProvider; import openj9.tools.attach.diagnostics.attacher.AttacherDiagnosticsProvider; -import openj9.tools.attach.diagnostics.base.DiagnosticProperties; /** * Common functions for diagnostic tools diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java index 8ef2cd1f105..a7c4d712797 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java @@ -607,7 +607,7 @@ private static int getPrecision() { @Override public boolean isProcessRunning(long pid) { com.ibm.java.lang.management.internal.RuntimeMXBeanImpl.checkMonitorPermission(); - return com.ibm.tools.attach.target.IPC.processExists(pid); + return openj9.internal.tools.attach.target.IPC.processExists(pid); } } diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java index d3a4fb963fd..3aaf1d61984 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java @@ -24,7 +24,7 @@ import com.ibm.java.lang.management.internal.RuntimeMXBeanImpl; import com.ibm.lang.management.RuntimeMXBean; -import com.ibm.tools.attach.target.AttachHandler; +import openj9.internal.tools.attach.target.AttachHandler; /** diff --git a/runtime/jcl/common/attach.c b/runtime/jcl/common/attach.c index 97b7cf25b6b..a0d94543205 100644 --- a/runtime/jcl/common/attach.c +++ b/runtime/jcl/common/attach.c @@ -66,7 +66,7 @@ isFileOwnedByMe(JNIEnv *env, const char *pathUTF) { #define TMP_PATH_BUFFER_SIZE 128 jstring JNICALL -Java_com_ibm_tools_attach_target_IPC_getTempDirImpl(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_getTempDirImpl(JNIEnv *env, jclass clazz) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); jstring result = NULL; @@ -116,7 +116,7 @@ Java_com_ibm_tools_attach_target_IPC_getTempDirImpl(JNIEnv *env, jclass clazz) */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_chmod(JNIEnv *env, jclass clazz, jstring path, jint mode) +Java_openj9_internal_tools_attach_target_IPC_chmod(JNIEnv *env, jclass clazz, jstring path, jint mode) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -140,7 +140,7 @@ Java_com_ibm_tools_attach_target_IPC_chmod(JNIEnv *env, jclass clazz, jstring pa * @return result of chown() operation */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_chownFileToTargetUid(JNIEnv *env, jclass clazz, jstring path, jlong uid) +Java_openj9_internal_tools_attach_target_IPC_chownFileToTargetUid(JNIEnv *env, jclass clazz, jstring path, jlong uid) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -167,7 +167,7 @@ Java_com_ibm_tools_attach_target_IPC_chownFileToTargetUid(JNIEnv *env, jclass cl * @return Returns 0 on Windows and the effective UID of owner on other operation systems. Returns -1 in the case of an error. */ jlong JNICALL -Java_com_ibm_tools_attach_target_CommonDirectory_getFileOwner(JNIEnv *env, jclass clazz, jstring path) { +Java_openj9_internal_tools_attach_target_CommonDirectory_getFileOwner(JNIEnv *env, jclass clazz, jstring path) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); jlong ownerUid = -1; @@ -195,7 +195,7 @@ Java_com_ibm_tools_attach_target_CommonDirectory_getFileOwner(JNIEnv *env, jclas * @note A batch process runs as the default UID if it has no USS segment. */ jboolean JNICALL -Java_com_ibm_tools_attach_target_IPC_isUsingDefaultUid(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_isUsingDefaultUid(JNIEnv *env, jclass clazz) { jboolean usingDuid = JNI_FALSE; @@ -253,7 +253,7 @@ Java_com_ibm_tools_attach_target_IPC_isUsingDefaultUid(JNIEnv *env, jclass clazz */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_mkdirWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring absolutePath, jint cdPerms) +Java_openj9_internal_tools_attach_target_IPC_mkdirWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring absolutePath, jint cdPerms) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); jint status = JNI_OK; @@ -261,7 +261,7 @@ Java_com_ibm_tools_attach_target_IPC_mkdirWithPermissionsImpl(JNIEnv *env, jclas if (NULL != absolutePathUTF) { status = j9file_mkdir(absolutePathUTF); /* file perms ignored for now */ - Java_com_ibm_tools_attach_target_IPC_chmod(env, clazz, absolutePath, cdPerms); + Java_openj9_internal_tools_attach_target_IPC_chmod(env, clazz, absolutePath, cdPerms); /* ensure that the directory group is the same as this process's. Some OS's set the group to that of the parent directory */ j9file_chown(absolutePathUTF, J9PORT_FILE_IGNORE_ID, j9sysinfo_get_egid()); Trc_JCL_attach_mkdirWithPermissions(env, absolutePathUTF, cdPerms, status); @@ -279,7 +279,7 @@ Java_com_ibm_tools_attach_target_IPC_mkdirWithPermissionsImpl(JNIEnv *env, jclas * Create the file, set the permissions (to override umask) and close it */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_createFileWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring path, jint mode) +Java_openj9_internal_tools_attach_target_IPC_createFileWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring path, jint mode) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -341,7 +341,7 @@ static jint createSharedResourcesDir(JNIEnv *env, jstring ctrlDirName) */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_setupSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName) +Java_openj9_internal_tools_attach_target_IPC_setupSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName) { @@ -404,7 +404,7 @@ openSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_openSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName) +Java_openj9_internal_tools_attach_target_IPC_openSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName) { jint rc = 0; J9JavaVM* javaVM = ((J9VMThread*) env)->javaVM; @@ -428,7 +428,7 @@ Java_com_ibm_tools_attach_target_IPC_openSemaphore(JNIEnv *env, jclass clazz, js * @return JNI_OK on success, j9shsem_open or close status otherwise */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_notifyVm(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfPosts, jboolean global) +Java_openj9_internal_tools_attach_target_IPC_notifyVm(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfPosts, jboolean global) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -461,7 +461,7 @@ Java_com_ibm_tools_attach_target_IPC_notifyVm(JNIEnv *env, jclass clazz, jstring * @return JNI_OK on success, j9shsem_open or close status otherwise */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_cancelNotify(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfDecrements, jboolean global) +Java_openj9_internal_tools_attach_target_IPC_cancelNotify(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfDecrements, jboolean global) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -491,7 +491,7 @@ Java_com_ibm_tools_attach_target_IPC_cancelNotify(JNIEnv *env, jclass clazz, jst * Block until semaphore becomes non-zero. */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_waitSemaphore(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_waitSemaphore(JNIEnv *env, jclass clazz) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -509,7 +509,7 @@ Java_com_ibm_tools_attach_target_IPC_waitSemaphore(JNIEnv *env, jclass clazz) * Close semaphore */ void JNICALL -Java_com_ibm_tools_attach_target_IPC_closeSemaphore(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_closeSemaphore(JNIEnv *env, jclass clazz) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -525,7 +525,7 @@ Java_com_ibm_tools_attach_target_IPC_closeSemaphore(JNIEnv *env, jclass clazz) * @return 0 on success, -1 on failure */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_destroySemaphore(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_destroySemaphore(JNIEnv *env, jclass clazz) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -547,7 +547,7 @@ Java_com_ibm_tools_attach_target_IPC_destroySemaphore(JNIEnv *env, jclass clazz) * @return numeric user ID of the caller. This is upcast from a UDATA. */ jlong JNICALL -Java_com_ibm_tools_attach_target_IPC_getUid(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_getUid(JNIEnv *env, jclass clazz) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -563,7 +563,7 @@ Java_com_ibm_tools_attach_target_IPC_getUid(JNIEnv *env, jclass clazz) * @return process ID of the caller. This is upcast from UDATA. */ jlong JNICALL -Java_com_ibm_tools_attach_target_IPC_getProcessId(JNIEnv *env, jclass clazz) +Java_openj9_internal_tools_attach_target_IPC_getProcessId(JNIEnv *env, jclass clazz) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -582,7 +582,7 @@ Java_com_ibm_tools_attach_target_IPC_getProcessId(JNIEnv *env, jclass clazz) * @return positive value if the process exists, 0 if the process does not exist, otherwise negative error code */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_processExistsImpl(JNIEnv *env, jclass clazz, jlong pid) +Java_openj9_internal_tools_attach_target_IPC_processExistsImpl(JNIEnv *env, jclass clazz, jlong pid) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); /* PID value was upcast from a UDATA to jlong. */ @@ -600,7 +600,7 @@ Java_com_ibm_tools_attach_target_IPC_processExistsImpl(JNIEnv *env, jclass clazz * @note J9PORT_ERROR_FILE_OPFAILED (-300) indicates file cannot be opened or the path could not be converted, J9PORT_ERROR_FILE_LOCK_BADLOCK (-316) indicates that the file could not be locked. */ jlong JNICALL -Java_com_ibm_tools_attach_target_FileLock_lockFileImpl(JNIEnv *env, jclass clazz, jstring path, jint mode, jboolean blocking) +Java_openj9_internal_tools_attach_target_FileLock_lockFileImpl(JNIEnv *env, jclass clazz, jstring path, jint mode, jboolean blocking) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); @@ -655,7 +655,7 @@ Java_com_ibm_tools_attach_target_FileLock_lockFileImpl(JNIEnv *env, jclass clazz * @param message descriptive message. May be null. */ void JNICALL -Java_com_ibm_tools_attach_target_IPC_tracepoint(JNIEnv *env, jclass clazz, jint statusCode, jstring message) { +Java_openj9_internal_tools_attach_target_IPC_tracepoint(JNIEnv *env, jclass clazz, jint statusCode, jstring message) { const char *msgUTF = NULL; const char *statusText = "STATUS_NORMAL"; @@ -696,7 +696,7 @@ Java_com_ibm_tools_attach_target_IPC_tracepoint(JNIEnv *env, jclass clazz, jint * @return 0 if successful, -1 if failed */ jint JNICALL -Java_com_ibm_tools_attach_target_FileLock_unlockFileImpl(JNIEnv *env, jclass clazz, jlong fd) { +Java_openj9_internal_tools_attach_target_FileLock_unlockFileImpl(JNIEnv *env, jclass clazz, jlong fd) { PORT_ACCESS_FROM_VMC( ((J9VMThread *) env) ); jint result = JNI_OK; diff --git a/runtime/jcl/common/dump.c b/runtime/jcl/common/dump.c index b2eed5e3bb6..19dbf448979 100644 --- a/runtime/jcl/common/dump.c +++ b/runtime/jcl/common/dump.c @@ -284,7 +284,7 @@ Java_com_ibm_jvm_Dump_triggerDumpsImpl (JNIEnv *env, jclass clazz, jstring jopts } jstring JNICALL -Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_triggerDumpsImpl(JNIEnv *env, jclass clazz, jstring jopts, jstring jevent) +Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_triggerDumpsImpl(JNIEnv *env, jclass clazz, jstring jopts, jstring jevent) { return Java_com_ibm_jvm_Dump_triggerDumpsImpl(env, clazz, jopts, jevent); } diff --git a/runtime/jcl/common/jclvm.c b/runtime/jcl/common/jclvm.c index 223bed1a362..3dd18dd1c04 100644 --- a/runtime/jcl/common/jclvm.c +++ b/runtime/jcl/common/jclvm.c @@ -158,7 +158,7 @@ Java_com_ibm_oti_vm_VM_allInstances(JNIEnv * env, jclass unused, jclass clazz, j * This string inserts Unix-style line separators. The caller is responsible for translating them if necessary. */ jstring JNICALL -Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_getHeapClassStatisticsImpl(JNIEnv * env, jclass unused) +Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_getHeapClassStatisticsImpl(JNIEnv * env, jclass unused) { J9VMThread *vmThread = (J9VMThread *) env; J9JavaVM *vm = vmThread->javaVM; diff --git a/runtime/jcl/common/mgmtthread.c b/runtime/jcl/common/mgmtthread.c index ecd722aa232..446c5f86fbd 100644 --- a/runtime/jcl/common/mgmtthread.c +++ b/runtime/jcl/common/mgmtthread.c @@ -656,7 +656,7 @@ Java_com_ibm_java_lang_management_internal_ThreadMXBeanImpl_getMultiThreadInfoIm } jobjectArray JNICALL -Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl(JNIEnv *env, jobject beanInstance, +Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl(JNIEnv *env, jobject beanInstance, jboolean getLockedMonitors, jboolean getLockedSynchronizers, jint maxDepth) { J9VMThread *currentThread = (J9VMThread *)env; @@ -771,7 +771,7 @@ Java_com_ibm_java_lang_management_internal_ThreadMXBeanImpl_dumpAllThreadsImpl (JNIEnv *env, jobject beanInstance, jboolean getLockedMonitors, jboolean getLockedSynchronizers, jint maxDepth) { - return Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl( + return Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl( env, beanInstance, getLockedMonitors, getLockedSynchronizers, maxDepth); } diff --git a/runtime/jcl/exports.cmake b/runtime/jcl/exports.cmake index 0870ad5890d..0a913867a93 100644 --- a/runtime/jcl/exports.cmake +++ b/runtime/jcl/exports.cmake @@ -243,9 +243,9 @@ omr_add_exports(jclse Java_com_ibm_lang_management_internal_SysinfoCpuTime_getCpuUtilizationImpl Java_com_ibm_lang_management_internal_UnixExtendedOperatingSystem_getMaxFileDescriptorCountImpl Java_com_ibm_lang_management_internal_UnixExtendedOperatingSystem_getOpenFileDescriptorCountImpl - Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_getHeapClassStatisticsImpl - Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl - Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_triggerDumpsImpl + Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_getHeapClassStatisticsImpl + Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl + Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_triggerDumpsImpl Java_com_ibm_oti_reflect_AnnotationParser_getAnnotationsDataImpl__Ljava_lang_Class_2 Java_com_ibm_oti_reflect_AnnotationParser_getAnnotationsData__Ljava_lang_reflect_Constructor_2 Java_com_ibm_oti_reflect_AnnotationParser_getAnnotationsData__Ljava_lang_reflect_Field_2 @@ -453,26 +453,26 @@ omr_add_exports(jclse if(J9VM_OPT_SIDECAR) omr_add_exports(jclse - Java_com_ibm_tools_attach_target_CommonDirectory_getFileOwner - Java_com_ibm_tools_attach_target_FileLock_lockFileImpl - Java_com_ibm_tools_attach_target_FileLock_unlockFileImpl - Java_com_ibm_tools_attach_target_IPC_cancelNotify - Java_com_ibm_tools_attach_target_IPC_chmod - Java_com_ibm_tools_attach_target_IPC_chownFileToTargetUid - Java_com_ibm_tools_attach_target_IPC_closeSemaphore - Java_com_ibm_tools_attach_target_IPC_createFileWithPermissionsImpl - Java_com_ibm_tools_attach_target_IPC_destroySemaphore - Java_com_ibm_tools_attach_target_IPC_getProcessId - Java_com_ibm_tools_attach_target_IPC_getTempDirImpl - Java_com_ibm_tools_attach_target_IPC_getUid - Java_com_ibm_tools_attach_target_IPC_isUsingDefaultUid - Java_com_ibm_tools_attach_target_IPC_mkdirWithPermissionsImpl - Java_com_ibm_tools_attach_target_IPC_notifyVm - Java_com_ibm_tools_attach_target_IPC_openSemaphore - Java_com_ibm_tools_attach_target_IPC_processExistsImpl - Java_com_ibm_tools_attach_target_IPC_setupSemaphore - Java_com_ibm_tools_attach_target_IPC_tracepoint - Java_com_ibm_tools_attach_target_IPC_waitSemaphore + Java_openj9_internal_tools_attach_target_CommonDirectory_getFileOwner + Java_openj9_internal_tools_attach_target_FileLock_lockFileImpl + Java_openj9_internal_tools_attach_target_FileLock_unlockFileImpl + Java_openj9_internal_tools_attach_target_IPC_cancelNotify + Java_openj9_internal_tools_attach_target_IPC_chmod + Java_openj9_internal_tools_attach_target_IPC_chownFileToTargetUid + Java_openj9_internal_tools_attach_target_IPC_closeSemaphore + Java_openj9_internal_tools_attach_target_IPC_createFileWithPermissionsImpl + Java_openj9_internal_tools_attach_target_IPC_destroySemaphore + Java_openj9_internal_tools_attach_target_IPC_getProcessId + Java_openj9_internal_tools_attach_target_IPC_getTempDirImpl + Java_openj9_internal_tools_attach_target_IPC_getUid + Java_openj9_internal_tools_attach_target_IPC_isUsingDefaultUid + Java_openj9_internal_tools_attach_target_IPC_mkdirWithPermissionsImpl + Java_openj9_internal_tools_attach_target_IPC_notifyVm + Java_openj9_internal_tools_attach_target_IPC_openSemaphore + Java_openj9_internal_tools_attach_target_IPC_processExistsImpl + Java_openj9_internal_tools_attach_target_IPC_setupSemaphore + Java_openj9_internal_tools_attach_target_IPC_tracepoint + Java_openj9_internal_tools_attach_target_IPC_waitSemaphore ) endif() diff --git a/runtime/jcl/uma/attach_exports.xml b/runtime/jcl/uma/attach_exports.xml index ad62bf86264..f086795b024 100644 --- a/runtime/jcl/uma/attach_exports.xml +++ b/runtime/jcl/uma/attach_exports.xml @@ -1,5 +1,5 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/runtime/jcl/uma/se6_vm-side_natives_exports.xml b/runtime/jcl/uma/se6_vm-side_natives_exports.xml index 252d30e3378..7831ffe2ba8 100644 --- a/runtime/jcl/uma/se6_vm-side_natives_exports.xml +++ b/runtime/jcl/uma/se6_vm-side_natives_exports.xml @@ -194,8 +194,8 @@ - - + + @@ -317,6 +317,6 @@ - + diff --git a/runtime/oti/j9java8packages.gperf b/runtime/oti/j9java8packages.gperf index 63fb29aecdf..bffcdaaa5a9 100644 --- a/runtime/oti/j9java8packages.gperf +++ b/runtime/oti/j9java8packages.gperf @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 IBM Corp. and others + * Copyright (c) 2017, 2019 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -211,7 +211,7 @@ com/ibm/security/util/text/resources com/ibm/security/validator com/ibm/security/x509 com/ibm/tools/attach/attacher -com/ibm/tools/attach/target +openj9/internal/tools/attach/target com/ibm/virtualization/management com/oracle/webservices/internal/api com/oracle/webservices/internal/api/databinding diff --git a/runtime/oti/j9java8packages.h b/runtime/oti/j9java8packages.h index afbd456e85e..c1e221b10c9 100644 --- a/runtime/oti/j9java8packages.h +++ b/runtime/oti/j9java8packages.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 IBM Corp. and others + * Copyright (c) 2017, 2019 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -1579,7 +1579,7 @@ lookupJava8Package (register const char *str, register unsigned int len) #line 407 "j9java8packages.gperf" {"com/sun/org/omg/CORBA/portable"}, #line 214 "j9java8packages.gperf" - {"com/ibm/tools/attach/target"}, + {"openj9/internal/tools/attach/target"}, #line 648 "j9java8packages.gperf" {"com/sun/xml/internal/ws/client/dispatch"}, #line 257 "j9java8packages.gperf" diff --git a/runtime/oti/jclprots.h b/runtime/oti/jclprots.h index 93be46c8af8..2768c79a6e1 100644 --- a/runtime/oti/jclprots.h +++ b/runtime/oti/jclprots.h @@ -572,47 +572,47 @@ jlong JNICALL Java_com_ibm_jvm_Trace_getMicros(JNIEnv *env, jobject recv); /* attach API */ jint JNICALL -Java_com_ibm_tools_attach_target_IPC_cancelNotify(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfDecrements, jboolean global); +Java_openj9_internal_tools_attach_target_IPC_cancelNotify(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfDecrements, jboolean global); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_chownFileToTargetUid(JNIEnv *env, jclass clazz, jstring path, jlong uid); +Java_openj9_internal_tools_attach_target_IPC_chownFileToTargetUid(JNIEnv *env, jclass clazz, jstring path, jlong uid); jlong JNICALL -Java_com_ibm_tools_attach_target_CommonDirectory_getFileOwner(JNIEnv *env, jclass clazz, jstring path); +Java_openj9_internal_tools_attach_target_CommonDirectory_getFileOwner(JNIEnv *env, jclass clazz, jstring path); jlong JNICALL -Java_com_ibm_tools_attach_target_IPC_getUid(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_getUid(JNIEnv *env, jclass clazz); jbyteArray JNICALL -Java_com_ibm_tools_attach_target_IPC_getTmpDirImpl(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_getTmpDirImpl(JNIEnv *env, jclass clazz); jstring JNICALL -Java_com_ibm_tools_attach_target_IPC_getTempDirImpl(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_getTempDirImpl(JNIEnv *env, jclass clazz); jboolean JNICALL -Java_com_ibm_tools_attach_target_IPC_isUsingDefaultUid(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_isUsingDefaultUid(JNIEnv *env, jclass clazz); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_mkdirWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring absolutePath, jint cdPerms); +Java_openj9_internal_tools_attach_target_IPC_mkdirWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring absolutePath, jint cdPerms); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_createFileWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring path, jint mode); +Java_openj9_internal_tools_attach_target_IPC_createFileWithPermissionsImpl(JNIEnv *env, jclass clazz, jstring path, jint mode); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_setupSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName); +Java_openj9_internal_tools_attach_target_IPC_setupSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_openSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName); +Java_openj9_internal_tools_attach_target_IPC_openSemaphore(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_notifyVm(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfPosts, jboolean global); +Java_openj9_internal_tools_attach_target_IPC_notifyVm(JNIEnv *env, jclass clazz, jstring ctrlDirName, jstring semaName, jint numberOfPosts, jboolean global); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_waitSemaphore(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_waitSemaphore(JNIEnv *env, jclass clazz); void JNICALL -Java_com_ibm_tools_attach_target_IPC_closeSemaphore(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_closeSemaphore(JNIEnv *env, jclass clazz); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_destroySemaphore(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_destroySemaphore(JNIEnv *env, jclass clazz); jlong JNICALL -Java_com_ibm_tools_attach_target_IPC_getProcessId(JNIEnv *env, jclass clazz); +Java_openj9_internal_tools_attach_target_IPC_getProcessId(JNIEnv *env, jclass clazz); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_chmod(JNIEnv *env, jclass clazz, jstring path, jint mode); +Java_openj9_internal_tools_attach_target_IPC_chmod(JNIEnv *env, jclass clazz, jstring path, jint mode); jint JNICALL -Java_com_ibm_tools_attach_target_IPC_processExistsImpl(JNIEnv *env, jclass clazz, jlong pid); +Java_openj9_internal_tools_attach_target_IPC_processExistsImpl(JNIEnv *env, jclass clazz, jlong pid); jlong JNICALL -Java_com_ibm_tools_attach_target_FileLock_lockFileImpl(JNIEnv *env, jclass clazz, jstring path, jint mode, jboolean blocking); +Java_openj9_internal_tools_attach_target_FileLock_lockFileImpl(JNIEnv *env, jclass clazz, jstring path, jint mode, jboolean blocking); jint JNICALL -Java_com_ibm_tools_attach_target_FileLock_unlockFileImpl(JNIEnv *env, jclass clazz, jlong fd); +Java_openj9_internal_tools_attach_target_FileLock_unlockFileImpl(JNIEnv *env, jclass clazz, jlong fd); void JNICALL -Java_com_ibm_tools_attach_target_IPC_tracepoint(JNIEnv *env, jclass clazz, jint statusCode, jstring message); +Java_openj9_internal_tools_attach_target_IPC_tracepoint(JNIEnv *env, jclass clazz, jint statusCode, jstring message); /* J9SourceJclExceptionSupport*/ extern J9_CFUNC j9array_t @@ -697,10 +697,10 @@ Java_com_ibm_oti_vm_VM_setDaemonThreadImpl (JNIEnv *env, jobject recv, jobject a void JNICALL Java_com_ibm_oti_vm_VM_dumpString(JNIEnv * env, jclass clazz, jstring str); jboolean JNICALL Java_com_ibm_oti_vm_VM_appendToCPNativeImpl(JNIEnv * env, jclass clazz, jstring classPathAdditions, jstring newClassPath); jboolean JNICALL Java_com_ibm_oti_vm_VM_isApplicationClassLoaderPresent(JNIEnv * env, jclass clazz); -jstring JNICALL Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_getHeapClassStatisticsImpl(JNIEnv * env, jclass unused); -jobjectArray JNICALL Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl(JNIEnv *env, jobject beanInstance, +jstring JNICALL Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_getHeapClassStatisticsImpl(JNIEnv * env, jclass unused); +jobjectArray JNICALL Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_dumpAllThreadsImpl(JNIEnv *env, jobject beanInstance, jboolean getLockedMonitors, jboolean getLockedSynchronizers, jint maxDepth); -jstring JNICALL Java_openj9_tools_attach_diagnostics_base_DiagnosticUtils_triggerDumpsImpl(JNIEnv *env, jclass clazz, jstring opts, jstring event); +jstring JNICALL Java_openj9_internal_tools_attach_diagnostics_base_DiagnosticUtils_triggerDumpsImpl(JNIEnv *env, jclass clazz, jstring opts, jstring event); /* J9SourceJclCommonInit*/ jint computeFullVersionString (J9JavaVM* vm); diff --git a/runtime/vm/BytecodeInterpreter.hpp b/runtime/vm/BytecodeInterpreter.hpp index 7a822bc8dba..91b2a449cb3 100644 --- a/runtime/vm/BytecodeInterpreter.hpp +++ b/runtime/vm/BytecodeInterpreter.hpp @@ -4351,7 +4351,7 @@ done:; return rc; } - /* com.ibm.tools.attach.target.Attachment: private native int loadAgentLibraryImpl(ClassLoader loader, String agentLibrary, String options, boolean decorate); */ + /* openj9.internal.tools.attach.target.Attachment: private native int loadAgentLibraryImpl(ClassLoader loader, String agentLibrary, String options, boolean decorate); */ VMINLINE VM_BytecodeAction inlAttachmentLoadAgentLibraryImpl(REGISTER_ARGS_LIST) { diff --git a/runtime/vm/bindnatv.cpp b/runtime/vm/bindnatv.cpp index 7eac8aa821e..3efcbb9d499 100644 --- a/runtime/vm/bindnatv.cpp +++ b/runtime/vm/bindnatv.cpp @@ -181,7 +181,7 @@ static inlMapping mappings[] = { { "Java_com_ibm_oti_vm_VM_getClassPathEntryType__Ljava_lang_Object_2I", J9_BCLOOP_SEND_TARGET_INL_VM_GET_CLASS_PATH_ENTRY_TYPE }, { "Java_com_ibm_oti_vm_VM_isBootstrapClassLoader__Ljava_lang_ClassLoader_2", J9_BCLOOP_SEND_TARGET_INL_VM_IS_BOOTSTRAP_CLASS_LOADER }, { "Java_sun_misc_Unsafe_allocateInstance__Ljava_lang_Class_2", J9_BCLOOP_SEND_TARGET_INL_UNSAFE_ALLOCATE_INSTANCE }, - { "Java_com_ibm_tools_attach_target_Attachment_loadAgentLibraryImpl__Ljava_lang_ClassLoader_2Ljava_lang_String_2Ljava_lang_String_2Z", J9_BCLOOP_SEND_TARGET_INL_ATTACHMENT_LOADAGENTLIBRARYIMPL }, + { "Java_openj9_internal_tools_attach_target_Attachment_loadAgentLibraryImpl__Ljava_lang_ClassLoader_2Ljava_lang_String_2Ljava_lang_String_2Z", J9_BCLOOP_SEND_TARGET_INL_ATTACHMENT_LOADAGENTLIBRARYIMPL }, { "Java_com_ibm_oti_vm_VM_getStackClass__I", J9_BCLOOP_SEND_TARGET_INL_VM_GETSTACKCLASS }, /* Forward duplicated getStackClass natives to the same target */ { "Java_java_lang_invoke_MethodHandles_getStackClass__I", J9_BCLOOP_SEND_TARGET_INL_VM_GETSTACKCLASS }, diff --git a/runtime/vm/jniinv.c b/runtime/vm/jniinv.c index 49accfc78c3..c5fd5b1f2db 100644 --- a/runtime/vm/jniinv.c +++ b/runtime/vm/jniinv.c @@ -1289,7 +1289,7 @@ launchAttachApi(J9VMThread *currentThread) { jmethodID meth; JNIEnv *env = (JNIEnv *) currentThread; - clazz = (*env)->FindClass(env, "com/ibm/tools/attach/target/AttachHandler"); + clazz = (*env)->FindClass(env, "openj9/internal/tools/attach/target/AttachHandler"); if (NULL == clazz) { return -1; } diff --git a/test/functional/JLM_Tests/build.xml b/test/functional/JLM_Tests/build.xml index c66fe8e98e7..cd208f2c709 100644 --- a/test/functional/JLM_Tests/build.xml +++ b/test/functional/JLM_Tests/build.xml @@ -79,7 +79,7 @@ - + diff --git a/test/functional/Java10andUp/build.xml b/test/functional/Java10andUp/build.xml index 8303db3657c..8d980c53004 100644 --- a/test/functional/Java10andUp/build.xml +++ b/test/functional/Java10andUp/build.xml @@ -55,7 +55,7 @@ - + diff --git a/test/functional/Java11andUp/build.xml b/test/functional/Java11andUp/build.xml index 4b5af2e8ba6..d7eed5cef84 100644 --- a/test/functional/Java11andUp/build.xml +++ b/test/functional/Java11andUp/build.xml @@ -90,7 +90,7 @@ - + diff --git a/test/functional/Java8andUp/build.xml b/test/functional/Java8andUp/build.xml index e61929ab2af..eb225007fb0 100644 --- a/test/functional/Java8andUp/build.xml +++ b/test/functional/Java8andUp/build.xml @@ -218,7 +218,7 @@ - + ===addExports: ${addExports} diff --git a/test/functional/Java8andUp/playlist.xml b/test/functional/Java8andUp/playlist.xml index 3abfa96f7cc..bb760fa90b3 100644 --- a/test/functional/Java8andUp/playlist.xml +++ b/test/functional/Java8andUp/playlist.xml @@ -561,7 +561,7 @@ -Djdk.attach.allowAttachSelf=true \ -Dcom.ibm.tools.attach.timeout=15000 \ --add-exports jdk.jcmd/openj9.tools.attach.diagnostics.info=ALL-UNNAMED \ - --add-exports java.base/openj9.tools.attach.diagnostics.base=ALL-UNNAMED \ + --add-exports java.base/openj9.internal.tools.attach.diagnostics.base=ALL-UNNAMED \ org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames TestJstack \ -groups $(TEST_GROUP) \ -excludegroups $(DEFAULT_EXCLUDE); \ @@ -614,7 +614,7 @@ -Dcom.ibm.tools.attach.timeout=15000 \ --add-exports jdk.jcmd/openj9.tools.attach.diagnostics.info=ALL-UNNAMED \ --add-exports jdk.attach/com.ibm.tools.attach.attacher=ALL-UNNAMED \ - --add-exports java.base/openj9.tools.attach.diagnostics.base=ALL-UNNAMED \ + --add-exports java.base/openj9.internal.tools.attach.diagnostics.base=ALL-UNNAMED \ org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames TestJmap \ -groups $(TEST_GROUP) \ -excludegroups $(DEFAULT_EXCLUDE); \ diff --git a/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java b/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java index 37920262d9b..639cdd10095 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2018 IBM Corp. and others + * Copyright (c) 2001, 2019 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -36,7 +36,7 @@ public NativeFileLock(File lockFile, int mode) throws Exception { TestFileLocking.logger.debug("enter NativeFileLock"); Class nativeFileLock = Class - .forName("com.ibm.tools.attach.target.FileLock"); + .forName("openj9.internal.tools.attach.target.FileLock"); Constructor nflConstructor = nativeFileLock.getDeclaredConstructor( java.lang.String.class, int.class); nflConstructor.setAccessible(true); diff --git a/test/functional/Java9andUp/build.xml b/test/functional/Java9andUp/build.xml index 87903ae71b1..7854e1d6c2a 100644 --- a/test/functional/Java9andUp/build.xml +++ b/test/functional/Java9andUp/build.xml @@ -61,7 +61,7 @@ - + diff --git a/test/functional/TestUtilities/src/org/openj9/test/attachAPI/TargetManager.java b/test/functional/TestUtilities/src/org/openj9/test/attachAPI/TargetManager.java index 5bdcd635d97..363c4b64a11 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/attachAPI/TargetManager.java +++ b/test/functional/TestUtilities/src/org/openj9/test/attachAPI/TargetManager.java @@ -49,7 +49,7 @@ @SuppressWarnings("nls") class TargetManager { - static final String COM_IBM_TOOLS_ATTACH_TARGET_ATTACH_HANDLER = "com.ibm.tools.attach.target.AttachHandler"; + static final String OPENJ9_INTERNAL_TOOLS_ATTACH_TARGET_ATTACH_HANDLER = "openj9.internal.tools.attach.target.AttachHandler"; private static Logger logger = Logger.getLogger(TargetManager.class); public static final String PID_PREAMBLE = "pid="; public static final String VMID_PREAMBLE = "vmid="; @@ -143,7 +143,7 @@ public static boolean waitForAttachApiInitialization() { public static long getProcessId() { long result = -1; try { - Class attachHandlerClass = Class.forName(TargetManager.COM_IBM_TOOLS_ATTACH_TARGET_ATTACH_HANDLER); + Class attachHandlerClass = Class.forName(TargetManager.OPENJ9_INTERNAL_TOOLS_ATTACH_TARGET_ATTACH_HANDLER); final Method getPid = attachHandlerClass.getMethod("getProcessId"); result = (long) getPid.invoke(attachHandlerClass); } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { @@ -490,7 +490,7 @@ public static void dumpLogs() { */ public static void dumpLogs(boolean printLogs) { try { - Class attachHandlerClass = Class.forName(COM_IBM_TOOLS_ATTACH_TARGET_ATTACH_HANDLER); + Class attachHandlerClass = Class.forName(OPENJ9_INTERNAL_TOOLS_ATTACH_TARGET_ATTACH_HANDLER); logger.debug("Dumping attach API logs"); File pwd = new File(System.getProperty("user.dir")); File[] logFiles = pwd.listFiles(); @@ -518,7 +518,7 @@ public static void dumpLogs(boolean printLogs) { } } } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e1) { - logger.error("could not load or use " + COM_IBM_TOOLS_ATTACH_TARGET_ATTACH_HANDLER); + logger.error("could not load or use " + OPENJ9_INTERNAL_TOOLS_ATTACH_TARGET_ATTACH_HANDLER); } } diff --git a/test/functional/cmdLineTests/jvmtitests/build.xml b/test/functional/cmdLineTests/jvmtitests/build.xml index 02828bc8554..3409a18bf56 100644 --- a/test/functional/cmdLineTests/jvmtitests/build.xml +++ b/test/functional/cmdLineTests/jvmtitests/build.xml @@ -64,7 +64,7 @@ - + diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java index c1cce64ef30..886480c924f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2018 IBM Corp. and others + * Copyright (c) 2001, 2019 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -33,7 +33,7 @@ class attachingAgent extends Thread { // override run() method in interface public void run() { try { - String myVmid = com.ibm.tools.attach.target.AttachHandler.getVmId(); + String myVmid = openj9.internal.tools.attach.target.AttachHandler.getVmId(); selfVm = VirtualMachine.attach(myVmid); selfVm.loadAgentLibrary("jvmtitest", "test:" + subtest); } catch (Exception e){