Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 02c4ca10 编写于 作者: S sla
浏览文件
操作

8005008: Add Java Flight Recorder Phase II 

Reviewed-by: erikj
Contributed-by: NKaren Kinnear &lt;karen.kinnear@oracle.com&gt;, Bengt Rutisson &lt;bengt.rutisson@oracle.com&gt;, Calvin Cheung &lt;calvin.cheung@oracle.com&gt;, Erik Gahlin &lt;erik.gahlin@oracle.com&gt;, Erik Helin &lt;erik.helin@oracle.com&gt;, Jesper Wilhelmsson &lt;jesper.wilhelmsson@oracle.com&gt;, Keith McGuigan &lt;keith.mcguigan@oracle.com&gt;, Mattias Tobiasson &lt;mattias.tobiasson@oracle.com&gt;, Markus Gronlund &lt;markus.gronlund@oracle.com&gt;, Mikael Auno &lt;mikael.auno@oracle.com&gt;, Nils Eliasson &lt;nils.eliasson@oracle.com&gt;, Nils Loodin &lt;nils.loodin@oracle.com&gt;, Rickard Backman &lt;rickard.backman@oracle.com&gt;, Staffan Larsen &lt;staffan.larsen@oracle.com&gt;, Stefan Karlsson &lt;stefan.karlsson@oracle.com&gt;, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
上级 5dd70da1
显示空白变更内容
内联 并排
Showing with 69 addition and 26 deletion
make/com/oracle/jfr/Makefile
浏览文件 @ 02c4ca10
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2013, 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
......@@ -42,6 +42,11 @@ FILES_c = VMJFR.c
AUTO_FILES_JAVA_DIRS = com/oracle/jrockit/jfr oracle/jrockit/jfr
JFC_XSD = oracle/jrockit/jfr/settings/jfc.xsd
JFC_XSD_SRC = $(CLOSED_SHARE_SRC)/classes/$(JFC_XSD)
JFC_XSD_FILE = $(CLASSDESTDIR)/$(JFC_XSD)
# Find C source files
#
vpath %.c $(CLOSED_SHARE_SRC)/native/oracle/jfr
......@@ -59,15 +64,17 @@ clean clobber::
$(RM) -r $(CLASSDESTDIR)/com/oracle/jrockit/jfr
$(RM) -r $(CLASSDESTDIR)/oracle/jrockit/jfr
# Copy pre-shipped .jfs files
# Copy pre-shipped .jfc files
JFR_LIBDIR = $(LIBDIR)/jfr
JFR_SRCDIR = $(CLOSED_SHARE_SRC)/lib/jfr
JFC_SRCDIR = $(CLOSED_SHARE_SRC)/classes/oracle/jrockit/jfr/settings
$(JFR_LIBDIR)/%.jfs: $(JFR_SRCDIR)/%.jfs
$(JFR_LIBDIR)/%.jfc: $(JFC_SRCDIR)/%.jfc
$(install-file)
JFS_FILES := $(subst $(JFR_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFR_SRCDIR)/*.jfs))
JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc))
$(JFC_XSD_FILE) : $(JFC_XSD_SRC)
$(install-file)
all build : $(JFS_FILES)
all build : $(JFC_FILES) $(JFC_XSD_FILE)
makefiles/CopyFiles.gmk
浏览文件 @ 02c4ca10
......@@ -537,3 +537,22 @@ $(JDK_OUTPUTDIR)/lib/sound.properties : $(JDK_TOPDIR)/src/share/lib/sound.proper
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
##########################################################################################
ifndef OPENJDK
ifeq ($(ENABLE_JFR), true)
JFR_CONFIGURATION_DIR_SRC := $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings/
JFR_CONFIGURATION_DIR_DST := $(LIBDIR)/jfr/
JFR_SRC_FILES = $(wildcard $(JFR_CONFIGURATION_DIR_SRC)/*.jfc)
JFR_TARGET_FILES = $(subst $(JFR_CONFIGURATION_DIR_SRC),$(JFR_CONFIGURATION_DIR_DST),$(JFR_SRC_FILES))
$(JFR_CONFIGURATION_DIR_DST)/%.jfc : $(JFR_CONFIGURATION_DIR_SRC)/%.jfc
$(call install-file)
COPY_FILES += $(JFR_TARGET_FILES)
endif
endif
##########################################################################################
makefiles/CopyIntoClasses.gmk
浏览文件 @ 02c4ca10
......@@ -91,6 +91,12 @@ ifndef OPENJDK
$(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
endif
ifndef OPENJDK
JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
COPY_FILES += \
$(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
endif
SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic
COPY_FILES += \
$(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
......
makefiles/CreateJars.gmk
浏览文件 @ 02c4ca10
......@@ -426,6 +426,7 @@ ifndef OPENJDK
ifeq ($(ENABLE_JFR), true)
$(eval $(call SetupArchive,BUILD_JFR_JAR,,\
SRCS:=$(JDK_OUTPUTDIR)/classes,\
SUFFIXES:=.class .jfc .xsd,\
INCLUDES:=com/oracle/jrockit/jfr \
oracle/jrockit/jfr,\
JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
......
makefiles/mapfiles/libjfr/mapfile-vers
浏览文件 @ 02c4ca10
#
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
#
......@@ -17,7 +17,7 @@ SUNWprivate_1.1 {
Java_oracle_jrockit_jfr_VMJFR_addConstPool;
Java_oracle_jrockit_jfr_VMJFR_removeConstPool;
Java_oracle_jrockit_jfr_VMJFR_storeConstPool;
Java_oracle_jrockit_jfr_VMJFR_classID;
Java_oracle_jrockit_jfr_VMJFR_classID0;
Java_oracle_jrockit_jfr_VMJFR_stackTraceID;
Java_oracle_jrockit_jfr_VMJFR_threadID;
Java_oracle_jrockit_jfr_VMJFR_rotate;
......@@ -33,6 +33,7 @@ SUNWprivate_1.1 {
Java_oracle_jrockit_jfr_VMJFR_setPeriod;
Java_oracle_jrockit_jfr_VMJFR_getPeriod;
Java_oracle_jrockit_jfr_VMJFR_descriptors;
Java_oracle_jrockit_jfr_VMJFR_redefineClass0;
JNI_OnLoad;
local:
*;
......
makefiles/mapfiles/libjli/mapfile-vers
浏览文件 @ 02c4ca10
......@@ -36,6 +36,7 @@ SUNWprivate_1.1 {
JLI_ReportExceptionDescription;
JLI_GetStdArgs;
JLI_GetStdArgc;
local:
*;
};
src/share/lib/security/java.security-linux
浏览文件 @ 02c4ca10
......@@ -202,6 +202,7 @@ package.access=sun.,\
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
oracle.jrockit.jfr.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.
......@@ -243,6 +244,7 @@ package.definition=sun.,\
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
oracle.jrockit.jfr.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.
......
src/share/lib/security/java.security-macosx
浏览文件 @ 02c4ca10
......@@ -206,7 +206,8 @@ package.access=sun.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
apple.
apple.,\
oracle.jrockit.jfr.
#
# List of comma-separated packages that start with or equal this string
......@@ -247,7 +248,8 @@ package.definition=sun.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
apple.
apple.,\
oracle.jrockit.jfr.
#
# Determines whether this properties file can be appended to
......
src/share/lib/security/java.security-solaris
浏览文件 @ 02c4ca10
......@@ -204,6 +204,7 @@ package.access=sun.,\
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
oracle.jrockit.jfr.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.
......@@ -244,6 +245,7 @@ package.definition=sun.,\
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
oracle.jrockit.jfr.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.
......
src/share/lib/security/java.security-windows
浏览文件 @ 02c4ca10
......@@ -203,6 +203,7 @@ package.access=sun.,\
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
oracle.jrockit.jfr.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
......@@ -244,6 +245,7 @@ package.definition=sun.,\
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
oracle.jrockit.jfr.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或