archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field

Browse source 
Don't use HS_DTRACE_PROBE_CDECL_N and HS_DTRACE_PROBE_N directly.

Reviewed-by: coleenp, kamg, dholmes, sspitsyn
This commit is contained in:
Mark Wielaard 2012-10-08 09:18:54 -04:00 • committed by Coleen Phillimore
parent 5ad6116c61
commit 959d0a9ebb
7 changed files with 120 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/prims/jni.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -2820,10 +2821,9 @@ JNI_END
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
JNIWrapper("Set" XSTR(Result) "Field"); \
\
HS_DTRACE_PROBE_CDECL_N(hotspot_jni, Set##Result##Field__entry, \
( JNIEnv*, jobject, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \
HS_DTRACE_PROBE_N(hotspot_jni, Set##Result##Field__entry, \
( env, obj, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \
FP_SELECT_##Result( \
DTRACE_PROBE4(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID, value), \
DTRACE_PROBE3(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID)); \
\
oop o = JNIHandles::resolve_non_null(obj); \
Klass* k = o->klass(); \
@ -3130,10 +3130,9 @@ JNI_END
\
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \
JNIWrapper("SetStatic" XSTR(Result) "Field"); \
HS_DTRACE_PROBE_CDECL_N(hotspot_jni, SetStatic##Result##Field__entry,\
( JNIEnv*, jclass, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \
HS_DTRACE_PROBE_N(hotspot_jni, SetStatic##Result##Field__entry, \
( env, clazz, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \
FP_SELECT_##Result( \
DTRACE_PROBE4(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID, value), \
DTRACE_PROBE3(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID)); \
\
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
assert(id->is_static_field_id(), "invalid static field id"); \