unconditional JSON

Support yajl_gen circa 3.15

remove vestiges of 3.14 support

Author: mdavidsaver

caPutLogApp/Makefile

@@ -28,14 +28,11 @@ INC += caPutLogAs.h
 DBD += caPutLog.dbd
 
 # Add support for json format and arrays
-# This requires EPICS base version 7.0.1 or higher
-ifdef BASE_7_0
 USR_CPPFLAGS += -DJSON_AND_ARRAYS_SUPPORTED
 caPutLog_SRCS += caPutJsonLogTask.cpp
 caPutLog_SRCS += caPutJsonLogShellCommands.cpp
 INC += caPutJsonLogTask.h
 DBD += caPutJsonLog.dbd
-endif
 
 
 caPutLog_LIBS += $(EPICS_BASE_IOC_LIBS)

caPutLogApp/caPutJsonLogTask.cpp

@@ -30,6 +30,8 @@
 #include <asLib.h>
 #include <logClient.h>
 #include <epicsThread.h>
+#include <epicsMutex.h>
+#include <epicsGuard.h>
 #include <epicsAtomic.h>
 #include <dbAccessDefs.h>
 #include <epicsMath.h>
@@ -43,6 +45,7 @@
 #include "caPutLogTask.h"
 #include "caPutJsonLogTask.h"
 
+typedef epicsGuard<epicsMutex> guard_t;
 
 #define isDbrNumeric(type) ((type) > DBR_STRING && (type) <= DBR_ENUM)
 
@@ -78,7 +81,7 @@ CaPutJsonLogTask::CaPutJsonLogTask()
 CaPutJsonLogTask::~CaPutJsonLogTask()
 {
     clientItem *client, *nextclient;
-    epicsMutex::guard_t G(clientsMutex);
+    guard_t G(clientsMutex);
     nextclient = clients;
     clients = NULL;
     while (nextclient) {
@@ -108,7 +111,7 @@ caPutJsonLogStatus CaPutJsonLogTask::report(int level)
 
     if (clients != NULL) {
         clientItem *client;
-        epicsMutex::guard_t G(clientsMutex);
+        guard_t G(clientsMutex);
         for (client = clients; client; client = client->next) {
             logClientShow(client->caPutJsonLogClient, level);
         }
@@ -254,7 +257,7 @@ caPutJsonLogStatus CaPutJsonLogTask::configureServerLogging(const char* address)
     clientItem** pclient;
 
     // Parse the address
-    epicsMutex::guard_t G(clientsMutex);
+    guard_t G(clientsMutex);
     for (pclient = &clients; *pclient; pclient = &(*pclient)->next) {
         if (strcmp(address, (*pclient)->address) == 0) {
             fprintf (stderr, "caPutJsonLog: address %s already configured\n", address);
@@ -463,7 +466,11 @@ caPutJsonLogStatus CaPutJsonLogTask::buildJsonMsg(const VALUE *pold_value, const
     }
 
     // Configure yajl generator
-    yajl_gen handle = yajl_gen_alloc(NULL);
+    yajl_gen handle = yajl_gen_alloc(
+#ifndef EPICS_YAJL_VERSION
+        NULL, // v1 yajl_gen_config struct*.  v2 switched to yajl_gen_config() function
+#endif
+        NULL);
     if (handle == NULL) {
         errlogSevPrintf(errlogMinor, "caPutJsonLog: failed to allocate yajl handler\n");
         return caPutJsonLogError;
@@ -674,7 +681,12 @@ caPutJsonLogStatus CaPutJsonLogTask::buildJsonMsg(const VALUE *pold_value, const
 
     /* Get JSON as NULL terminated cstring */
     const unsigned char * buf;
-    size_t len = 0;
+#ifdef EPICS_YAJL_VERSION
+    size_t
+#else
+    unsigned int
+#endif
+        len = 0;
     yajl_gen_get_buf(handle, &buf, &len);
 
     /* Get a JSON as a string */
@@ -690,7 +702,7 @@ caPutJsonLogStatus CaPutJsonLogTask::buildJsonMsg(const VALUE *pold_value, const
 void CaPutJsonLogTask::logToServer(std::string &msg)
 {
     clientItem* client;
-    epicsMutex::guard_t G(clientsMutex);
+    guard_t G(clientsMutex);
     for (client = clients; client; client = client->next) {
         logClientSend (client->caPutJsonLogClient, msg.c_str());
     }
@@ -742,19 +754,22 @@ void CaPutJsonLogTask::calculateMin(VALUE *pres, const VALUE *pa, const VALUE *p
         case DBR_ULONG:
             pres->v_uint32 = std::min(pa->v_uint32, pb->v_uint32);
             return;
+#ifdef DBR_INT64
         case DBR_INT64:
             pres->v_int64 = std::min(pa->v_int64, pb->v_int64);
             return;
         case DBR_UINT64:
             pres->v_uint64 = std::min(pa->v_uint64, pb->v_uint64);
             return;
+#endif
         case DBR_FLOAT:
             pres->v_float = std::min(pa->v_float, pb->v_float);
             return;
         case DBR_DOUBLE:
             pres->v_double = std::min(pa->v_double, pb->v_double);
             return;
     }
+    memset(pres, 0, sizeof(*pres));
 }
 
 void CaPutJsonLogTask::calculateMax(VALUE *pres, const VALUE *pa, const VALUE *pb, short type)
@@ -779,19 +794,22 @@ void CaPutJsonLogTask::calculateMax(VALUE *pres, const VALUE *pa, const VALUE *p
         case DBR_ULONG:
             pres->v_uint32 = std::max(pa->v_uint32, pb->v_uint32);
             return;
+#ifdef DBR_INT64
         case DBR_INT64:
             pres->v_int64 = std::max(pa->v_int64, pb->v_int64);
             return;
         case DBR_UINT64:
             pres->v_uint64 = std::max(pa->v_uint64, pb->v_uint64);
             return;
+#endif
         case DBR_FLOAT:
             pres->v_float = std::max(pa->v_float, pb->v_float);
             return;
         case DBR_DOUBLE:
             pres->v_double = std::max(pa->v_double, pb->v_double);
             return;
     }
+    memset(pres, 0, sizeof(*pres));
 }
 
 #define SINGLE_TYPE_COMPARE(_t, _s)                            \
@@ -860,10 +878,12 @@ int CaPutJsonLogTask::fieldVal2Str(char *pbuf, size_t buflen, const VALUE *pval,
         case DBR_DOUBLE:
             len = epicsSnprintf(pbuf, buflen, "%.17g", ((epicsFloat64 *)pval)[index]);
             break;
+#ifdef DBR_INT64
         case DBR_INT64:
             return epicsSnprintf(pbuf, buflen, "%lld", ((epicsInt64 *)pval)[index]);
         case DBR_UINT64:
             return epicsSnprintf(pbuf, buflen, "%llu", ((epicsUInt64 *)pval)[index]);
+#endif
         case DBR_STRING:
             return epicsSnprintf(pbuf, buflen, "%s", ((char *)pval) + index * MAX_STRING_SIZE);
         default:

caPutLogApp/caPutLogAs.c

@@ -189,9 +189,6 @@ static void caPutLogAs(asTrapWriteMessage *pmessage, int afterPut)
 
 int caPutLogMaxArraySize(short type)
 {
-#if !JSON_AND_ARRAYS_SUPPORTED
-    return 1;
-#else
     static int const arraySizeLookUpTable [] = {
         MAX_ARRAY_SIZE_BYTES/MAX_STRING_SIZE,       /* DBR_STRING */
         MAX_ARRAY_SIZE_BYTES/sizeof(epicsInt8),     /* DBR_CHAR */
@@ -213,7 +210,6 @@ int caPutLogMaxArraySize(short type)
         errlogSevPrintf(errlogMajor, "caPutLogAs: Array size for type %d can not be determind\n", type);
         return 1;
     }
-#endif
 }
 
 long caPutLogActualArraySize(dbAddr * paddr)

caPutLogApp/caPutLogTask.h

@@ -12,11 +12,7 @@ extern "C" {
 #define MAX_USERID_SIZE 32
 #define MAX_HOSTID_SIZE 256
 
-#if JSON_AND_ARRAYS_SUPPORTED
 #define MAX_ARRAY_SIZE_BYTES 400
-#else
-#define MAX_ARRAY_SIZE_BYTES 0
-#endif
 
 #define DEFAULT_BURST_TIMEOUT 5.0
 
@@ -35,7 +31,7 @@ typedef union {
     epicsFloat64    v_double;
     char            v_string[MAX_STRING_SIZE];
 
-#if JSON_AND_ARRAYS_SUPPORTED
+    char            a_bytes[MAX_ARRAY_SIZE_BYTES];
     epicsInt8       a_int8[MAX_ARRAY_SIZE_BYTES/sizeof(epicsInt8)];
     epicsUInt8      a_uint8[MAX_ARRAY_SIZE_BYTES/sizeof(epicsUInt8)];
     epicsInt16      a_int16[MAX_ARRAY_SIZE_BYTES/sizeof(epicsInt16)];
@@ -47,7 +43,6 @@ typedef union {
     epicsFloat32    a_float[MAX_ARRAY_SIZE_BYTES/sizeof(epicsFloat32)];
     epicsFloat64    a_double[MAX_ARRAY_SIZE_BYTES/sizeof(epicsFloat64)];
     char            a_string[MAX_ARRAY_SIZE_BYTES/MAX_STRING_SIZE][MAX_STRING_SIZE];
-#endif
 } VALUE;
 
 typedef struct {