commit 376a7a033d29d5f2b6e16574a340c999ff2999a0
author Elliott Hughes <enh@google.com> Mon Oct 24 18:35:55 2011 -0700
committer Elliott Hughes <enh@google.com> Mon Oct 24 18:35:55 2011 -0700
tree 9f5207f6185b615219ede2f0125677ca80975052
parent d1cc8363d4f4bbac7568b1d02a5ca481cd10830f

Turn free functions that take a JdwpState* into member functions.

Change-Id: Idf96803c12e160939dbc98be2df41c35a10987da

src/jdwp/jdwp_handler.cc

diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc
index 8fe3c3f..5e566ae 100644
--- a/src/jdwp/jdwp_handler.cc
+++ b/src/jdwp/jdwp_handler.cc
@@ -1412,7 +1412,7 @@
   /*
    * We reply with an integer "requestID".
    */
-  uint32_t requestId = NextEventSerial(state);
+  uint32_t requestId = state->NextEventSerial();
   expandBufAdd4BE(pReply, requestId);
 
   pEvent->requestId = requestId;
@@ -1722,7 +1722,7 @@
  *
  * On entry, the JDWP thread is in VMWAIT.
  */
-void ProcessRequest(JdwpState* state, const JdwpReqHeader* pHeader, const uint8_t* buf, int dataLen, ExpandBuf* pReply) {
+void JdwpState::ProcessRequest(const JdwpReqHeader* pHeader, const uint8_t* buf, int dataLen, ExpandBuf* pReply) {
   JdwpError result = ERR_NONE;
   int i, respLen;
 
@@ -1733,7 +1733,7 @@
      * so waitForDebugger() doesn't return if we stall for a bit here.
      */
     Dbg::Active();
-    QuasiAtomicSwap64(0, &state->lastActivityWhen);
+    QuasiAtomicSwap64(0, &lastActivityWhen);
   }
 
   /*
@@ -1752,7 +1752,7 @@
    * thread up, or risk waiting for the thread to suspend after we've
    * told it to resume.
    */
-  SetWaitForEventThread(state, 0);
+  SetWaitForEventThread(0);
 
   /*
    * Tell the VM that we're running and shouldn't be interrupted by GC.
@@ -1765,7 +1765,7 @@
   for (i = 0; i < (int) arraysize(gHandlerMap); i++) {
     if (gHandlerMap[i].cmdSet == pHeader->cmdSet && gHandlerMap[i].cmd == pHeader->cmd) {
       LOG(VERBOSE) << StringPrintf("REQ: %s (cmd=%d/%d dataLen=%d id=0x%06x)", gHandlerMap[i].descr, pHeader->cmdSet, pHeader->cmd, dataLen, pHeader->id);
-      result = (*gHandlerMap[i].func)(state, buf, dataLen, pReply);
+      result = (*gHandlerMap[i].func)(this, buf, dataLen, pReply);
       break;
     }
   }
@@ -1806,7 +1806,7 @@
    * the initial setup.  Only update if this is a non-DDMS packet.
    */
   if (pHeader->cmdSet != kJDWPDdmCmdSet) {
-    QuasiAtomicSwap64(GetNowMsec(), &state->lastActivityWhen);
+    QuasiAtomicSwap64(GetNowMsec(), &lastActivityWhen);
   }
 
   /* tell the VM that GC is okay again */