Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove some methods from DdmVmInternal." am: af174a5708 am: 5f117b3491

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64114ba66d21d40bc9e362b4530f97f05b212c9a
This commit is contained in:
Nicolas Geoffray
2021-03-12 13:22:03 +00:00
committed by Automerger Merge Worker
parent 68fb171ec4 5f117b3491
commit 55eafcc5a7
4 changed files with 3 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/preloaded-classes
View File

@@ -1838,11 +1838,9 @@ android.database.sqlite.SqliteWrapper
android.ddm.DdmHandleAppName$Names
android.ddm.DdmHandleAppName
android.ddm.DdmHandleExit
android.ddm.DdmHandleHeap
android.ddm.DdmHandleHello
android.ddm.DdmHandleNativeHeap
android.ddm.DdmHandleProfiling
android.ddm.DdmHandleThread
android.ddm.DdmHandleViewDebug
android.ddm.DdmRegister
android.debug.AdbManager

183
core/java/android/ddm/DdmHandleHeap.java
View File

@@ -30,15 +30,7 @@ import java.nio.ByteBuffer;
*/
public class DdmHandleHeap extends ChunkHandler {
public static final int CHUNK_HPIF = type("HPIF");
public static final int CHUNK_HPSG = type("HPSG");
public static final int CHUNK_HPDU = type("HPDU");
public static final int CHUNK_HPDS = type("HPDS");
public static final int CHUNK_NHSG = type("NHSG");
public static final int CHUNK_HPGC = type("HPGC");
public static final int CHUNK_REAE = type("REAE");
public static final int CHUNK_REAQ = type("REAQ");
public static final int CHUNK_REAL = type("REAL");
private static DdmHandleHeap mInstance = new DdmHandleHeap();
@@ -50,15 +42,7 @@ public class DdmHandleHeap extends ChunkHandler {
* Register for the messages we're interested in.
*/
public static void register() {
DdmServer.registerHandler(CHUNK_HPIF, mInstance);
DdmServer.registerHandler(CHUNK_HPSG, mInstance);
DdmServer.registerHandler(CHUNK_HPDU, mInstance);
DdmServer.registerHandler(CHUNK_HPDS, mInstance);
DdmServer.registerHandler(CHUNK_NHSG, mInstance);
DdmServer.registerHandler(CHUNK_HPGC, mInstance);
DdmServer.registerHandler(CHUNK_REAE, mInstance);
DdmServer.registerHandler(CHUNK_REAQ, mInstance);
DdmServer.registerHandler(CHUNK_REAL, mInstance);
}
/**
@@ -81,136 +65,14 @@ public class DdmHandleHeap extends ChunkHandler {
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
if (type == CHUNK_HPIF) {
return handleHPIF(request);
} else if (type == CHUNK_HPSG) {
return handleHPSGNHSG(request, false);
} else if (type == CHUNK_HPDU) {
return handleHPDU(request);
} else if (type == CHUNK_HPDS) {
return handleHPDS(request);
} else if (type == CHUNK_NHSG) {
return handleHPSGNHSG(request, true);
} else if (type == CHUNK_HPGC) {
if (type == CHUNK_HPGC) {
return handleHPGC(request);
} else if (type == CHUNK_REAE) {
return handleREAE(request);
} else if (type == CHUNK_REAQ) {
return handleREAQ(request);
} else if (type == CHUNK_REAL) {
return handleREAL(request);
} else {
throw new RuntimeException("Unknown packet "
+ ChunkHandler.name(type));
}
}
/*
* Handle a "HeaP InFo" request.
*/
private Chunk handleHPIF(Chunk request) {
ByteBuffer in = wrapChunk(request);
int when = in.get();
if (false)
Log.v("ddm-heap", "Heap segment enable: when=" + when);
boolean ok = DdmVmInternal.heapInfoNotify(when);
if (!ok) {
return createFailChunk(1, "Unsupported HPIF what");
} else {
return null; // empty response
}
}
/*
* Handle a "HeaP SeGment" or "Native Heap SeGment" request.
*/
private Chunk handleHPSGNHSG(Chunk request, boolean isNative) {
ByteBuffer in = wrapChunk(request);
int when = in.get();
int what = in.get();
if (false)
Log.v("ddm-heap", "Heap segment enable: when=" + when
+ ", what=" + what + ", isNative=" + isNative);
boolean ok = DdmVmInternal.heapSegmentNotify(when, what, isNative);
if (!ok) {
return createFailChunk(1, "Unsupported HPSG what/when");
} else {
// TODO: if "when" is non-zero and we want to see a dump
// right away, initiate a GC.
return null; // empty response
}
}
/*
* Handle a "HeaP DUmp" request.
*
* This currently just returns a result code. We could pull up
* the entire contents of the file and return them, but hprof dump
* files can be a few megabytes.
*/
private Chunk handleHPDU(Chunk request) {
ByteBuffer in = wrapChunk(request);
byte result;
/* get the filename for the output file */
int len = in.getInt();
String fileName = getString(in, len);
if (false)
Log.d("ddm-heap", "Heap dump: file='" + fileName + "'");
try {
Debug.dumpHprofData(fileName);
result = 0;
} catch (UnsupportedOperationException uoe) {
Log.w("ddm-heap", "hprof dumps not supported in this VM");
result = -1;
} catch (IOException ioe) {
result = -1;
} catch (RuntimeException re) {
result = -1;
}
/* create a non-empty reply so the handler fires on completion */
byte[] reply = { result };
return new Chunk(CHUNK_HPDU, reply, 0, reply.length);
}
/*
* Handle a "HeaP Dump Streaming" request.
*
* This tells the VM to create a heap dump and send it directly to
* DDMS. The dumps are large enough that we don't want to copy the
* data into a byte[] and send it from here.
*/
private Chunk handleHPDS(Chunk request) {
ByteBuffer in = wrapChunk(request);
byte result;
/* get the filename for the output file */
if (false)
Log.d("ddm-heap", "Heap dump: [DDMS]");
String failMsg = null;
try {
Debug.dumpHprofDataDdms();
} catch (UnsupportedOperationException uoe) {
failMsg = "hprof dumps not supported in this VM";
} catch (RuntimeException re) {
failMsg = "Exception: " + re.getMessage();
}
if (failMsg != null) {
Log.w("ddm-heap", failMsg);
return createFailChunk(1, failMsg);
} else {
return null;
}
}
/*
* Handle a "HeaP Garbage Collection" request.
*/
@@ -223,47 +85,4 @@ public class DdmHandleHeap extends ChunkHandler {
return null; // empty response
}
/*
* Handle a "REcent Allocation Enable" request.
*/
private Chunk handleREAE(Chunk request) {
ByteBuffer in = wrapChunk(request);
boolean enable;
enable = (in.get() != 0);
if (false)
Log.d("ddm-heap", "Recent allocation enable request: " + enable);
DdmVmInternal.enableRecentAllocations(enable);
return null; // empty response
}
/*
* Handle a "REcent Allocation Query" request.
*/
private Chunk handleREAQ(Chunk request) {
//ByteBuffer in = wrapChunk(request);
byte[] reply = new byte[1];
reply[0] = DdmVmInternal.getRecentAllocationStatus() ? (byte)1 :(byte)0;
return new Chunk(CHUNK_REAQ, reply, 0, reply.length);
}
/*
* Handle a "REcent ALlocations" request.
*/
private Chunk handleREAL(Chunk request) {
//ByteBuffer in = wrapChunk(request);
if (false)
Log.d("ddm-heap", "Recent allocations request");
/* generate the reply in a ready-to-go format */
byte[] reply = DdmVmInternal.getRecentAllocations();
return new Chunk(CHUNK_REAL, reply, 0, reply.length);
}
}

181
core/java/android/ddm/DdmHandleThread.java
View File

@@ -1,181 +0,0 @@
/*
* Copyright (C) 2007 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.ddm;
import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import org.apache.harmony.dalvik.ddmc.DdmVmInternal;
import android.util.Log;
import java.nio.ByteBuffer;
/**
* Handle thread-related traffic.
*/
public class DdmHandleThread extends ChunkHandler {
public static final int CHUNK_THEN = type("THEN");
public static final int CHUNK_THCR = type("THCR");
public static final int CHUNK_THDE = type("THDE");
public static final int CHUNK_THST = type("THST");
public static final int CHUNK_STKL = type("STKL");
private static DdmHandleThread mInstance = new DdmHandleThread();
/* singleton, do not instantiate */
private DdmHandleThread() {}
/**
* Register for the messages we're interested in.
*/
public static void register() {
DdmServer.registerHandler(CHUNK_THEN, mInstance);
DdmServer.registerHandler(CHUNK_THST, mInstance);
DdmServer.registerHandler(CHUNK_STKL, mInstance);
}
/**
* Called when the DDM server connects. The handler is allowed to
* send messages to the server.
*/
public void connected() {}
/**
* Called when the DDM server disconnects. Can be used to disable
* periodic transmissions or clean up saved state.
*/
public void disconnected() {}
/**
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
if (false)
Log.v("ddm-thread", "Handling " + name(request.type) + " chunk");
int type = request.type;
if (type == CHUNK_THEN) {
return handleTHEN(request);
} else if (type == CHUNK_THST) {
return handleTHST(request);
} else if (type == CHUNK_STKL) {
return handleSTKL(request);
} else {
throw new RuntimeException("Unknown packet "
+ ChunkHandler.name(type));
}
}
/*
* Handle a "THread notification ENable" request.
*/
private Chunk handleTHEN(Chunk request) {
ByteBuffer in = wrapChunk(request);
boolean enable = (in.get() != 0);
//Log.i("ddm-thread", "Thread notify enable: " + enable);
DdmVmInternal.threadNotify(enable);
return null; // empty response
}
/*
* Handle a "THread STatus" request. This is constructed by the VM.
*/
private Chunk handleTHST(Chunk request) {
ByteBuffer in = wrapChunk(request);
// currently nothing to read from "in"
//Log.d("ddm-thread", "Thread status request");
byte[] status = DdmVmInternal.getThreadStats();
if (status != null)
return new Chunk(CHUNK_THST, status, 0, status.length);
else
return createFailChunk(1, "Can't build THST chunk");
}
/*
* Handle a STacK List request.
*
* This is done by threadId, which isn't great since those are
* recycled. We need a thread serial ID. The Linux tid is an okay
* answer as it's unlikely to recycle at the exact wrong moment.
* However, we're using the short threadId in THST messages, so we
* use them here for consistency. (One thought is to keep the current
* thread ID in the low 16 bits and somehow serialize the top 16 bits.)
*/
private Chunk handleSTKL(Chunk request) {
ByteBuffer in = wrapChunk(request);
int threadId;
threadId = in.getInt();
//Log.d("ddm-thread", "Stack list request " + threadId);
StackTraceElement[] trace = DdmVmInternal.getStackTraceById(threadId);
if (trace == null) {
return createFailChunk(1, "Stack trace unavailable");
} else {
return createStackChunk(trace, threadId);
}
}
/*
* Serialize a StackTraceElement[] into an STKL chunk.
*
* We include the threadId in the response so the other side doesn't have
* to match up requests and responses as carefully.
*/
private Chunk createStackChunk(StackTraceElement[] trace, int threadId) {
int bufferSize = 0;
bufferSize += 4; // version, flags, whatever
bufferSize += 4; // thread ID
bufferSize += 4; // frame count
for (StackTraceElement elem : trace) {
bufferSize += 4 + elem.getClassName().length() * 2;
bufferSize += 4 + elem.getMethodName().length() * 2;
bufferSize += 4;
if (elem.getFileName() != null)
bufferSize += elem.getFileName().length() * 2;
bufferSize += 4; // line number
}
ByteBuffer out = ByteBuffer.allocate(bufferSize);
out.putInt(0);
out.putInt(threadId);
out.putInt(trace.length);
for (StackTraceElement elem : trace) {
out.putInt(elem.getClassName().length());
putString(out, elem.getClassName());
out.putInt(elem.getMethodName().length());
putString(out, elem.getMethodName());
if (elem.getFileName() != null) {
out.putInt(elem.getFileName().length());
putString(out, elem.getFileName());
} else {
out.putInt(0);
}
out.putInt(elem.getLineNumber());
}
return new Chunk(CHUNK_STKL, out);
}
}

4
core/java/android/ddm/DdmRegister.java
View File

@@ -16,9 +16,10 @@
package android.ddm;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import android.util.Log;
import org.apache.harmony.dalvik.ddmc.DdmServer;
/**
* Just a place to stick handler registrations, instead of scattering
* them around.
@@ -46,7 +47,6 @@ public class DdmRegister {
if (false)
Log.v("ddm", "Registering DDM message handlers");
DdmHandleHello.register();
DdmHandleThread.register();
DdmHandleHeap.register();
DdmHandleNativeHeap.register();
DdmHandleProfiling.register();