Skip to content

Commit ff384ab

Browse files
add attach jni library
Signed-off-by: jonghoonpark <[email protected]>
1 parent 275b0d9 commit ff384ab

File tree

2 files changed

+52
-1
lines changed

2 files changed

+52
-1
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNILibraryInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private static String getOnLoadName(String libName, boolean isBuiltIn) {
6868
public boolean fillCGlobalDataMap(Collection<String> staticLibNames) {
6969
List<String> libsWithOnLoad = Arrays.asList("net", "java", "nio", "zip", "sunec", "jaas", "sctp", "extnet",
7070
"j2gss", "j2pkcs11", "j2pcsc", "prefs", "verify", "awt", "awt_xawt", "awt_headless", "lcms",
71-
"fontmanager", "javajpeg", "mlib_image");
71+
"fontmanager", "javajpeg", "mlib_image", "attach");
7272
// TODO: This check should be removed when all static libs will have JNI_OnLoad function
7373
ArrayList<String> localStaticLibNames = new ArrayList<>(staticLibNames);
7474
localStaticLibNames.retainAll(libsWithOnLoad);
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
package com.oracle.svm.hosted.jdk;
26+
27+
import org.graalvm.nativeimage.Platforms;
28+
import org.graalvm.nativeimage.impl.InternalPlatform;
29+
30+
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
31+
import com.oracle.svm.core.feature.InternalFeature;
32+
import com.oracle.svm.core.jdk.JNIRegistrationUtil;
33+
import com.oracle.svm.core.jdk.NativeLibrarySupport;
34+
import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
35+
import com.oracle.svm.hosted.c.NativeLibraries;
36+
37+
@Platforms(InternalPlatform.PLATFORM_JNI.class)
38+
@AutomaticallyRegisteredFeature
39+
class JNIRegistrationAttach extends JNIRegistrationUtil implements InternalFeature {
40+
41+
@Override
42+
public void beforeAnalysis(BeforeAnalysisAccess a) {
43+
a.registerReachabilityHandler(JNIRegistrationAttach::registerAndLinkAttach, method(a, "sun.tools.attach.AttachProviderImpl", "attachVirtualMachine", String.class));
44+
PlatformNativeLibrarySupport.singleton().addBuiltinPkgNativePrefix("sun_tools_attach_VirtualMachineImpl");
45+
}
46+
47+
private static void registerAndLinkAttach(@SuppressWarnings("unused") DuringAnalysisAccess a) {
48+
NativeLibrarySupport.singleton().preregisterUninitializedBuiltinLibrary("attach");
49+
NativeLibraries.singleton().addStaticJniLibrary("attach");
50+
}
51+
}

0 commit comments

Comments
 (0)