13083 Enable gate builds with OpenJDK 11

Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>

2 files changed, 301 insertions, 26 deletions

diff --git a/usr/src/lib/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile
index 0dbfe630d5..77b53e0108 100644
--- a/usr/src/lib/libdtrace_jni/java/Makefile
+++ b/usr/src/lib/libdtrace_jni/java/Makefile
@@ -23,6 +23,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2020 Peter Tribble
+#
 
 include $(SRC)/Makefile.master
 
@@ -35,7 +37,6 @@ PKGNAME=org.opensolaris.os.dtrace
 
 APIDIR=$(SRC)/lib/libdtrace_jni/java
 CLASSES=$(APIDIR)/classes
-JNI=$(APIDIR)/native
 JARS=$(APIDIR)/lib
 DOCS=$(APIDIR)/docs
 DOCAPI=$(DOCS)/api
@@ -55,7 +56,7 @@ DOCAPIDESTDIR=$(DOCDESTDIR)/api
 DOCEXAMPLESDESTDIR=$(DOCDESTDIR)/examples
 DOCHTMLDESTDIR=$(DOCDESTDIR)/html
 DOCIMAGESDESTDIR=$(DOCDESTDIR)/images
-$(BLD_JAVA_8)XDOCLINT_OPTION=-Xdoclint:none
+XDOCLINT_OPTION=-Xdoclint:none
 
 $(JARDESTDIR)/%: $(JARS)/%
 	$(INS.file)
@@ -78,8 +79,8 @@ APICLASSPATH=$(CLASSES):$(APIJAVASRC)
 
 # javac flags
 JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH)
-JFLAGS += -source 1.5 -target 1.6
-JFLAGS += -Xlint:all,-rawtypes,-options
+JFLAGS += -source 7 -target 7
+JFLAGS += -Xlint:all,-deprecation,-rawtypes,-options
 
 # The default make rule for Java files
 COMPILE.java=$(JAVAC) $(JFLAGS)
@@ -87,18 +88,6 @@ COMPILE.java=$(JAVAC) $(JFLAGS)
 $(CLASSES)/$(PKGPATH)/%.class:	$(APIJAVASRC)/$(PKGPATH)/%.java
 				$(COMPILE.java) $<
 
-# javah generated headers
-APIHDR= LocalConsumer.h
-JNIHDRS=$(JNI)/$(APIHDR)
-
-# API classes with native methods
-JNI_CLASSNAMES=\
-    LocalConsumer
-
-JNI_CLASSES=${JNI_CLASSNAMES:%=%.class}
-DTRACE_JNI_CLASSES=${JNI_CLASSES:%=$(CLASSES)/$(PKGPATH)/%}
-JNI_FULL_CLASSNAMES=${JNI_CLASSNAMES:%=$(PKGNAME).%}
-
 # All API classes
 API_CLASSNAMES=\
 	AbstractAggregationValue \
@@ -163,11 +152,10 @@ API_CLASSES=${API_CLASSNAMES:%=%.class}
 DTRACE_API_CLASSES=${API_CLASSES:%=$(CLASSES)/$(PKGPATH)/%}
 
 
-all:            $(CLASSES) $(DTRACE_API_CLASSES) $(JNI)/$(APIHDR)
+all:            $(CLASSES) $(DTRACE_API_CLASSES)
 
 clean:
 		-$(RM) $(CLASSES)/$(PKGPATH)/*.class
-		-$(RM) $(JNI)/*.h
 		-$(RM) -r $(DOCAPI)
 
 clobber:	clean
@@ -177,14 +165,6 @@ clobber:	clean
 $(CLASSES):
 		-@mkdir -p $@
 
-# Make the directory for javah-generated headers, if it doesn't exist
-$(JNI):
-		-@mkdir -p $@
-
-$(JNI)/$(APIHDR): $(JNI) $(DTRACE_JNI_CLASSES)
-		$(JAVAH) -o $@ -classpath $(CLASSES) $(JNI_FULL_CLASSNAMES)
-		-@touch $@
-
 # Rule for installing API javadoc.
 $(DOCAPIDESTDIR)/index.html: $(DTRACE_API_CLASSES)
 		-@mkdir -p $(DOCAPIDESTDIR)
diff --git a/usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h b/usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h
new file mode 100644
index 0000000000..c0a75819cf
--- /dev/null
+++ b/usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h
@@ -0,0 +1,295 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_opensolaris_os_dtrace_LocalConsumer */
+
+#ifndef _Included_org_opensolaris_os_dtrace_LocalConsumer
+#define _Included_org_opensolaris_os_dtrace_LocalConsumer
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_opensolaris_os_dtrace_LocalConsumer_DTRACE_JNI_VERSION
+#define org_opensolaris_os_dtrace_LocalConsumer_DTRACE_JNI_VERSION 3L
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _loadJniTable
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1loadJniTable
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _checkVersion
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1checkVersion
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _open
+ * Signature: ([Lorg/opensolaris/os/dtrace/Consumer/OpenFlag;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1open
+  (JNIEnv *, jobject, jobjectArray);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _compileString
+ * Signature: (Ljava/lang/String;[Ljava/lang/String;)Lorg/opensolaris/os/dtrace/Program;
+ */
+JNIEXPORT jobject JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1compileString
+  (JNIEnv *, jobject, jstring, jobjectArray);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _compileFile
+ * Signature: (Ljava/lang/String;[Ljava/lang/String;)Lorg/opensolaris/os/dtrace/Program/File;
+ */
+JNIEXPORT jobject JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1compileFile
+  (JNIEnv *, jobject, jstring, jobjectArray);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _exec
+ * Signature: (Lorg/opensolaris/os/dtrace/Program;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1exec
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _getProgramInfo
+ * Signature: (Lorg/opensolaris/os/dtrace/Program;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1getProgramInfo
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _setOption
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1setOption
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _getOption
+ * Signature: (Ljava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1getOption
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _isEnabled
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1isEnabled
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _checkProgramEnabling
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1checkProgramEnabling
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _go
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1go
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _stop
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1stop
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _consume
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1consume
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _interrupt
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1interrupt
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _close
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1close
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _getAggregate
+ * Signature: (Lorg/opensolaris/os/dtrace/AggregateSpec;)Lorg/opensolaris/os/dtrace/Aggregate;
+ */
+JNIEXPORT jobject JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1getAggregate
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _createProcess
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1createProcess
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _grabProcess
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1grabProcess
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _listProbes
+ * Signature: (Ljava/util/List;Lorg/opensolaris/os/dtrace/ProbeDescription;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1listProbes
+  (JNIEnv *, jobject, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _listProbeDetail
+ * Signature: (Ljava/util/List;Lorg/opensolaris/os/dtrace/ProbeDescription;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1listProbeDetail
+  (JNIEnv *, jobject, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _listCompiledProbes
+ * Signature: (Ljava/util/List;Lorg/opensolaris/os/dtrace/Program;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1listCompiledProbes
+  (JNIEnv *, jobject, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _listCompiledProbeDetail
+ * Signature: (Ljava/util/List;Lorg/opensolaris/os/dtrace/Program;)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1listCompiledProbeDetail
+  (JNIEnv *, jobject, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _getVersion
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1getVersion
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _openCount
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1openCount
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _destroy
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1destroy
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _quantizeBucket
+ * Signature: (I)J
+ */
+JNIEXPORT jlong JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1quantizeBucket
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _lookupKernelFunction
+ * Signature: (Ljava/lang/Number;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1lookupKernelFunction
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _lookupUserFunction
+ * Signature: (ILjava/lang/Number;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1lookupUserFunction
+  (JNIEnv *, jobject, jint, jobject);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _getExecutableName
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1getExecutableName
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _setMaximumConsumers
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1setMaximumConsumers
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     org_opensolaris_os_dtrace_LocalConsumer
+ * Method:    _setDebug
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_org_opensolaris_os_dtrace_LocalConsumer__1setDebug
+  (JNIEnv *, jclass, jboolean);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class org_opensolaris_os_dtrace_LocalConsumer_Identifier */
+
+#ifndef _Included_org_opensolaris_os_dtrace_LocalConsumer_Identifier
+#define _Included_org_opensolaris_os_dtrace_LocalConsumer_Identifier
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_opensolaris_os_dtrace_LocalConsumer_Identifier_serialVersionUID
+#define org_opensolaris_os_dtrace_LocalConsumer_Identifier_serialVersionUID 2183165132305302834LL
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class org_opensolaris_os_dtrace_LocalConsumer_State */
+
+#ifndef _Included_org_opensolaris_os_dtrace_LocalConsumer_State
+#define _Included_org_opensolaris_os_dtrace_LocalConsumer_State
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif