[PATCH 1 of 4] 7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field (original) (raw)
Mark Wielaard mjw at redhat.com
Fri Jul 20 07:34:29 PDT 2012
- Previous message: [PATCH 0 of 4] Add support for dtrace compatible sdt probes on GNU/Linux
- Next message: [PATCH 3 of 4] 7170638: Enable dtrace compatible sdt probes on GNU/Linux builds
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
src/share/vm/prims/jni.cpp | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-)
HG changeset patch
User Mark Wielaard <mark at klomp.org>
Date 1342788059 -7200
Node ID f36b62abb026adbd458a9d9414684f3ac80f9ac9
Parent bc3e0189980428f5f80391841af0194f22faec85
7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field. Summary: Don't use HS_DTRACE_PROBE_CDECL_N and HS_DTRACE_PROBE_N directly. Contributed-by: Mark Wielaard <mjw at redhat.com>
diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp --- a/src/share/vm/prims/jni.cpp +++ b/src/share/vm/prims/jni.cpp @@ -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,7 @@
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);
klassOop k = o->klass();
@@ -3130,10 +3128,7 @@
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"); \
- Previous message: [PATCH 0 of 4] Add support for dtrace compatible sdt probes on GNU/Linux
- Next message: [PATCH 3 of 4] 7170638: Enable dtrace compatible sdt probes on GNU/Linux builds
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]