From fb967be939ffef6deefd5044d86da38b39c4caa4 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 30 Jan 2008 13:46:32 +1100
Subject: [PATCH] Handle commands where no response is expected

r2299 | dcl | 2008-01-30 13:46:32 +1100 (Wed, 30 Jan 2008) | 2 lines
---
 asyncqueue.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/asyncqueue.c b/asyncqueue.c
index bf418386..29b8f709 100644
--- a/asyncqueue.c
+++ b/asyncqueue.c
@@ -134,7 +134,7 @@ static int AQ_Reconnect(pAsyncQueue self)
   return 1;
 }
 
-
+static int PopCommand(pAsyncQueue self);
 static int CommandTimeout(void* cntx, int mode);
 static int DelayedStart(void* cntx, int mode);
 
@@ -142,6 +142,7 @@ static int StartCommand(pAsyncQueue self)
 {
   pAQ_Cmd myCmd = self->command_head;
   mkChannel* sock = self->pSock;
+  int iRet = 0;
 
   if (myCmd == NULL)
     return OKOK;
@@ -183,7 +184,6 @@ static int StartCommand(pAsyncQueue self)
   while (NETAvailable(sock, 0)) {
     /* TODO: handle unsolicited input */
     char reply[1];
-    int iRet;
     iRet = NETRead(sock, reply, 1, 0);
     if (iRet < 0) { /* EOF */
       iRet = AQ_Reconnect(self);
@@ -191,6 +191,15 @@ static int StartCommand(pAsyncQueue self)
         return 0;
     }
   }
+
+  myCmd->tran->txn_status == ATX_ACTIVE;
+  iRet = self->protocol->sendCommand(self->protocol, myCmd->tran);
+  /*
+   * Handle case of no response expected
+   */
+  if (iRet > 0)
+    if (myCmd->tran->txn_status == ATX_COMPLETE)
+      return PopCommand(self);
   /*
    * Add a new command timeout timer
    */
@@ -201,7 +210,7 @@ static int StartCommand(pAsyncQueue self)
     NetWatchRegisterTimer(&self->nw_tmr, 30000,
         CommandTimeout, self);
   myCmd->active = 1;
-  return self->protocol->sendCommand(self->protocol, myCmd->tran);
+  return iRet;
 }
 
 static int QueCommandHead(pAsyncQueue self, pAQ_Cmd cmd)
@@ -251,6 +260,9 @@ static int PopCommand(pAsyncQueue self)
     NetWatchRemoveTimer(self->nw_tmr);
   self->nw_tmr = 0;
   gettimeofday(&self->tvLastCmd, NULL);
+  /* Process any callback */
+  if (myCmd->tran->handleResponse)
+    myCmd->tran->handleResponse(myCmd->tran);
   /*
    * If this is not the last in queue, start transmission
    */
@@ -281,8 +293,6 @@ static int CommandTimeout(void* cntx, int mode)
     int iRet;
     iRet = self->protocol->handleEvent(self->protocol, myCmd->tran, AQU_TIMEOUT);
     if (iRet == AQU_POP_CMD) {
-      if (myCmd->tran->handleResponse)
-        myCmd->tran->handleResponse(myCmd->tran);
       PopCommand(self); /* remove command */
     }
     else if (iRet == AQU_RETRY_CMD)
@@ -328,8 +338,6 @@ static int MyCallback(void* context, int mode)
         for (i = 0; i < nchars; ++i) {
           iRet = self->protocol->handleInput(self->protocol, myCmd->tran, reply[i]);
           if (iRet == 0 || iRet == AQU_POP_CMD) { /* end of command */
-            if (myCmd->tran->handleResponse)
-              myCmd->tran->handleResponse(myCmd->tran);
             PopCommand(self);
             break;
           }