From 2c20694af71c89207d873d0c419ef3cb8ab50d5d Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 8 Dec 2022 09:22:51 +0000 Subject: Revert "Add JDWP metrics to DDM traffic" This reverts commit bfdde81372dd9060e52e2aeb1fd77990283c1f5e. Reason for revert: Potential culprit for org.apache.harmony.jpda.tests.jdwp.VirtualMachine_ExitTest#testExit001 failure Change-Id: Icdb08a2e400d92f125547e1c7998f1df5bbe5bd9 --- src/share/back/VirtualMachineImpl.c | 8 --- src/share/back/debugInit.c | 7 --- src/share/back/debugLoop.c | 12 ----- src/share/back/timing.c | 104 ------------------------------------ src/share/back/timing.h | 40 -------------- src/share/back/util.c | 10 +--- src/share/back/util.h | 1 - 7 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 src/share/back/timing.c delete mode 100644 src/share/back/timing.h diff --git a/src/share/back/VirtualMachineImpl.c b/src/share/back/VirtualMachineImpl.c index 1e8b96938..fde53c3e3 100644 --- a/src/share/back/VirtualMachineImpl.c +++ b/src/share/back/VirtualMachineImpl.c @@ -34,10 +34,6 @@ #include "SDE.h" #include "FrameID.h" -// ANDROID-CHANGED: Need to sent metrics before doExit -#include "timing.h" - - static char *versionName = "Java Debug Wire Protocol (Reference Implementation)"; static int majorVersion = 1; /* JDWP major version */ static int minorVersion = 8; /* JDWP minor version */ @@ -617,10 +613,6 @@ resume(PacketInputStream *in, PacketOutputStream *out) static jboolean doExit(PacketInputStream *in, PacketOutputStream *out) { - // ANDROID-CHANGED: We are about to exit(). Send ART cmd processing time, - // if there are any remaining. - timings_flush(); - jint exitCode; exitCode = inStream_readInt(in); diff --git a/src/share/back/debugInit.c b/src/share/back/debugInit.c index e31fcf828..2a1bd2172 100644 --- a/src/share/back/debugInit.c +++ b/src/share/back/debugInit.c @@ -43,9 +43,6 @@ #include "vmDebug.h" #include "DDMImpl.h" -// ANDROID-CHANGED: Need to sent metrics before debugInit_exit -#include "timing.h" - /* How the options get to OnLoad: */ #define XDEBUG "-Xdebug" #define XRUN "-Xrunjdwp" @@ -1406,10 +1403,6 @@ debugInit_exit(jvmtiError error, const char *msg) { enum exit_codes { EXIT_NO_ERRORS = 0, EXIT_JVMTI_ERROR = 1, EXIT_TRANSPORT_ERROR = 2 }; - // ANDROID-CHANGED: We are about to exit(). Send ART cmd processing time, - // if there are any remaining. - timings_flush(); - // Prepare to exit. Log error and finish logging LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, ((msg == NULL) ? "" : msg))); diff --git a/src/share/back/debugLoop.c b/src/share/back/debugLoop.c index e9e0e583b..9d3e9b914 100644 --- a/src/share/back/debugLoop.c +++ b/src/share/back/debugLoop.c @@ -37,8 +37,6 @@ // ANDROID-CHANGED: Needed for vmDebug_onDisconnect, vmDebug_notifyDebuggerActivityStart & // vmDebug_notifyDebuggerActivityEnd. #include "vmDebug.h" -// ANDROID-CHANGED: Needed for sending ART timings -#include "timing.h" static void JNICALL reader(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg); @@ -68,7 +66,6 @@ lastCommand(jdwpCmdPacket *cmd) } } - void debugLoop_initialize(void) { @@ -127,11 +124,6 @@ debugLoop_run(void) PacketOutputStream out; CommandHandler func; - // ANDROID-CHANGED: To be able to send cmd processing time - // periodically, we notify the timing system of when they - // start. This "startCmd" MUST be paired by a "endCmd". - timings_startCmd(cmd->id, cmd->cmdSet, cmd->cmd); - /* Should reply be sent to sender. * For error handling, assume yes, since * only VM/exit does not reply @@ -202,10 +194,6 @@ debugLoop_run(void) outStream_destroy(&out); shouldListen = !lastCommand(cmd); - - // ANDROID-CHANGED: Let the timing system know that the cmd - // was fully processed. This may trigger a flush. - timings_endCmd(); } } threadControl_onDisconnect(); diff --git a/src/share/back/timing.c b/src/share/back/timing.c deleted file mode 100644 index f49a30f63..000000000 --- a/src/share/back/timing.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 1998, 2004, 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 - * 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 "timing.h" - -#include "error_messages.h" -#include "JDWP.h" -#include "outStream.h" -#include "util.h" - -// ANDROID-CHANGED: This whole file - -// This system stores cmd processing timing and sends them to the debugger -// to generate profiling stats. - -typedef struct Timing { - jlong start_ns; - jlong duration_ns; - jint id; - jint cmd_set; - jint cmd; -} Timing; - -static const jint MAX_TIMINGS = 500; -static Timing timings[MAX_TIMINGS]; -static jint numTimings; - -void timings_startCmd(jint id, jint cmd_set, jint cmd) { - timings[numTimings].id = id; - timings[numTimings].cmd_set = cmd_set; - timings[numTimings].cmd = cmd; - timings[numTimings].start_ns = nsTime(); -} - -void timings_endCmd() { - timings[numTimings].duration_ns = nsTime() - timings[numTimings].start_ns; - numTimings++; - - if (numTimings == MAX_TIMINGS) { - timings_flush(); - } -} - -// Return the size of the ARTT chunk -static jint getChunkSize() { - jint size = 0; - size += sizeof(jint); // version - size += sizeof(jint); // num timing entries. - - size += numTimings * (sizeof(jint) * 3 + sizeof(jlong) * 2); // entries - return size; -} - -void timings_flush() { - // Don't even waste a packet if we know it will contain no payload. - if (numTimings == 0) { - return; - } - - PacketOutputStream packet; - - outStream_initCommand(&packet, uniqueID(), 0, JDWP_COMMAND_SET(DDM), JDWP_COMMAND(DDM, Chunk)); - - outStream_writeInt(&packet, 'A' << 24 | 'R' << 16 | 'T' << 8 | 'T');// DDM chunk type - outStream_writeInt(&packet, getChunkSize()); // DDM chunk length - - outStream_writeInt(&packet, 1); //version - outStream_writeInt(&packet, numTimings); // num timing entries - - for(int i=0 ; i < numTimings ; i++) { - outStream_writeInt(&packet, timings[i].id); - outStream_writeInt(&packet, timings[i].cmd_set); - outStream_writeInt(&packet, timings[i].cmd); - outStream_writeLong(&packet, timings[i].start_ns); - outStream_writeLong(&packet, timings[i].duration_ns); - } - outStream_sendCommand(&packet); - outStream_destroy(&packet); - - numTimings = 0; -} - diff --git a/src/share/back/timing.h b/src/share/back/timing.h deleted file mode 100644 index 478572f90..000000000 --- a/src/share/back/timing.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 1998, 2004, 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 - * 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. - */ - -#ifndef JDWP_ART_METRICS_H -#define JDWP_ART_METRICS_H - -// ANDROID-CHANGED: This whole file - -#include - -// Currently none of these methods are synchronized since they are only called -// in the debugLoop thread. If we need to call this from multiple threads in the -// future, we should add a Lock! -void timings_startCmd(jint id, jint cmd_set, jint cmd); -void timings_endCmd(); -void timings_flush(); - -#endif \ No newline at end of file diff --git a/src/share/back/util.c b/src/share/back/util.c index 8aa62f125..dcd195d23 100644 --- a/src/share/back/util.c +++ b/src/share/back/util.c @@ -49,19 +49,11 @@ static jvmtiError (JNICALL *ext_RawMonitorExitNoSuspend) (jvmtiEnv* env, jrawMon // CLOCK_MONOTONIC. jlong milliTime(void) -{ - return nsTime() / 1000000L; -} - -// ANDROID-CHANGED: Implement a helper to get the current time in nanoseconds according to -// CLOCK_MONOTONIC. -jlong -nsTime(void) { struct timespec now; memset(&now, 0, sizeof(now)); (void)clock_gettime(CLOCK_MONOTONIC, &now); - return ((jlong)now.tv_sec) * 1000000000LL + ((jlong)now.tv_nsec); + return ((jlong)now.tv_sec) * 1000LL + ((jlong)now.tv_nsec) / 1000000LL; } /* Save an object reference for use later (create a NewGlobalRef) */ diff --git a/src/share/back/util.h b/src/share/back/util.h index d0b517d7c..b02ad7b3c 100644 --- a/src/share/back/util.h +++ b/src/share/back/util.h @@ -343,7 +343,6 @@ jvmtiError objectReferrers(jobject obj, ObjectBatch *referrers, int maxObjects); // ANDROID-CHANGED: Helper function to get current time in milliseconds on CLOCK_MONOTONIC jlong milliTime(void); -jlong nsTime(void); /* * Command handling helpers shared among multiple command sets -- cgit v1.2.3