rename config param maxdata as max.reclen

src/child.c

@@ -259,7 +259,7 @@ append(dataentry *entry, enum VSL_tag_e tag, unsigned xid, char *data,
 
     CHECK_OBJ_NOTNULL(entry, DATA_MAGIC);
     /* Data overflow */
-    if (entry->end + datalen + 1 > config.maxdata) {
+    if (entry->end + datalen + 1 > config.max_reclen) {
         LOG_Log(LOG_ERR, "%s: Data too long, XID=%d, current length=%d, "
             "DISCARDING data=[%.*s]", VSL_tags[tag], xid, entry->end,
             datalen, data);
@@ -345,7 +345,7 @@ dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[], void *priv)
 
             if (de->end == 0) {
                 de->xid = t->vxid;
-                snprintf(de->data, config.maxdata, "XID=%u", t->vxid);
+                snprintf(de->data, config.max_reclen, "XID=%u", t->vxid);
                 de->end = strlen(de->data);
                 if (de->end > len_hi)
                     len_hi = de->end;
@@ -757,10 +757,10 @@ static char
 
     printf("... testing data append (expect an ERR)\n");
 
-    config.maxdata = DEF_MAXDATA;
+    config.max_reclen = DEF_MAX_RECLEN;
     entry = calloc(1, sizeof(dataentry));
     AN(entry);
-    entry->data = calloc(1, config.maxdata);
+    entry->data = calloc(1, config.max_reclen);
     AN(entry->data);
     entry->magic = DATA_MAGIC;
     truncated = len_hi = 0;

src/config.c

@@ -119,7 +119,7 @@ CONF_Add(const char *lval, const char *rval)
     confString("mq.module", mq_module);
     confString("mq.config_file", mq_config_file);
 
-    confUnsigned("maxdata", maxdata);
+    confUnsigned("max.reclen", max_reclen);
     confUnsigned("maxkeylen", maxkeylen);
     confUnsigned("qlen.goal", qlen_goal);
     confUnsigned("nworkers", nworkers);
@@ -207,7 +207,7 @@ CONF_Init(void)
     config.monitor_interval = 30;
     config.monitor_workers = false;
     config.max_records = DEF_MAX_RECORDS;
-    config.maxdata = DEF_MAXDATA;
+    config.max_reclen = DEF_MAX_RECLEN;
     config.maxkeylen = DEF_MAXKEYLEN;
     config.qlen_goal = DEF_QLEN_GOAL;
     config.idle_pause = DEF_IDLE_PAUSE;
@@ -258,7 +258,7 @@ CONF_Dump(int level)
     confdump(level, "monitor.workers = %s",
              config.monitor_workers ? "true" : "false");
     confdump(level, "max.records = %u", config.max_records);
-    confdump(level, "maxdata = %u", config.maxdata);
+    confdump(level, "max.reclen = %u", config.max_reclen);
     confdump(level, "maxkeylen = %u", config.maxkeylen);
     confdump(level, "qlen.goal = %u", config.qlen_goal);
 

src/data.c

@@ -67,7 +67,7 @@ data_Cleanup(void)
 int
 DATA_Init(void)
 {
-    unsigned bufsize = config.maxdata + config.maxkeylen;
+    unsigned bufsize = config.max_reclen + config.maxkeylen;
     
     /*
      * we want enough space to accomodate all open and done records
@@ -91,7 +91,7 @@ DATA_Init(void)
     for (unsigned i = 0; i < config.max_records; i++) {
         entrytbl[i].magic = DATA_MAGIC;
         entrytbl[i].data = &buf[i * bufsize];
-        entrytbl[i].key = &buf[(i * bufsize) + config.maxdata];
+        entrytbl[i].key = &buf[(i * bufsize) + config.max_reclen];
         VSTAILQ_INSERT_TAIL(&freehead, &entrytbl[i], freelist);
         global_nfree++;
     }

src/test/regress.sh

@@ -21,7 +21,7 @@ CMD="../trackrdrd -D -f varnish.binlog -l - -d -c test.conf"
 # the user running it
 CKSUM=$( $CMD | sed -e 's/\(initializing\) \(.*\)/\1/' | sed -e 's/\(Running as\) \([a-zA-Z0-9]*\)$/\1/' | grep -v 'Not running as root' | cksum)
 
-if [ "$CKSUM" != '3569206281 249613' ]; then
+if [ "$CKSUM" != '1219831915 249619' ]; then
     echo "ERROR: Regression test incorrect log cksum: $CKSUM"
     exit 1
 fi

src/test/test.conf

 # Test configuration for the varnish log tracking reader
 log.file = /tmp/trackrdrd.log
 pid.file = trackrdrd.pid
-maxdata = 4096
+max.reclen = 4096
 max.records = 1024
 monitor.interval = 0
 nworkers = 1

src/test/test_config.c

@@ -73,7 +73,7 @@ getConfigContent(void)
     confdump("monitor.interval = %u", config.monitor_interval);
     confdump("monitor.workers = %s", config.monitor_workers ? "true" : "false");
     confdump("max.records = %u", config.max_records);
-    confdump("maxdata = %u", config.maxdata);
+    confdump("max.reclen = %u", config.max_reclen);
     confdump("maxkeylen = %u", config.maxkeylen);
     confdump("qlen.goal = %u", config.qlen_goal);
 

src/test/test_data.c

@@ -52,7 +52,7 @@ static char
     printf("... testing data table initialization\n");
     
     config.max_records = DEF_MAX_RECORDS;
-    config.maxdata = DEF_MAXDATA;
+    config.max_reclen = DEF_MAX_RECLEN;
     config.maxkeylen = DEF_MAXKEYLEN;
     err = DATA_Init();
     VMASSERT(err == 0, "DATA_Init: %s", strerror(err));
@@ -76,20 +76,20 @@ static char
 static const char
 *test_data_set_get(void)
 {
-    char data[DEF_MAXDATA], key[DEF_MAXKEYLEN];
+    char data[DEF_MAX_RECLEN], key[DEF_MAXKEYLEN];
     
     printf("... testing data write and read\n");
 
     for (int i = 0; i < config.max_records; i++) {
-        memset(entrytbl[i].data, 'd', DEF_MAXDATA);
+        memset(entrytbl[i].data, 'd', DEF_MAX_RECLEN);
         memset(entrytbl[i].key,  'k', DEF_MAXKEYLEN);
     }
 
-    memset(data, 'd', DEF_MAXDATA);
+    memset(data, 'd', DEF_MAX_RECLEN);
     memset(key,  'k', DEF_MAXKEYLEN);
 
     for (int i = 0; i < config.max_records; i++) {
-        MASSERT(memcmp(entrytbl[i].data, data, DEF_MAXDATA) == 0);
+        MASSERT(memcmp(entrytbl[i].data, data, DEF_MAX_RECLEN) == 0);
         MASSERT(memcmp(entrytbl[i].key,  key,  DEF_MAXKEYLEN) == 0);
     }
 

src/test/test_worker.c

@@ -101,7 +101,7 @@ static char
     printf("... testing worker initialization\n");
 
     config.max_records = DEF_MAX_RECORDS;
-    config.maxdata = DEF_MAXDATA;
+    config.max_reclen = DEF_MAX_RECLEN;
     config.maxkeylen = DEF_MAXKEYLEN;
     config.nworkers = NWORKERS;
     strcpy(config.mq_config_file, MQ_CONFIG);

src/test/trackrdrd_001.conf

@@ -6,7 +6,7 @@ syslog.facility = LOCAL5
 monitor.interval = 30
 monitor.workers = true
 max.records = 10000
-maxdata = 8192
+max.reclen = 8192
 maxkeylen = 126
 qlen.goal = 4990
 mq.module = /usr/local/trackrdrd_tracking/lib/trackrdrd/libtrackrdr-activemq.so

src/test/trackrdrd_002.conf

@@ -6,7 +6,7 @@ syslog.facility = LOCAL5
 monitor.interval = 300
 monitor.workers = false
 max.records = 10001
-maxdata = 1024
+max.reclen = 1024
 maxkeylen = 124
 qlen.goal = 4991
 mq.module = /usr/local/trackrdrd/lib/trackrdrd/libtrackrdr-activemq.so

src/test/trackrdrd_003.conf

@@ -6,7 +6,7 @@ syslog.facility = LOCAL5
 monitor.interval = 10000000
 monitor.workers = true
 max.records = 10001
-maxdata = 1024
+max.reclen = 1024
 maxkeylen = 124
 qlen.goal = 4991
 mq.module = /usr/local/trackrdrd/lib/trackrdrd/libtrackrdr-activemq.so

src/test/trackrdrd_010.conf

@@ -6,7 +6,7 @@ syslog.facility = LOCAL5
 monitor.interval = 10000000
 monitor.workers = true
 max.records = 10001
-maxdata = 1024
+max.reclen = 1024
 maxkeylen = 124
 qlen.goal = 4991
 unknown.module = /my/path/module.so

src/trackrdrd.h

@@ -179,8 +179,8 @@ struct config {
     unsigned	max_records;	/* max number of buffered records */
 #define DEF_MAX_RECORDS 1024
     
-    unsigned	maxdata;  	/* size of char data buffer */
-#define DEF_MAXDATA 1024
+    unsigned	max_reclen;  	/* size of char data buffer */
+#define DEF_MAX_RECLEN 1024
 
     unsigned	maxkeylen;	/* size of shard key buffer */
 #define DEF_MAXKEYLEN 128