From 3770b4da95de0fe473a25ae8858141d942fee316 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Wed, 6 Sep 2017 11:30:24 +0300
Subject: [PATCH] Name read/fake queue consistently

Now dcb_readqueue and dvb_fakequeue are named readq and fakeq
respectively, to be consistent with the naming of the write
and delay queue.
---
 include/maxscale/dcb.h | 28 ++++++++++++++--------------
 server/core/dcb.cc     | 26 +++++++++++++-------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/include/maxscale/dcb.h b/include/maxscale/dcb.h
index 933348488..f578957b3 100644
--- a/include/maxscale/dcb.h
+++ b/include/maxscale/dcb.h
@@ -154,8 +154,8 @@ typedef struct dcb
     int             writeqlen;      /**< Current number of byes in the write queue */
     GWBUF           *writeq;        /**< Write Data Queue */
     GWBUF           *delayq;        /**< Delay Backend Write Data Queue */
-    GWBUF           *dcb_readqueue; /**< Read queue for storing incomplete reads */
-    GWBUF           *dcb_fakequeue; /**< Fake event queue for generated events */
+    GWBUF           *readq;         /**< Read queue for storing incomplete reads */
+    GWBUF           *fakeq;         /**< Fake event queue for generated events */
 
     DCBSTATS        stats;          /**< DCB related statistics */
     struct dcb      *nextpersistent;   /**< Next DCB in the persistent pool for SERVER */
@@ -275,7 +275,7 @@ void dcb_process_idle_sessions(int thr);
  */
 static inline void dcb_readq_append(DCB *dcb, GWBUF *buffer)
 {
-    dcb->dcb_readqueue = gwbuf_append(dcb->dcb_readqueue, buffer);
+    dcb->readq = gwbuf_append(dcb->readq, buffer);
 }
 
 /**
@@ -287,7 +287,7 @@ static inline void dcb_readq_append(DCB *dcb, GWBUF *buffer)
  */
 static GWBUF* dcb_readq_get(DCB* dcb)
 {
-    return dcb->dcb_readqueue;
+    return dcb->readq;
 }
 
 /**
@@ -297,7 +297,7 @@ static GWBUF* dcb_readq_get(DCB* dcb)
  */
 static inline bool dcb_readq_has(DCB* dcb)
 {
-    return dcb->dcb_readqueue != NULL;
+    return dcb->readq != NULL;
 }
 
 /**
@@ -307,7 +307,7 @@ static inline bool dcb_readq_has(DCB* dcb)
  */
 static unsigned int dcb_readq_length(DCB* dcb)
 {
-    return dcb->dcb_readqueue ? gwbuf_length(dcb->dcb_readqueue) : 0;
+    return dcb->readq ? gwbuf_length(dcb->readq) : 0;
 }
 
 /**
@@ -318,7 +318,7 @@ static unsigned int dcb_readq_length(DCB* dcb)
  */
 static inline void dcb_readq_prepend(DCB *dcb, GWBUF *buffer)
 {
-    dcb->dcb_readqueue = gwbuf_append(buffer, dcb->dcb_readqueue);
+    dcb->readq = gwbuf_append(buffer, dcb->readq);
 }
 
 /**
@@ -330,9 +330,9 @@ static inline void dcb_readq_prepend(DCB *dcb, GWBUF *buffer)
  */
 static GWBUF* dcb_readq_release(DCB* dcb)
 {
-    GWBUF* dcb_readqueue = dcb->dcb_readqueue;
-    dcb->dcb_readqueue = NULL;
-    return dcb_readqueue;
+    GWBUF* readq = dcb->readq;
+    dcb->readq = NULL;
+    return readq;
 }
 
 /**
@@ -346,17 +346,17 @@ static GWBUF* dcb_readq_release(DCB* dcb)
  */
 static inline void dcb_readq_set(DCB *dcb, GWBUF *buffer)
 {
-    if (dcb->dcb_readqueue)
+    if (dcb->readq)
     {
         MXS_ERROR("Read-queue set when there already is a read-queue.");
         // TODO: Conceptually this should be freed here. However, currently
         // TODO: the code just assigns without checking, so we do the same
         // TODO: for now. If this is not set to NULL when it has been consumed,
         // TODO: we would get a double free.
-        // TODO: gwbuf_free(dcb->dcb_readqueue);
-        dcb->dcb_readqueue = NULL;
+        // TODO: gwbuf_free(dcb->readq);
+        dcb->readq = NULL;
     }
-    dcb->dcb_readqueue = buffer;
+    dcb->readq = buffer;
 }
 
 /**
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 4f30feec4..b15e1690a 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -306,15 +306,15 @@ dcb_free_all_memory(DCB *dcb)
         gwbuf_free(dcb->writeq);
         dcb->writeq = NULL;
     }
-    if (dcb->dcb_readqueue)
+    if (dcb->readq)
     {
-        gwbuf_free(dcb->dcb_readqueue);
-        dcb->dcb_readqueue = NULL;
+        gwbuf_free(dcb->readq);
+        dcb->readq = NULL;
     }
-    if (dcb->dcb_fakequeue)
+    if (dcb->fakeq)
     {
-        gwbuf_free(dcb->dcb_fakequeue);
-        dcb->dcb_fakequeue = NULL;
+        gwbuf_free(dcb->fakeq);
+        dcb->fakeq = NULL;
     }
 
     while ((cb_dcb = dcb->callbacks) != NULL)
@@ -523,16 +523,16 @@ int dcb_read(DCB   *dcb,
     int     nsingleread = 0;
     int     nreadtotal = 0;
 
-    if (dcb->dcb_readqueue)
+    if (dcb->readq)
     {
-        *head = gwbuf_append(*head, dcb->dcb_readqueue);
-        dcb->dcb_readqueue = NULL;
+        *head = gwbuf_append(*head, dcb->readq);
+        dcb->readq = NULL;
         nreadtotal = gwbuf_length(*head);
     }
-    else if (dcb->dcb_fakequeue)
+    else if (dcb->fakeq)
     {
-        *head = gwbuf_append(*head, dcb->dcb_fakequeue);
-        dcb->dcb_fakequeue = NULL;
+        *head = gwbuf_append(*head, dcb->fakeq);
+        dcb->fakeq = NULL;
         nreadtotal = gwbuf_length(*head);
     }
 
@@ -3171,7 +3171,7 @@ public:
 
     void execute(Worker& worker)
     {
-        m_dcb->dcb_fakequeue = m_buffer;
+        m_dcb->fakeq = m_buffer;
         dcb_handler(m_dcb, m_ev);
     }