From b27774e67482cc3bf0e953c233f27659c03cc020 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 17 Oct 2016 10:24:32 +0300
Subject: [PATCH] Rename MAX_BUFFER_SIZE

MAX_BUFFER_SIZE, which is used for limiting the amount of the data
read from a socket renamed to MXS_MAX_NW_READ_BUFFER_SIZE and moved
from gw.h to limits.h.

Consider removing altogether. Difficult to justify since non-blocking
reads are used and the amount of available data is known.
---
 include/maxscale/gw.h                    |  3 ---
 include/maxscale/limits.h                | 12 +++++++++++-
 server/core/dcb.c                        |  6 +++---
 server/modules/routing/avro/avrorouter.h |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/include/maxscale/gw.h b/include/maxscale/gw.h
index a560342fa..a9a5b601f 100644
--- a/include/maxscale/gw.h
+++ b/include/maxscale/gw.h
@@ -38,9 +38,6 @@
 
 MXS_BEGIN_DECLS
 
-// network buffer is 32K
-#define MAX_BUFFER_SIZE 32768
-
 #define GW_NOINTR_CALL(A)       do { errno = 0; A; } while (errno == EINTR)
 
 bool gw_daemonize(void);
diff --git a/include/maxscale/limits.h b/include/maxscale/limits.h
index ea3bc874c..43eab289f 100644
--- a/include/maxscale/limits.h
+++ b/include/maxscale/limits.h
@@ -33,7 +33,7 @@ MXS_BEGIN_DECLS
 #define MXS_BACKEND_SO_RCVBUF (128 * 1024)
 
 /**
- * MSX_BACKEND_SO_SNDBUF
+ * MXS_BACKEND_SO_SNDBUF
  *
  * The value used when setting SO_SNDBUF of backend sockets.
  */
@@ -53,6 +53,16 @@ MXS_BEGIN_DECLS
  */
 #define MXS_CLIENT_SO_SNDBUF  (128 * 1024)
 
+/**
+ * MXS_MAX_NW_READ_BUFFER_SIZE
+ *
+ * The maximum amount of data read in one gofrom a client DCB.
+ *
+ * TODO: Consider removing altogether so that we always read
+ *       whatever is available in the socket.
+ */
+#define MXS_MAX_NW_READ_BUFFER_SIZE (32 * 1024)
+
 /**
  * MXS_MAX_THREADS
  *
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 9c9c74746..085eeb7f5 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -1069,7 +1069,7 @@ dcb_basic_read(DCB *dcb, int bytesavailable, int maxbytes, int nreadtotal, int *
 {
     GWBUF *buffer;
 
-    int bufsize = MXS_MIN(bytesavailable, MAX_BUFFER_SIZE);
+    int bufsize = MXS_MIN(bytesavailable, MXS_MAX_NW_READ_BUFFER_SIZE);
     if (maxbytes)
     {
         bufsize = MXS_MIN(bufsize, maxbytes - nreadtotal);
@@ -1187,10 +1187,10 @@ dcb_read_SSL(DCB *dcb, GWBUF **head)
 static GWBUF *
 dcb_basic_read_SSL(DCB *dcb, int *nsingleread)
 {
-    unsigned char temp_buffer[MAX_BUFFER_SIZE];
+    unsigned char temp_buffer[MXS_MAX_NW_READ_BUFFER_SIZE];
     GWBUF *buffer = NULL;
 
-    *nsingleread = SSL_read(dcb->ssl, (void *)temp_buffer, MAX_BUFFER_SIZE);
+    *nsingleread = SSL_read(dcb->ssl, (void *)temp_buffer, MXS_MAX_NW_READ_BUFFER_SIZE);
     dcb->stats.n_reads++;
 
     switch (SSL_get_error(dcb->ssl, *nsingleread))
diff --git a/server/modules/routing/avro/avrorouter.h b/server/modules/routing/avro/avrorouter.h
index 63147af7d..062e18450 100644
--- a/server/modules/routing/avro/avrorouter.h
+++ b/server/modules/routing/avro/avrorouter.h
@@ -108,7 +108,7 @@ typedef enum avro_binlog_end
 #define TABLE_MAP_MAX_NAME_LEN 64
 
 /** How many bytes each thread tries to send */
-#define AVRO_DATA_BURST_SIZE MAX_BUFFER_SIZE
+#define AVRO_DATA_BURST_SIZE (32 * 1024)
 
 /** A CREATE TABLE abstraction */
 typedef struct table_create