# HG changeset patch
# User clanger
# Date 1587463409 -7200
# Node ID 35063c223567ceedc326fff613fa863e916ca2e5
# Parent  0df63a32f7bb644b721095d0a7aaf44818ab90d9
8241902: AIX Build broken after integration of JDK-8223147 (JFR Backport)
Reviewed-by: mdoerr, apetushkov

diff -r 0df63a32f7bb -r 35063c223567 make/aix/makefiles/buildtree.make
--- a/make/aix/makefiles/buildtree.make	Wed Apr 15 15:19:07 2020 +0200
+++ b/make/aix/makefiles/buildtree.make	Tue Apr 21 12:03:29 2020 +0200
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2020 SAP SE. All rights reserved.
 # Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -49,7 +49,7 @@
 # flags.make	- with macro settings
 # vm.make	- to support making "$(MAKE) -v vm.make" in makefiles
 # adlc.make	-
-# trace.make	- generate tracing event and type definitions
+# jfr.make	- generate jfr event and type definitions
 # jvmti.make	- generate JVMTI bindings from the spec (JSR-163)
 # sa.make	- generate SA jar file and natives
 #
@@ -111,6 +111,10 @@
 endif
 endif
 
+ifeq ($(ENABLE_JFR),false)
+ALWAYS_EXCLUDE_DIRS += -o -name jfr
+endif
+
 # Get things from the platform file.
 COMPILER	= $(shell sed -n 's/^compiler[ 	]*=[ 	]*//p' $(PLATFORM_FILE))
 
@@ -118,7 +122,7 @@
 	$(PLATFORM_DIR)/generated/dependencies \
 	$(PLATFORM_DIR)/generated/adfiles \
 	$(PLATFORM_DIR)/generated/jvmtifiles \
-	$(PLATFORM_DIR)/generated/tracefiles
+	$(PLATFORM_DIR)/generated/jfrfiles
 
 TARGETS      = debug fastdebug optimized product
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
@@ -126,7 +130,7 @@
 # For dependencies and recursive makes.
 BUILDTREE_MAKE	= $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
 
-BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make trace.make sa.make
+BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make jfr.make sa.make
 
 BUILDTREE_VARS	= GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
 	SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
@@ -195,6 +199,12 @@
 
 DATA_MODE = $(DATA_MODE/$(BUILDARCH))
 
+ifeq ($(ENABLE_JFR), true)
+  INCLUDE_JFR = 1
+else
+  INCLUDE_JFR = 0
+endif
+
 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
 	@echo Creating $@ ...
 	$(QUIETLY) ( \
@@ -274,8 +284,7 @@
 	    echo && \
 	    echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
 	    echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
-	[ -n "$(INCLUDE_TRACE)" ] && \
-	    echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
+	echo && echo "CFLAGS += -DINCLUDE_JFR=$(INCLUDE_JFR)"; \
 	echo; \
 	[ -n "$(SPEC)" ] && \
 	    echo "include $(SPEC)"; \
@@ -344,7 +353,7 @@
 	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
-trace.make: $(BUILDTREE_MAKE)
+jfr.make: $(BUILDTREE_MAKE)
 	@echo Creating $@ ...
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
diff -r 0df63a32f7bb -r 35063c223567 make/aix/makefiles/jfr.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/aix/makefiles/jfr.make	Tue Apr 21 12:03:29 2020 +0200
@@ -0,0 +1,92 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020 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.
+#
+# 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.
+#
+#
+
+# This makefile (jfr.make) is included from the jfr.make in the
+# build directories.
+#
+# It knows how to build and run the tools to generate jfr.
+
+include $(GAMMADIR)/make/linux/makefiles/rules.make
+
+# #########################################################################
+# Build tools needed for the Jfr source code generation
+
+TOPDIR      = $(shell echo `pwd`)
+GENERATED   = $(TOPDIR)/../generated
+
+JFR_TOOLS_SRCDIR := $(GAMMADIR)/src/share/vm/jfr
+JFR_TOOLS_OUTPUTDIR := $(GENERATED)/tools/jfr
+
+JFR_OUTPUTDIR := $(GENERATED)/jfrfiles
+JFR_SRCDIR := $(GAMMADIR)/src/share/vm/jfr/metadata
+
+METADATA_XML ?= $(JFR_SRCDIR)/metadata.xml
+METADATA_XSD ?= $(JFR_SRCDIR)/metadata.xsd
+
+# Changing these will trigger a rebuild of generated jfr files.
+JFR_DEPS += \
+    $(METADATA_XML) \
+    $(METADATA_XSD) \
+    #
+
+JfrGeneratedNames = \
+	jfrEventClasses.hpp \
+	jfrEventControl.hpp \
+	jfrEventIds.hpp \
+	jfrPeriodic.hpp \
+	jfrTypes.hpp
+
+JfrGenSource = $(JFR_TOOLS_SRCDIR)/GenerateJfrFiles.java
+JfrGenClass = $(JFR_TOOLS_OUTPUTDIR)/build/tools/jfr/GenerateJfrFiles.class
+
+JfrGeneratedFiles = $(JfrGeneratedNames:%=$(JFR_OUTPUTDIR/%)
+
+.PHONY: all clean cleanall
+
+# #########################################################################
+
+all: $(JfrGeneratedFiles)
+
+$(JfrGenClass): $(JfrGenSource)
+	mkdir -p $(@D)
+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JFR_TOOLS_OUTPUTDIR) $(JfrGenSource)
+
+$(JFR_OUTPUTDIR)/jfrEventClasses.hpp: $(METADATA_XML) $(METADATA_XSD) $(JfrGenClass)
+	$(QUIETLY) echo Generating $(@F)
+	mkdir -p $(@D)
+	$(QUIETLY) $(REMOTE) $(RUN.JAVA) -cp $(JFR_TOOLS_OUTPUTDIR) build.tools.jfr.GenerateJfrFiles $(METADATA_XML) $(METADATA_XSD) $(JFR_OUTPUTDIR)
+	test -f $@
+
+$(filter-out $(JFR_OUTPUTDIR)/jfrEventClasses.hpp, $(JfrGeneratedFiles)): $(JFR_OUTPUTDIR)/jfrEventClasses.hpp
+
+TARGETS += $(JFR_OUTPUTDIR)/jfrEventClasses.hpp
+
+# #########################################################################
+
+clean cleanall :
+	rm $(JfrGenClass) $(JfrGeneratedFiles)
+
+# #########################################################################
+
diff -r 0df63a32f7bb -r 35063c223567 make/aix/makefiles/top.make
--- a/make/aix/makefiles/top.make	Wed Apr 15 15:19:07 2020 +0200
+++ b/make/aix/makefiles/top.make	Tue Apr 21 12:03:29 2020 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2020, Oracle and/or its affiliates. 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
@@ -80,7 +80,7 @@
 	@echo All done.
 
 # This is an explicit dependency for the sake of parallel makes.
-vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) trace_stuff jvmti_stuff sa_stuff
+vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) jfr_stuff jvmti_stuff sa_stuff
 	@# We need a null action here, so implicit rules don't get consulted.
 
 $(Cached_plat): $(Plat_File)
@@ -94,9 +94,9 @@
 jvmti_stuff: $(Cached_plat) $(adjust-mflags)
 	@$(MAKE) -f jvmti.make $(MFLAGS-adjusted)
 
-# generate trace files
-trace_stuff: jvmti_stuff $(Cached_plat) $(adjust-mflags)
-	@$(MAKE) -f trace.make $(MFLAGS-adjusted)
+# generate JFR files
+jfr_stuff: $(Cached_plat) $(adjust-mflags)
+	@$(MAKE) -f jfr.make $(MFLAGS-adjusted)
 
 # generate SA jar files and native header
 sa_stuff:
diff -r 0df63a32f7bb -r 35063c223567 make/aix/makefiles/vm.make
--- a/make/aix/makefiles/vm.make	Wed Apr 15 15:19:07 2020 +0200
+++ b/make/aix/makefiles/vm.make	Tue Apr 21 12:03:29 2020 +0200
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2020 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
@@ -53,7 +53,7 @@
 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
 # The adfiles directory contains ad_<arch>.[ch]pp.
 # The jvmtifiles directory contains jvmti*.[ch]pp
-Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
+Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles
 VPATH += $(Src_Dirs_V:%=%:)
 
 # set INCLUDES for C preprocessor.
@@ -147,24 +147,22 @@
 LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
 LIBJVM_DIZ         = lib$(JVM).diz
 
+ifeq ($(ENABLE_JFR),false)
+EXCLUDE_JFR_PATHS:= -o -name jfr -prune
+endif
+
 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
 
 SOURCE_PATHS=\
   $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
-      \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
+      \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) $(EXCLUDE_JFR_PATHS) \))
 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(SRCARCH)/vm
 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_family)_$(SRCARCH)/vm
 
 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
-CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
-
-ifneq ($(INCLUDE_TRACE), false)
-CORE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
-  find $(HS_ALT_SRC)/share/vm/jfr -type d; \
-  fi)
-endif
+CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles
 
 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
 COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
diff -r 0df63a32f7bb -r 35063c223567 src/os/aix/vm/os_perf_aix.cpp
--- a/src/os/aix/vm/os_perf_aix.cpp	Wed Apr 15 15:19:07 2020 +0200
+++ b/src/os/aix/vm/os_perf_aix.cpp	Tue Apr 21 12:03:29 2020 +0200
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020 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
@@ -28,8 +29,7 @@
 #include "os_aix.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/os_perf.hpp"
-
-#include CPU_HEADER(vm_version_ext)
+#include "vm_version_ext_ppc.hpp"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -179,32 +179,6 @@
 
 */
 
-/**
- * For platforms that have them, when declaring
- * a printf-style function,
- *   formatSpec is the parameter number (starting at 1)
- *       that is the format argument ("%d pid %s")
- *   params is the parameter number where the actual args to
- *       the format starts. If the args are in a va_list, this
- *       should be 0.
- */
-#ifndef PRINTF_ARGS
-#  define PRINTF_ARGS(formatSpec,  params) ATTRIBUTE_PRINTF(formatSpec, params)
-#endif
-
-#ifndef SCANF_ARGS
-#  define SCANF_ARGS(formatSpec,   params) ATTRIBUTE_SCANF(formatSpec, params)
-#endif
-
-#ifndef _PRINTFMT_
-#  define _PRINTFMT_
-#endif
-
-#ifndef _SCANFMT_
-#  define _SCANFMT_
-#endif
-
-
 struct CPUPerfTicks {
   uint64_t  used;
   uint64_t  usedKernel;
@@ -234,7 +208,7 @@
 /** reads /proc/<pid>/stat data, with some checks and some skips.
  *  Ensure that 'fmt' does _NOT_ contain the first two "%d %s"
  */
-static int SCANF_ARGS(2, 0) vread_statdata(const char* procfile, _SCANFMT_ const char* fmt, va_list args) {
+static int vread_statdata(const char* procfile, const char* fmt, va_list args) {
   FILE*f;
   int n;
   char buf[2048];
@@ -263,7 +237,7 @@
   return n;
 }
 
-static int SCANF_ARGS(2, 3) read_statdata(const char* procfile, _SCANFMT_ const char* fmt, ...) {
+static int read_statdata(const char* procfile, const char* fmt, ...) {
   int   n;
   va_list args;
 
@@ -472,7 +446,7 @@
   return user_load;
 }
 
-static int SCANF_ARGS(1, 2) parse_stat(_SCANFMT_ const char* fmt, ...) {
+static int parse_stat(const char* fmt, ...) {
   FILE *f;
   va_list args;
 
@@ -609,7 +583,7 @@
 
 CPUPerformanceInterface::CPUPerformance::~CPUPerformance() {
   if (_counters.cpus != NULL) {
-    FREE_C_HEAP_ARRAY(char, _counters.cpus);
+    FREE_C_HEAP_ARRAY(char, _counters.cpus, mtInternal);
   }
 }
 
@@ -886,7 +860,7 @@
   cmdline = get_cmdline();
   if (cmdline != NULL) {
     process_info->set_command_line(allocate_string(cmdline));
-    FREE_C_HEAP_ARRAY(char, cmdline);
+    FREE_C_HEAP_ARRAY(char, cmdline, mtInternal);
   }
 
   return OS_OK;
@@ -1011,12 +985,12 @@
   if (_cpu_info != NULL) {
     if (_cpu_info->cpu_name() != NULL) {
       const char* cpu_name = _cpu_info->cpu_name();
-      FREE_C_HEAP_ARRAY(char, cpu_name);
+      FREE_C_HEAP_ARRAY(char, cpu_name, mtInternal);
       _cpu_info->set_cpu_name(NULL);
     }
     if (_cpu_info->cpu_description() != NULL) {
        const char* cpu_desc = _cpu_info->cpu_description();
-       FREE_C_HEAP_ARRAY(char, cpu_desc);
+       FREE_C_HEAP_ARRAY(char, cpu_desc, mtInternal);
       _cpu_info->set_cpu_description(NULL);
     }
     delete _cpu_info;