Snap for 10453563 from 398c731be2a9e2f24baa60293ab56e07f9141961 to mainline-media-swcodec-release
Change-Id: Ie0240673c0908ad7df7d64ffa5e484d68d477014
diff --git a/Android.bp b/Android.bp
index da9cca7..a27b4ed 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,10 +21,7 @@
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-GPL-with-classpath-exception",
- "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-GPL-2.0-with-classpath-exception",
],
license_text: [
"LICENSE",
@@ -58,7 +55,6 @@
"-Werror",
"-Wno-unused-parameter",
],
- notice: "LICENSE",
target: {
darwin: {
enabled: false,
@@ -233,5 +229,10 @@
services: ["etc/com.sun.jdi.connect.Connector"],
java_version: "1.8",
javacflags: ["-g"],
- notice: "LICENSE",
+ errorprone: {
+ javacflags: [
+ "-Xep:ReturnValueIgnored:WARN",
+ "-Xep:EmptyTopLevelDeclaration:WARN",
+ ],
+ },
}
diff --git a/src/share/back/FrameID.h b/src/share/back/FrameID.h
index 193971d..56d962a 100644
--- a/src/share/back/FrameID.h
+++ b/src/share/back/FrameID.h
@@ -26,6 +26,9 @@
#ifndef JDWP_FRAMEID_H
#define JDWP_FRAMEID_H
+#include "jvmti.h"
+#include "util.h"
+
typedef jlong FrameID;
FrameID createFrameID(jthread thread, FrameNumber fnum);
diff --git a/src/share/back/VirtualMachineImpl.c b/src/share/back/VirtualMachineImpl.c
index fde53c3..1e8b969 100644
--- a/src/share/back/VirtualMachineImpl.c
+++ b/src/share/back/VirtualMachineImpl.c
@@ -34,6 +34,10 @@
#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 */
@@ -613,6 +617,10 @@
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 2a1bd21..e31fcf8 100644
--- a/src/share/back/debugInit.c
+++ b/src/share/back/debugInit.c
@@ -43,6 +43,9 @@
#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"
@@ -1403,6 +1406,10 @@
{
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 9d3e9b9..e9e0e58 100644
--- a/src/share/back/debugLoop.c
+++ b/src/share/back/debugLoop.c
@@ -37,6 +37,8 @@
// 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);
@@ -66,6 +68,7 @@
}
}
+
void
debugLoop_initialize(void)
{
@@ -124,6 +127,11 @@
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
@@ -194,6 +202,10 @@
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/error_messages.h b/src/share/back/error_messages.h
index bf37653..c656c0c 100644
--- a/src/share/back/error_messages.h
+++ b/src/share/back/error_messages.h
@@ -26,6 +26,9 @@
#ifndef JDWP_ERROR_MESSAGES_H
#define JDWP_ERROR_MESSAGES_H
+#include "JDWP.h"
+#include "jvmti.h"
+
/* It is assumed that ALL strings are UTF-8 safe on entry */
#define TTY_MESSAGE(args) ( tty_message args )
#define ERROR_MESSAGE(args) ( \
diff --git a/src/share/back/timing.c b/src/share/back/timing.c
new file mode 100644
index 0000000..f49a30f
--- /dev/null
+++ b/src/share/back/timing.c
@@ -0,0 +1,104 @@
+/*
+ * 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
new file mode 100644
index 0000000..478572f
--- /dev/null
+++ b/src/share/back/timing.h
@@ -0,0 +1,40 @@
+/*
+ * 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 <jni.h>
+
+// 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 dcd195d..8aa62f1 100644
--- a/src/share/back/util.c
+++ b/src/share/back/util.c
@@ -50,10 +50,18 @@
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) * 1000LL + ((jlong)now.tv_nsec) / 1000000LL;
+ return ((jlong)now.tv_sec) * 1000000000LL + ((jlong)now.tv_nsec);
}
/* 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 b02ad7b..d0b517d 100644
--- a/src/share/back/util.h
+++ b/src/share/back/util.h
@@ -343,6 +343,7 @@
// 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
diff --git a/src/share/back/vmDebug.c b/src/share/back/vmDebug.c
index 4b51ee2..010cb8a 100644
--- a/src/share/back/vmDebug.c
+++ b/src/share/back/vmDebug.c
@@ -31,6 +31,8 @@
#include "debugLoop.h"
#include "transport.h"
#include "util.h"
+#include "eventHelper.h"
+#include "threadControl.h"
static _Atomic(jlong) lastDebuggerActivity = ATOMIC_VAR_INIT(0LL);
static _Atomic(jboolean) hasSeenDebuggerActivity = ATOMIC_VAR_INIT(JNI_FALSE);
@@ -70,6 +72,14 @@
return isDebuggerConnected();
}
+static void JNICALL
+VMDebug_suspendAllAndSendVmStart(JNIEnv* env, jclass klass)
+{
+ jthread currentThread;
+ JVMTI_FUNC_PTR(gdata->jvmti, GetCurrentThread)(gdata->jvmti, ¤tThread);
+ eventHelper_reportVMInit(getEnv(), 0, currentThread, JDWP_SUSPEND_POLICY(ALL));
+}
+
static jboolean JNICALL
VMDebug_isDebuggingEnabled(JNIEnv* env, jclass klass)
{
@@ -115,9 +125,9 @@
goto finish;
}
- JNINativeMethod methods[3];
+ JNINativeMethod methods[4];
- // Take over the implementation of these three functions.
+ // Take over the implementation of these functions.
methods[0].name = "lastDebuggerActivity";
methods[0].signature = "()J";
methods[0].fnPtr = (void*)VMDebug_lastDebuggerActivity;
@@ -130,6 +140,10 @@
methods[2].signature = "()Z";
methods[2].fnPtr = (void*)VMDebug_isDebuggerConnected;
+ methods[3].name = "suspendAllAndSendVmStart";
+ methods[3].signature = "()V";
+ methods[3].fnPtr = (void*)VMDebug_suspendAllAndSendVmStart;
+
jint res = JNI_FUNC_PTR(env,RegisterNatives)(env,
vmdebug_class,
methods,
