Add support for array logging and json format

Makefile

@@ -4,8 +4,10 @@ include $(TOP)/configure/CONFIG
 
 DIRS := configure
 DIRS += caPutLogApp
+DIRS += test
 
 caPutLogApp_DEPEND_DIRS = configure
+test_DEPEND_DIRS = caPutLogApp
 
 # Allow 'make docs' but don't otherwise descend into it
 ifeq ($(MAKECMDGOALS),docs)

caPutLogApp/Makefile

@@ -5,6 +5,8 @@ include $(TOP)/configure/CONFIG
 
 LIBRARY_IOC = caPutLog
 
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
 caPutLog_SRCS += caPutLogTask.c
 caPutLog_SRCS += caPutLogAs.c
 caPutLog_SRCS += caPutLogClient.c
@@ -21,6 +23,17 @@ 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)
 caPutLog_SYS_LIBS_WIN32 += ws2_32
 

caPutLogApp/caPutJsonLog.dbd

@@ -0,0 +1,2 @@
+variable(caPutLogJsonMsgQueueSize,int)
+registrar(caPutJsonLogRegister)

caPutLogApp/caPutJsonLogShellCommands.cpp

@@ -0,0 +1,94 @@
+/* File:     caPutJsonLogShellCommands.cpp
+ * Author:   Matic Pogacnik
+ * Created:  21.07.2020
+ *
+ * Contains code for a IOC shell configuration commands of the
+ * JSON CA put logger implementation.
+ *
+ * Modification log:
+ * ----------------
+ * v 1.0
+ * - Initial version
+*/
+
+#include <errlog.h>
+#include <iocsh.h>
+#include <epicsExport.h>
+
+#include "caPutJsonLogTask.h"
+
+/* EPICS iocsh shell commands */
+extern "C"
+{
+    extern int caPutLogJsonMsgQueueSize;
+
+    /* Initalisation */
+    int caPutJsonLogInit(const char * address, caPutJsonLogConfig config){
+        CaPutJsonLogTask *logger =  CaPutJsonLogTask::getInstance();
+        if (logger != NULL) return logger->initialize(address, config);
+        else return -1;
+    }
+
+    static const iocshArg caPutJsonLogInitArg0 = {"address", iocshArgString};
+    static const iocshArg caPutJsonLogInitArg1 = {"config", iocshArgInt};
+    static const iocshArg *const caPutJsonLogInitArgs[] = {
+        &caPutJsonLogInitArg0,
+        &caPutJsonLogInitArg1
+    };
+    static const iocshFuncDef caPutjsonLogInitDef = {"caPutJsonLogInit", 2, caPutJsonLogInitArgs};
+    static void caPutJsonLogInitCall(const iocshArgBuf *args)
+    {
+        caPutJsonLogInit(args[0].sval, static_cast<caPutJsonLogConfig>(args[1].ival));
+    }
+
+
+    /* Reconfigure */
+    int caPutJsonLogReconf(caPutJsonLogConfig config){
+        CaPutJsonLogTask *logger =  CaPutJsonLogTask::getInstance();
+        if (logger != NULL)  return logger->reconfigure(config);
+        else return -1;
+    }
+
+    static const iocshArg caPutJsonLogReconfArg0 = {"config", iocshArgInt};
+    static const iocshArg *const caPutJsonLogReconfArgs[] = {
+        &caPutJsonLogReconfArg0
+    };
+    static const iocshFuncDef caPutJsonLogReconfDef = {"caPutJsonLogReconf", 1, caPutJsonLogReconfArgs};
+    static void caPutJsonLogReconfCall(const iocshArgBuf *args)
+    {
+        caPutJsonLogReconf(static_cast<caPutJsonLogConfig>(args[0].ival));
+    }
+
+    /* Report */
+    int caPutJsonLogShow(int level){
+        CaPutJsonLogTask *logger =  CaPutJsonLogTask::getInstance();
+        if (logger != NULL)  return logger->report(level);
+        else return -1;
+    }
+
+    static const iocshArg caPutJsonLogShowArg0 = {"level", iocshArgInt};
+    static const iocshArg *const caPutJsonLogShowArgs[] = {
+        &caPutJsonLogShowArg0
+    };
+    static const iocshFuncDef caPutJsonLogShowDef = {"caPutJsonLogShow", 1, caPutJsonLogShowArgs};
+    static void caPutJsonLogShowCall(const iocshArgBuf *args)
+    {
+        caPutJsonLogShow(args[0].ival);
+    }
+
+
+    /* Register IOCsh commands */
+    static void caPutJsonLogRegister(void)
+    {
+        static int done = FALSE;
+        if(done) return;
+        done = TRUE;
+
+        iocshRegister(&caPutjsonLogInitDef,caPutJsonLogInitCall);
+        iocshRegister(&caPutJsonLogReconfDef,caPutJsonLogReconfCall);
+        iocshRegister(&caPutJsonLogShowDef,caPutJsonLogShowCall);
+    }
+    epicsExportRegistrar(caPutJsonLogRegister);
+
+    epicsExportAddress(int,caPutLogJsonMsgQueueSize);
+}