From e16102e69f3a6fcbad46cccd2f6a88a9210f7d49 Mon Sep 17 00:00:00 2001 From: mbaesken Date: Tue, 19 Dec 2017 15:17:56 +0100 Subject: [PATCH] 8193807: Avoid UnsatisfiedLinkError on AIX by providing empty basic implementations of getSystemCpuLoad and getProcessCpuLoad Reviewed-by: erikj, simonis --- make/lib/ServiceabilityLibraries.gmk | 4 ++ .../sun/management/AixOperatingSystem.c | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/aix/native/sun/management/AixOperatingSystem.c diff --git a/make/lib/ServiceabilityLibraries.gmk b/make/lib/ServiceabilityLibraries.gmk index bd31a4404..31ffff62b 100644 --- a/make/lib/ServiceabilityLibraries.gmk +++ b/make/lib/ServiceabilityLibraries.gmk @@ -290,6 +290,10 @@ BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT) BUILD_LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/share/native/sun/management \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management +ifeq ($(OPENJDK_TARGET_OS),aix) + BUILD_LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/aix/native/sun/management +endif + BUILD_LIBMANAGEMENT_EXCLUDES := BUILD_LIBMANAGEMENT_CFLAGS += -I$(JDK_TOPDIR)/src/share/native/sun/management diff --git a/src/aix/native/sun/management/AixOperatingSystem.c b/src/aix/native/sun/management/AixOperatingSystem.c new file mode 100644 index 000000000..d8be8ea1e --- /dev/null +++ b/src/aix/native/sun/management/AixOperatingSystem.c @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright 2017 SAP SE. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include "sun_management_OperatingSystemImpl.h" + +JNIEXPORT jdouble JNICALL +Java_sun_management_OperatingSystemImpl_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + return -1.0; +} + +JNIEXPORT jdouble JNICALL +Java_sun_management_OperatingSystemImpl_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + return -1.0; +} -- GitLab