Enables ADBD tracing in emulator.
When running inside the emulator, guest's adbd can connect to 'adb-debug' qemud
service that can display adb trace messages on condition that emulator has been
started with '-debug adb' option.
This CL contains emulator code that enables that.
Change-Id: I6720deef0833fd02e2fe80deeaafbcf517de0c33
diff --git a/android/adb-qemud.c b/android/adb-qemud.c
index bc51807..1d2498e 100644
--- a/android/adb-qemud.c
+++ b/android/adb-qemud.c
@@ -26,10 +26,13 @@
#define E(...) derror(__VA_ARGS__)
#define W(...) dwarning(__VA_ARGS__)
#define D(...) VERBOSE_PRINT(adbclient,__VA_ARGS__)
+#define DD(...) VERBOSE_PRINT(adb,__VA_ARGS__)
#define D_ACTIVE VERBOSE_CHECK(adbclient)
+#define DD_ACTIVE VERBOSE_CHECK(adb)
#define QB(b, s) quote_bytes((const char*)b, (s < 32) ? s : 32)
-#define SERVICE_NAME "adb"
+#define SERVICE_NAME "adb"
+#define DEBUG_SERVICE_NAME "adb-debug"
/* Enumerates ADB client state values. */
typedef enum AdbClientState {
@@ -57,6 +60,13 @@
AdbClientState state;
};
+/* ADB debugging client descriptor. */
+typedef struct AdbDbgClient AdbDbgClient;
+struct AdbDbgClient {
+ /* QEMUD client pipe for this client. */
+ QemudClient* qemud_client;
+};
+
/********************************************************************************
* ADB host communication.
*******************************************************************************/
@@ -259,6 +269,82 @@
}
/********************************************************************************
+ * Debugging ADB guest communication.
+ *******************************************************************************/
+
+/* Allocates AdbDbgClient instance. */
+static AdbDbgClient*
+_adb_dbg_client_new(void)
+{
+ AdbDbgClient* adb_dbg_client;
+
+ ANEW0(adb_dbg_client);
+
+ return adb_dbg_client;
+}
+
+/* Frees AdbDbgClient instance, allocated with _adb_dbg_client_new */
+static void
+_adb_dbg_client_free(AdbDbgClient* adb_dbg_client)
+{
+ if (adb_dbg_client != NULL) {
+ free(adb_dbg_client);
+ }
+}
+
+/* A callback that is invoked when ADB debugging guest sends data to the service.
+ * Param:
+ * opaque - AdbDbgClient instance.
+ * msg, msglen - Message received from the ADB guest.
+ * client - adb-debug QEMUD client.
+ */
+static void
+_adb_dbg_client_recv(void* opaque, uint8_t* msg, int msglen, QemudClient* client)
+{
+ if (DD_ACTIVE) {
+ fprintf(stderr, "ADB: %s", (const char*)msg);
+ }
+}
+
+/* A callback that is invoked when ADB debugging guest disconnects from the
+ * service. */
+static void
+_adb_dbg_client_close(void* opaque)
+{
+ AdbDbgClient* const adb_dbg_client = (AdbDbgClient*)opaque;
+
+ DD("ADB debugging client %p is disconnected from the guest.", adb_dbg_client);
+ _adb_dbg_client_free(adb_dbg_client);
+}
+
+/* A callback that is invoked when ADB daemon running inside the guest connects
+ * to the debugging service.
+ * Client parameters are ignored here.
+ */
+static QemudClient*
+_adb_debug_service_connect(void* opaque,
+ QemudService* serv,
+ int channel,
+ const char* client_param)
+{
+ /* Create new QEMUD client for the connection with ADB debugger. */
+ AdbDbgClient* const adb_dbg_client = _adb_dbg_client_new();
+
+ DD("Connecting ADB debugging guest: '%s'",
+ client_param ? client_param : "<null>");
+ adb_dbg_client->qemud_client =
+ qemud_client_new(serv, channel, client_param, adb_dbg_client,
+ _adb_dbg_client_recv, _adb_dbg_client_close, NULL, NULL);
+ if (adb_dbg_client->qemud_client == NULL) {
+ DD("Unable to create QEMUD client for ADB debugging guest.");
+ _adb_dbg_client_free(adb_dbg_client);
+ return NULL;
+ }
+
+ return adb_dbg_client->qemud_client;
+}
+
+/********************************************************************************
* ADB service API.
*******************************************************************************/
@@ -272,6 +358,7 @@
}
if (!_inited) {
+ /* Register main ADB service. */
QemudService* serv = qemud_service_register(SERVICE_NAME, 0, NULL,
_adb_service_connect,
NULL, NULL);
@@ -281,5 +368,15 @@
return;
}
D("%s: Registered '%s' qemud service", __FUNCTION__, SERVICE_NAME);
+
+ /* Register debugging ADB service. */
+ serv = qemud_service_register(DEBUG_SERVICE_NAME, 0, NULL,
+ _adb_debug_service_connect, NULL, NULL);
+ if (serv != NULL) {
+ DD("Registered '%s' qemud service", DEBUG_SERVICE_NAME);
+ } else {
+ dwarning("%s: Could not register '%s' service",
+ __FUNCTION__, DEBUG_SERVICE_NAME);
+ }
}
}
diff --git a/android/utils/debug.h b/android/utils/debug.h
index 272499a..ec3094d 100644
--- a/android/utils/debug.h
+++ b/android/utils/debug.h
@@ -41,6 +41,7 @@
_VERBOSE_TAG(gles, "hardware OpenGLES emulation") \
_VERBOSE_TAG(adbserver, "ADB server") \
_VERBOSE_TAG(adbclient, "ADB QEMU client") \
+ _VERBOSE_TAG(adb, "ADB debugger") \
#define _VERBOSE_TAG(x,y) VERBOSE_##x,
typedef enum {
