diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
| commit | de1c7a865adeab38b51e5c0db5058e61469b322c (patch) | |
| tree | 898a230006c801195b396aa68892d1296d8c549e /usr/src/cmd | |
| parent | 69ac6c001ab11b88fdfc6b13fcc344154a268056 (diff) | |
| parent | 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a (diff) | |
| download | illumos-joyent-de1c7a865adeab38b51e5c0db5058e61469b322c.tar.gz | |
[illumos-gate merge]
commit 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a
13083 Enable gate builds with OpenJDK 11
commit fd147c98dbdbc9e5ac99fa51cb608e8eeb1f16f1
13168 reality should reflect the mac_prop_id_t comment
commit 3626423cd8fd36c60b866e625aff599f055c7dc3
13167 Update hwdata to 2020.9.15
Conflicts:
usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
Diffstat (limited to 'usr/src/cmd')
21 files changed, 1134 insertions, 344 deletions
diff --git a/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile b/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile index ee93b7a258..a71f59e549 100644 --- a/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile +++ b/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile @@ -66,8 +66,6 @@ clobber: clean -$(RM) $(JDTRACE_JAR) -$(RM) $(PROG) -lint: - install: all $(PROTO_JDTRACE_JAR) $(CMD) $(XLIST) $(PROG): $(SRCS) @@ -75,7 +73,7 @@ $(PROG): $(SRCS) $(POST_PROCESS) ; $(STRIP_STABS) JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options,-path +JFLAGS += -source 7 -target 7 -Xlint:all,-options,-path COMPILE.java=$(JAVAC) $(JFLAGS) JAVASRC= JDTrace.java Getopt.java diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile b/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile index 04e6cca7b4..f8f6131c44 100644 --- a/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile +++ b/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile @@ -55,12 +55,10 @@ clobber: clean all: default -lint: - install: all $(PROTO_TEST_JAR) JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options,-rawtypes,-path +JFLAGS += -source 7 -target 7 -Xlint:all,-deprecation,-options,-rawtypes,-path COMPILE.java=$(JAVAC) $(JFLAGS) $(TEST_JAR): $(SRCDIR)/*.java diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile index 757f882219..9dfb547196 100644 --- a/usr/src/cmd/pools/poold/Makefile +++ b/usr/src/cmd/pools/poold/Makefile @@ -23,6 +23,8 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2020 Peter Tribble +# PROG = poold OBJS = poold.o @@ -32,7 +34,7 @@ MANIFEST= poold.xml SVCMETHOD= svc-poold include $(SRC)/cmd/Makefile.cmd -$(BLD_JAVA_8)include $(SRC)/cmd/Makefile.cmd.64 +include $(SRC)/cmd/Makefile.cmd.64 JAVA_SUBDIRS = com/sun/solaris/service/exception \ com/sun/solaris/service/kstat \ @@ -53,18 +55,16 @@ all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint msg := TARGET = msg $(ROOTMANIFEST):= FILEMODE= 444 JARFILE = JPool.jar -JAVA_LIB_PATH = $(JAVA_ROOT)/jre/lib/$(MACH)/client -LIBPOOL_PATH = $(ROOTLIB) -$(BLD_JAVA_8)JAVA_LIB_PATH = $(JAVA_ROOT)/jre/lib/$(MACH64)/server -$(BLD_JAVA_8)LIBPOOL_PATH = $(ROOTLIB64) +JAVA_LIB_PATH = $(JAVA_ROOT)/jre/lib/$(MACH64)/server +$(BLD_JAVA_11)JAVA_LIB_PATH = $(JAVA_ROOT)/lib/server +LIBPOOL_PATH = $(ROOTLIB64) -# JAVA_SUBDIRS and PACKAGEDOCS must be synchronized to ensure +# JAVA_SUBDIRS and PACKAGEDOCS must be synchronized to ensure # javadoc documentation is generated for all packages. PACKAGEDOCS = com.sun.solaris.service.exception \ @@ -83,10 +83,6 @@ LDLIBS += -lpool -L$(JAVA_LIB_PATH) -ljvm # runpath should point to runtime JAVA_HOME LDFLAGS += -R$(JAVA_LIB_PATH) -LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2 -$(BLD_JAVA_8)LINTFLAGS64 += -erroff=E_NAME_USED_NOT_DEF2 -LINTLIBS += -L$(LIBPOOL_PATH) -lpool - # not linted SMATCH=off @@ -120,8 +116,6 @@ clobber : $(JAVA_SUBDIRS) $(SUBDIRS) clobber_local clobber_local: clean_local $(RM) $(CLOBBERFILES) -lint: $(SUBDIRS) - msg: $(POFILES) install: $(ROOTCMD) $(JAVA_SUBDIRS) $(JARFILE) \ @@ -147,7 +141,7 @@ $(SUBDIRS): FRC doc: all $(JAVADOC) -private -classpath $(JARFILE): -sourcepath . \ - -source 1.4 -d $(DOCDIR) $(PACKAGEDOCS) + -source 7 -d $(DOCDIR) $(PACKAGEDOCS) $(PROG): $(OBJS) $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS) @@ -158,7 +152,4 @@ $(ROOTUSRLIBDRP)/%: % FRC: -lint: - $(LINT.c) $(PROG).c $(LINTLIBS) - include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/pools/poold/libjkstat/Makefile b/usr/src/cmd/pools/poold/libjkstat/Makefile index 810de1da26..117d8f73e7 100644 --- a/usr/src/cmd/pools/poold/libjkstat/Makefile +++ b/usr/src/cmd/pools/poold/libjkstat/Makefile @@ -22,34 +22,22 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2020 Peter Tribble +# include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) -$(BLD_JAVA_8)SUBDIRS = $(MACH64) +SUBDIRS = $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint - -JNI_CLASSES = \ - com.sun.solaris.service.kstat.Kstat \ - com.sun.solaris.service.kstat.KstatCtl - -JNI_GENERATED_HEADERS = \ - jkstat.h -CLEANFILES += $(JNI_GENERATED_HEADERS) - -all install lint: $(JNI_GENERATED_HEADERS) .WAIT $(SUBDIRS) +all install: $(SUBDIRS) clean clobber: $(SUBDIRS) -$(JNI_GENERATED_HEADERS): $(SRC)/cmd/pools/poold/JPool.jar - $(JAVAH) -classpath $? -o $@ $(JNI_CLASSES) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/pools/poold/libjkstat/i386/Makefile b/usr/src/cmd/pools/poold/libjkstat/i386/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjkstat/i386/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjkstat/jkstat.h b/usr/src/cmd/pools/poold/libjkstat/jkstat.h new file mode 100644 index 0000000000..c42acee6a1 --- /dev/null +++ b/usr/src/cmd/pools/poold/libjkstat/jkstat.h @@ -0,0 +1,96 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class com_sun_solaris_service_kstat_Kstat */ + +#ifndef _Included_com_sun_solaris_service_kstat_Kstat +#define _Included_com_sun_solaris_service_kstat_Kstat +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_solaris_service_kstat_Kstat + * Method: getSnapTime + * Signature: ()Lcom/sun/solaris/service/pools/HRTime; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_kstat_Kstat_getSnapTime + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_kstat_Kstat + * Method: getCreationTime + * Signature: ()Lcom/sun/solaris/service/pools/HRTime; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_kstat_Kstat_getCreationTime + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_kstat_Kstat + * Method: getValue + * Signature: (Ljava/lang/String;)Ljava/lang/Object; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_kstat_Kstat_getValue + (JNIEnv *, jobject, jstring); + +/* + * Class: com_sun_solaris_service_kstat_Kstat + * Method: read + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_kstat_Kstat_read + (JNIEnv *, jobject); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_sun_solaris_service_kstat_KstatCtl */ + +#ifndef _Included_com_sun_solaris_service_kstat_KstatCtl +#define _Included_com_sun_solaris_service_kstat_KstatCtl +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_solaris_service_kstat_KstatCtl + * Method: open + * Signature: ()J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_kstat_KstatCtl_open + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_kstat_KstatCtl + * Method: close + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_kstat_KstatCtl_close + (JNIEnv *, jobject, jlong); + +/* + * Class: com_sun_solaris_service_kstat_KstatCtl + * Method: lookup + * Signature: (Ljava/lang/String;ILjava/lang/String;)Lcom/sun/solaris/service/kstat/Kstat; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_kstat_KstatCtl_lookup + (JNIEnv *, jobject, jstring, jint, jstring); + +/* + * Class: com_sun_solaris_service_kstat_KstatCtl + * Method: chainUpdate + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_kstat_KstatCtl_chainUpdate + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_kstat_KstatCtl + * Method: init + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_kstat_KstatCtl_init + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile b/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjlgrp/Makefile b/usr/src/cmd/pools/poold/libjlgrp/Makefile index e8481498b8..117d8f73e7 100644 --- a/usr/src/cmd/pools/poold/libjlgrp/Makefile +++ b/usr/src/cmd/pools/poold/libjlgrp/Makefile @@ -22,34 +22,22 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2020 Peter Tribble +# include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) -$(BLD_JAVA_8)SUBDIRS = $(MACH64) +SUBDIRS = $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint - -JNI_CLASSES = \ - com.sun.solaris.service.locality.LocalityDomain \ - com.sun.solaris.service.locality.LocalityGroup - -JNI_GENERATED_HEADERS = \ - jlgrp.h -CLEANFILES += $(JNI_GENERATED_HEADERS) - -all install lint: $(JNI_GENERATED_HEADERS) .WAIT $(SUBDIRS) +all install: $(SUBDIRS) clean clobber: $(SUBDIRS) -$(JNI_GENERATED_HEADERS): $(SRC)/cmd/pools/poold/JPool.jar - $(JAVAH) -classpath $? -o $@ $(JNI_CLASSES) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile b/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjlgrp/jlgrp.h b/usr/src/cmd/pools/poold/libjlgrp/jlgrp.h new file mode 100644 index 0000000000..a1cdb6846f --- /dev/null +++ b/usr/src/cmd/pools/poold/libjlgrp/jlgrp.h @@ -0,0 +1,76 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class com_sun_solaris_service_locality_LocalityDomain */ + +#ifndef _Included_com_sun_solaris_service_locality_LocalityDomain +#define _Included_com_sun_solaris_service_locality_LocalityDomain +#ifdef __cplusplus +extern "C" { +#endif +#undef com_sun_solaris_service_locality_LocalityDomain_LGRP_VIEW_CALLER +#define com_sun_solaris_service_locality_LocalityDomain_LGRP_VIEW_CALLER 0L +#undef com_sun_solaris_service_locality_LocalityDomain_LGRP_VIEW_OS +#define com_sun_solaris_service_locality_LocalityDomain_LGRP_VIEW_OS 1L +/* + * Class: com_sun_solaris_service_locality_LocalityDomain + * Method: jl_init + * Signature: (I)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_locality_LocalityDomain_jl_1init + (JNIEnv *, jobject, jint); + +/* + * Class: com_sun_solaris_service_locality_LocalityDomain + * Method: jl_fini + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_locality_LocalityDomain_jl_1fini + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_locality_LocalityDomain + * Method: jl_root + * Signature: ()Lcom/sun/solaris/service/locality/LocalityGroup; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_locality_LocalityDomain_jl_1root + (JNIEnv *, jobject); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_sun_solaris_service_locality_LocalityGroup */ + +#ifndef _Included_com_sun_solaris_service_locality_LocalityGroup +#define _Included_com_sun_solaris_service_locality_LocalityGroup +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_solaris_service_locality_LocalityGroup + * Method: jl_children + * Signature: ()[J + */ +JNIEXPORT jlongArray JNICALL Java_com_sun_solaris_service_locality_LocalityGroup_jl_1children + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_locality_LocalityGroup + * Method: jl_cpus + * Signature: ()[I + */ +JNIEXPORT jintArray JNICALL Java_com_sun_solaris_service_locality_LocalityGroup_jl_1cpus + (JNIEnv *, jobject); + +/* + * Class: com_sun_solaris_service_locality_LocalityGroup + * Method: jl_latency + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_locality_LocalityGroup_jl_1latency + (JNIEnv *, jobject, jlong, jlong); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile b/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjpool/Makefile b/usr/src/cmd/pools/poold/libjpool/Makefile index 1a1b192654..117d8f73e7 100644 --- a/usr/src/cmd/pools/poold/libjpool/Makefile +++ b/usr/src/cmd/pools/poold/libjpool/Makefile @@ -22,36 +22,22 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2020 Peter Tribble +# include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) -$(BLD_JAVA_8)SUBDIRS = $(MACH64) +SUBDIRS = $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint - -JNI_CLASSES = \ - com.sun.solaris.service.pools.PoolInternal \ - com.sun.solaris.service.pools.Element \ - com.sun.solaris.service.pools.Value \ - com.sun.solaris.service.pools.HRTime - -JNI_GENERATED_HEADERS = \ - jpool.h -CLEANFILES += $(JNI_GENERATED_HEADERS) - -all install lint: $(JNI_GENERATED_HEADERS) .WAIT $(SUBDIRS) +all install: $(SUBDIRS) clean clobber: $(SUBDIRS) -$(JNI_GENERATED_HEADERS): $(SRC)/cmd/pools/poold/JPool.jar - $(JAVAH) -classpath $? -o $@ $(JNI_CLASSES) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/pools/poold/libjpool/i386/Makefile b/usr/src/cmd/pools/poold/libjpool/i386/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjpool/i386/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjpool/jpool.h b/usr/src/cmd/pools/poold/libjpool/jpool.h new file mode 100644 index 0000000000..42e3ce4e9d --- /dev/null +++ b/usr/src/cmd/pools/poold/libjpool/jpool.h @@ -0,0 +1,840 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class com_sun_solaris_service_pools_PoolInternal */ + +#ifndef _Included_com_sun_solaris_service_pools_PoolInternal +#define _Included_com_sun_solaris_service_pools_PoolInternal +#ifdef __cplusplus +extern "C" { +#endif +#undef com_sun_solaris_service_pools_PoolInternal_POOL_VER_CURRENT +#define com_sun_solaris_service_pools_PoolInternal_POOL_VER_CURRENT 1L +#undef com_sun_solaris_service_pools_PoolInternal_POOL_VER_NONE +#define com_sun_solaris_service_pools_PoolInternal_POOL_VER_NONE 0L +#undef com_sun_solaris_service_pools_PoolInternal_PO_TRUE +#define com_sun_solaris_service_pools_PoolInternal_PO_TRUE 1L +#undef com_sun_solaris_service_pools_PoolInternal_PO_FALSE +#define com_sun_solaris_service_pools_PoolInternal_PO_FALSE 0L +#undef com_sun_solaris_service_pools_PoolInternal_PO_SUCCESS +#define com_sun_solaris_service_pools_PoolInternal_PO_SUCCESS 0L +#undef com_sun_solaris_service_pools_PoolInternal_PO_FAIL +#define com_sun_solaris_service_pools_PoolInternal_PO_FAIL -1L +#undef com_sun_solaris_service_pools_PoolInternal_POE_OK +#define com_sun_solaris_service_pools_PoolInternal_POE_OK 0L +#undef com_sun_solaris_service_pools_PoolInternal_POE_BAD_PROP_TYPE +#define com_sun_solaris_service_pools_PoolInternal_POE_BAD_PROP_TYPE 1L +#undef com_sun_solaris_service_pools_PoolInternal_POE_INVALID_CONF +#define com_sun_solaris_service_pools_PoolInternal_POE_INVALID_CONF 2L +#undef com_sun_solaris_service_pools_PoolInternal_POE_NOTSUP +#define com_sun_solaris_service_pools_PoolInternal_POE_NOTSUP 3L +#undef com_sun_solaris_service_pools_PoolInternal_POE_INVALID_SEARCH +#define com_sun_solaris_service_pools_PoolInternal_POE_INVALID_SEARCH 4L +#undef com_sun_solaris_service_pools_PoolInternal_POE_BADPARAM +#define com_sun_solaris_service_pools_PoolInternal_POE_BADPARAM 5L +#undef com_sun_solaris_service_pools_PoolInternal_POE_PUTPROP +#define com_sun_solaris_service_pools_PoolInternal_POE_PUTPROP 6L +#undef com_sun_solaris_service_pools_PoolInternal_POE_DATASTORE +#define com_sun_solaris_service_pools_PoolInternal_POE_DATASTORE 7L +#undef com_sun_solaris_service_pools_PoolInternal_POE_SYSTEM +#define com_sun_solaris_service_pools_PoolInternal_POE_SYSTEM 8L +#undef com_sun_solaris_service_pools_PoolInternal_POE_ACCESS +#define com_sun_solaris_service_pools_PoolInternal_POE_ACCESS 9L +#undef com_sun_solaris_service_pools_PoolInternal_PO_RDONLY +#define com_sun_solaris_service_pools_PoolInternal_PO_RDONLY 0L +#undef com_sun_solaris_service_pools_PoolInternal_PO_RDWR +#define com_sun_solaris_service_pools_PoolInternal_PO_RDWR 1L +#undef com_sun_solaris_service_pools_PoolInternal_PO_CREAT +#define com_sun_solaris_service_pools_PoolInternal_PO_CREAT 2L +#undef com_sun_solaris_service_pools_PoolInternal_PO_DISCO +#define com_sun_solaris_service_pools_PoolInternal_PO_DISCO 4L +#undef com_sun_solaris_service_pools_PoolInternal_PO_UPDATE +#define com_sun_solaris_service_pools_PoolInternal_PO_UPDATE 8L +#undef com_sun_solaris_service_pools_PoolInternal_POU_SYSTEM +#define com_sun_solaris_service_pools_PoolInternal_POU_SYSTEM 1L +#undef com_sun_solaris_service_pools_PoolInternal_POU_POOL +#define com_sun_solaris_service_pools_PoolInternal_POU_POOL 2L +#undef com_sun_solaris_service_pools_PoolInternal_POU_PSET +#define com_sun_solaris_service_pools_PoolInternal_POU_PSET 4L +#undef com_sun_solaris_service_pools_PoolInternal_POU_CPU +#define com_sun_solaris_service_pools_PoolInternal_POU_CPU 8L +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: init + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_init + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_version + * Signature: (J)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1version + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POX_NATIVE + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POX_1NATIVE + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POX_TEXT + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POX_1TEXT + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POC_INVAL + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1INVAL + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POC_UINT + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1UINT + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POC_INT + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1INT + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POC_DOUBLE + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1DOUBLE + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POC_BOOL + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1BOOL + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POC_STRING + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1STRING + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POV_NONE + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1NONE + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POV_LOOSE + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1LOOSE + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POV_STRICT + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1STRICT + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POV_RUNTIME + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1RUNTIME + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POF_INVALID + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POF_1INVALID + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POF_VALID + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POF_1VALID + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: get_POF_DESTROY + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_get_1POF_1DESTROY + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_error + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1error + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_strerror + * Signature: (I)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1strerror + (JNIEnv *, jclass, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_strerror_sys + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1strerror_1sys + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_type_list + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1type_1list + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_status + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1status + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_set_status + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1set_1status + (JNIEnv *, jclass, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_alloc + * Signature: ()J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1alloc + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_free + * Signature: (J)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1free + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_status + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1status + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_close + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1close + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_remove + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1remove + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_open + * Signature: (JLjava/lang/String;I)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1open + (JNIEnv *, jclass, jlong, jstring, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_rollback + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1rollback + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_commit + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1commit + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_export + * Signature: (JLjava/lang/String;I)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1export + (JNIEnv *, jclass, jlong, jstring, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_validate + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1validate + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_update + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1update + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_pool + * Signature: (JLjava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1pool + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_query_pools + * Signature: (JLjava/util/List;)Ljava/util/List; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1pools + (JNIEnv *, jclass, jlong, jobject); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_resource + * Signature: (JLjava/lang/String;Ljava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1resource + (JNIEnv *, jclass, jlong, jstring, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_query_resources + * Signature: (JLjava/util/List;)Ljava/util/List; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1resources + (JNIEnv *, jclass, jlong, jobject); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_query_components + * Signature: (JLjava/util/List;)Ljava/util/List; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1components + (JNIEnv *, jclass, jlong, jobject); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_location + * Signature: (J)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1location + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_info + * Signature: (JI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1info + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_create + * Signature: (JLjava/lang/String;Ljava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1create + (JNIEnv *, jclass, jlong, jstring, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_destroy + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1destroy + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_transfer + * Signature: (JJJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1transfer + (JNIEnv *, jclass, jlong, jlong, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_xtransfer + * Signature: (JJJLjava/util/List;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1xtransfer + (JNIEnv *, jclass, jlong, jlong, jlong, jobject); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_query_resource_components + * Signature: (JJLjava/util/List;)Ljava/util/List; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1resource_1components + (JNIEnv *, jclass, jlong, jlong, jobject); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_info + * Signature: (JJI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1info + (JNIEnv *, jclass, jlong, jlong, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_create + * Signature: (JLjava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1create + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_destroy + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1destroy + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_associate + * Signature: (JJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1associate + (JNIEnv *, jclass, jlong, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_dissociate + * Signature: (JJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1dissociate + (JNIEnv *, jclass, jlong, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_info + * Signature: (JJI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1info + (JNIEnv *, jclass, jlong, jlong, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_query_pool_resources + * Signature: (JJLjava/util/List;)Ljava/util/List; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1pool_1resources + (JNIEnv *, jclass, jlong, jlong, jobject); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_owning_resource + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1owning_1resource + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_component_info + * Signature: (JJI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1component_1info + (JNIEnv *, jclass, jlong, jlong, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_property + * Signature: (JJLjava/lang/String;J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1property + (JNIEnv *, jclass, jlong, jlong, jstring, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_put_property + * Signature: (JJLjava/lang/String;J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1put_1property + (JNIEnv *, jclass, jlong, jlong, jstring, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_rm_property + * Signature: (JJLjava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1rm_1property + (JNIEnv *, jclass, jlong, jlong, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_walk_properties + * Signature: (JJJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1properties + (JNIEnv *, jclass, jlong, jlong, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_conf_to_elem + * Signature: (J)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1to_1elem + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_to_elem + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1to_1elem + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_resource_to_elem + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1to_1elem + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_component_to_elem + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1component_1to_1elem + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_uint64 + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1uint64 + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_int64 + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1int64 + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_double + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1double + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_bool + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1bool + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_string + * Signature: (JJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1string + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_type + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1type + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_set_uint64 + * Signature: (JJ)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1uint64 + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_set_int64 + * Signature: (JJ)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1int64 + (JNIEnv *, jclass, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_set_double + * Signature: (JD)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1double + (JNIEnv *, jclass, jlong, jdouble); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_set_bool + * Signature: (JS)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1bool + (JNIEnv *, jclass, jlong, jshort); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_set_string + * Signature: (JLjava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1string + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_get_name + * Signature: (J)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1name + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_set_name + * Signature: (JLjava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1name + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_alloc + * Signature: ()J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1alloc + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_value_free + * Signature: (J)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1free + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_static_location + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1static_1location + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_dynamic_location + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1dynamic_1location + (JNIEnv *, jclass); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_set_binding + * Signature: (Ljava/lang/String;II)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1set_1binding + (JNIEnv *, jclass, jstring, jint, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_binding + * Signature: (I)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1binding + (JNIEnv *, jclass, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_get_resource_binding + * Signature: (Ljava/lang/String;I)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1resource_1binding + (JNIEnv *, jclass, jstring, jint); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_walk_pools + * Signature: (JJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1pools + (JNIEnv *, jclass, jlong, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_walk_resources + * Signature: (JJJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1resources + (JNIEnv *, jclass, jlong, jlong, jlong, jlong); + +/* + * Class: com_sun_solaris_service_pools_PoolInternal + * Method: pool_walk_components + * Signature: (JJJJ)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1components + (JNIEnv *, jclass, jlong, jlong, jlong, jlong); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_sun_solaris_service_pools_Element */ + +#ifndef _Included_com_sun_solaris_service_pools_Element +#define _Included_com_sun_solaris_service_pools_Element +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_solaris_service_pools_Element + * Method: walkProps + * Signature: (JJLcom/sun/solaris/service/pools/PropertyWalk;Ljava/lang/Object;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_solaris_service_pools_Element_walkProps + (JNIEnv *, jobject, jlong, jlong, jobject, jobject); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_sun_solaris_service_pools_Value */ + +#ifndef _Included_com_sun_solaris_service_pools_Value +#define _Included_com_sun_solaris_service_pools_Value +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_solaris_service_pools_Value + * Method: getUnsignedInt64Value + * Signature: (J)Lcom/sun/solaris/service/pools/UnsignedInt64; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_Value_getUnsignedInt64Value + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_Value + * Method: getLongValue + * Signature: (J)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_solaris_service_pools_Value_getLongValue + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_Value + * Method: getStringValue + * Signature: (J)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_solaris_service_pools_Value_getStringValue + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_Value + * Method: getBoolValue + * Signature: (J)Z + */ +JNIEXPORT jboolean JNICALL Java_com_sun_solaris_service_pools_Value_getBoolValue + (JNIEnv *, jclass, jlong); + +/* + * Class: com_sun_solaris_service_pools_Value + * Method: getDoubleValue + * Signature: (J)D + */ +JNIEXPORT jdouble JNICALL Java_com_sun_solaris_service_pools_Value_getDoubleValue + (JNIEnv *, jclass, jlong); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_sun_solaris_service_pools_HRTime */ + +#ifndef _Included_com_sun_solaris_service_pools_HRTime +#define _Included_com_sun_solaris_service_pools_HRTime +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_solaris_service_pools_HRTime + * Method: timestamp + * Signature: ()Lcom/sun/solaris/service/pools/UnsignedInt64; + */ +JNIEXPORT jobject JNICALL Java_com_sun_solaris_service_pools_HRTime_timestamp + (JNIEnv *, jobject); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/usr/src/cmd/pools/poold/libjpool/sparc/Makefile b/usr/src/cmd/pools/poold/libjpool/sparc/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjpool/sparc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjsyslog/Makefile b/usr/src/cmd/pools/poold/libjsyslog/Makefile index e92960f43a..117d8f73e7 100644 --- a/usr/src/cmd/pools/poold/libjsyslog/Makefile +++ b/usr/src/cmd/pools/poold/libjsyslog/Makefile @@ -22,33 +22,22 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2020 Peter Tribble +# include $(SRC)/lib/Makefile.lib -SUBDIRS = $(MACH) -$(BLD_JAVA_8)SUBDIRS = $(MACH64) +SUBDIRS = $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint - -JNI_CLASSES = \ - com.sun.solaris.service.logging.SyslogHandler - -JNI_GENERATED_HEADERS = \ - jsyslog.h -CLEANFILES += $(JNI_GENERATED_HEADERS) - -all install lint: $(JNI_GENERATED_HEADERS) .WAIT $(SUBDIRS) +all install: $(SUBDIRS) clean clobber: $(SUBDIRS) -$(JNI_GENERATED_HEADERS): $(SRC)/cmd/pools/poold/JPool.jar - $(JAVAH) -classpath $? -o $@ $(JNI_CLASSES) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile b/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/pools/poold/libjsyslog/jsyslog.h b/usr/src/cmd/pools/poold/libjsyslog/jsyslog.h new file mode 100644 index 0000000000..24e631e351 --- /dev/null +++ b/usr/src/cmd/pools/poold/libjsyslog/jsyslog.h @@ -0,0 +1,39 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class com_sun_solaris_service_logging_SyslogHandler */ + +#ifndef _Included_com_sun_solaris_service_logging_SyslogHandler +#define _Included_com_sun_solaris_service_logging_SyslogHandler +#ifdef __cplusplus +extern "C" { +#endif +#undef com_sun_solaris_service_logging_SyslogHandler_DEF_LOGOPT +#define com_sun_solaris_service_logging_SyslogHandler_DEF_LOGOPT 0L +/* + * Class: com_sun_solaris_service_logging_SyslogHandler + * Method: syslog + * Signature: (ILjava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_logging_SyslogHandler_syslog + (JNIEnv *, jclass, jint, jstring); + +/* + * Class: com_sun_solaris_service_logging_SyslogHandler + * Method: openlog + * Signature: (Ljava/lang/String;II)V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_logging_SyslogHandler_openlog + (JNIEnv *, jclass, jstring, jint, jint); + +/* + * Class: com_sun_solaris_service_logging_SyslogHandler + * Method: closelog + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_solaris_service_logging_SyslogHandler_closelog + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile b/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile deleted file mode 100644 index 35ac6d4219..0000000000 --- a/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile index 67be7d0b27..e3ad77dd61 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile @@ -23,6 +23,8 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2020 Peter Tribble +# # # Makefile for Java Print Manager server @@ -31,8 +33,6 @@ LIBRARY = libpmgr.a VERS = .1 -JNIHDR_FILES = com_sun_admin_pm_server_DoPrinterNS.h - OBJECTS = DoPrinterNS.o NS.o CLASSFILES = Printer.class \ @@ -59,8 +59,6 @@ CLASSFILES = Printer.class \ pmNSNotConfiguredException.class \ pmMisc.class -JNICLASSFILES = DoPrinterNS.class - include $(SRC)/lib/Makefile.lib SRCDIR = . @@ -93,29 +91,19 @@ SMATCH=off LDLIBS += -lprint -lnsl -lsocket -lc CLEANFILES= *.class -CLOBBERFILES= $(JNIHDR_FILES) $(LIBLINKS) +CLOBBERFILES= $(LIBLINKS) -all: $(CLASSFILES) $(JNIHDR_FILES) $(DYNLIB) +all: $(CLASSFILES) $(DYNLIB) install: all $(ROOTDIRS) $(ROOTLINKS) # -# Build jni header file -# Use $@ instead of the "unreliable" $* -# -$(JNIHDR_FILES): $(JNICLASSFILES) - $(JAVAH) -jni -classpath $(CLASSPATH) \ - `echo $@ | sed 's/.h$$//' | tr _ .` - -# # Build standalone programs for testing # NS: NS.c $(CC) NS.c $(CCGDEBUG) $(ILDOFF) -o NS -DMAIN=1 $(ENVLDLIBS1) $(ENVLIBS2) \ -lprint -lnsl -lsocket -lint: $(JNIHDR_FILES) - cstyle: cstyle $(SRCS) diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h new file mode 100644 index 0000000000..c841395820 --- /dev/null +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h @@ -0,0 +1,53 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class com_sun_admin_pm_server_DoPrinterNS */ + +#ifndef _Included_com_sun_admin_pm_server_DoPrinterNS +#define _Included_com_sun_admin_pm_server_DoPrinterNS +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_sun_admin_pm_server_DoPrinterNS + * Method: dorexec + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_dorexec + (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring); + +/* + * Class: com_sun_admin_pm_server_DoPrinterNS + * Method: updateoldyp + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_updateoldyp + (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring, jstring); + +/* + * Class: com_sun_admin_pm_server_DoPrinterNS + * Method: updateldap + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_updateldap + (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring); + +/* + * Class: com_sun_admin_pm_server_DoPrinterNS + * Method: getstderr + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_getstderr + (JNIEnv *, jclass); + +/* + * Class: com_sun_admin_pm_server_DoPrinterNS + * Method: getstdout + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_getstdout + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif |