More JDWP implementation cleanup.
tsu was confused by some logging that turns out to have been a mistake;
it basically meant "DDMS is not listening", which isn't generally interesting.
This patch relegates that to a VLOG(jdwp).
This patch also removes a bunch more of the adb/socket transport duplication.
Change-Id: I50114da96ec32c20e11ea5ea76d5beba29f30214
diff --git a/src/jdwp/jdwp.h b/src/jdwp/jdwp.h
index d3b6c1b..f2dba0b 100644
--- a/src/jdwp/jdwp.h
+++ b/src/jdwp/jdwp.h
@@ -94,7 +94,7 @@
};
struct JdwpEvent;
-struct JdwpNetState;
+struct JdwpNetStateBase;
struct JdwpTransport;
struct ModBasket;
struct Request;
@@ -227,12 +227,7 @@
bool HandlePacket();
- /*
- * Send an event, formatted into "pReq", to the debugger.
- *
- * (Messages are sent asynchronously, and do not receive a reply.)
- */
- bool SendRequest(ExpandBuf* pReq);
+ void SendRequest(ExpandBuf* pReq);
void ResetState()
LOCKS_EXCLUDED(event_list_lock_)
@@ -294,6 +289,7 @@
void UnregisterEvent(JdwpEvent* pEvent)
EXCLUSIVE_LOCKS_REQUIRED(event_list_lock_)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ void SendBufferedRequest(uint32_t type, const iovec* iov, int iov_count);
public: // TODO: fix privacy
const JdwpOptions* options_;
@@ -314,7 +310,7 @@
const JdwpTransport* transport_;
public: // TODO: fix privacy
- JdwpNetState* netState;
+ JdwpNetStateBase* netState;
private:
// For wait-for-debugger.