version 1.15.0; added ca, epics4 version methods

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.bak
 *.*-
+RHEL7-x86_64
 SL6-x86_64
 windows-x64
 felix-cache

example.m

@@ -1 +0,0 @@
-exampleNew.m

macchinettaHelper.h

@@ -184,7 +184,8 @@ enum mdtIndex   {MOCHA_NATIVE=0, MOCHA_CHAR, MOCHA_UCHAR, MOCHA_SHORT, MOCHA_USH
 enum mochaIndex {SHOW=1, OPEN, OPEN_ARRAY, OPEN_WAIT, GET_OPEN_WAIT_TIME,
                  OPEN_WAIT_WITH_TIME,OPEN_WAIT_TIME_TO_DEFAULT,
                  OPEN_NOWAIT, OPEN_NOW, OPEN_NOW_AND_WAIT, OPEN_GROUP,
-                 CLOSE, CLOSE_ARRAY, CLOSE_GROUP, CA_POLL, MEX_UNLOCK, MOCHA_VERSION,
+                 CLOSE, CLOSE_ARRAY, CLOSE_GROUP, CA_POLL, MEX_UNLOCK,
+		 MOCHA_VERSION, EPICS_V_STRING, CA_V_STRING,
                  WITH_EXCEPTIONS, HAVE_EXCEPTIONS, SEND_NOW,
                  GET=100, GET_INT8, GET_INT16, GET_INT32, GET_INT64, GET_UINT8,
                  GET_UINT16, GET_UINT32, GET_UINT64, GET_FLOAT, GET_DOUBLE,
@@ -254,7 +255,8 @@ void msInsert()
     ms.insert(mochaccino(CA_POLL,         "capoll"));
     ms.insert(mochaccino(MEX_UNLOCK,      "mexunlock"));
     ms.insert(mochaccino(MOCHA_VERSION,   "version"));
-
+    ms.insert(mochaccino(EPICS_V_STRING,   "epicsversion"));
+    ms.insert(mochaccino(CA_V_STRING,      "caversion"));
     ms.insert(mochaccino(WITH_EXCEPTIONS,   "withexceptions"));
     ms.insert(mochaccino(WITH_EXCEPTIONS,   "setexceptions"));
     ms.insert(mochaccino(HAVE_EXCEPTIONS,   "haveexceptions"));

macchinettaSwitch.cpp

@@ -54,14 +54,6 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
     if (strcmp (mxGetClassName(prhs[0]),"string") ==0 ) {
 
 
-    	  //mxChar * mess2 = static_cast<mxChar*>(mxGetData(prhs[0]));
-    	  //mData = (mxArray *) mess2;
-        //messLength = METHOD_NAME_MAX_SIZE+1;
-
-        //if ( mxGetString(mData, mess, messLength) == 1) {
-    		//		mexPrintf ("mxGetString has failed; input is not of mxChar type\n");
-    		//}
-
     		mexPrintf ("MATLAB mx library does not support string/mxSTRING_CLASS as input\n");
     		mexPrintf ("Please use char/mxCHAR_CLASS as data type instead\n");
 		mexPrintf("i.e., use single quotes instead of double quotes in input argument!\n");
@@ -500,8 +492,16 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         mexPrintf("mocha mex file is active\n");
         break;
 
+    case EPICS_V_STRING:
+        plhs[0]=mxCreateString((char *) (cafe._epics_version()).c_str());
+        break;
+ 
+    case CA_V_STRING:
+        plhs[0]=mxCreateString((char *) (cafe._ca_version()).c_str());
+        break;
+
     case MOCHA_VERSION:
-        plhs[0]=mxCreateString((char *) "mocha-1.12.5 (Qt5 compatible) : 15 March 2021");
+        plhs[0]=mxCreateString((char *) "mocha-1.15.0 : 11 March 2022");
         break;
 
     case SHOW:
@@ -526,23 +526,18 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
     case SET_PUT_PREPARE:
     {
-
-
         if (nrhs<2)
         {
             mexPrintf("Invalid Number of argument(s) %d. Input: setPutPrepare, handle(s) or handleArray \n", nrhs);
             return;
         }
 
-
         size_t numberOfHandles=0;
 
-
         for (size_t j=1; j<nrhs; ++j)
         {
 
             numberOfHandles=mxGetNumberOfElements (prhs[j]);
-
             neWithinAllCells=0; // filled by checkHandleArray
 
             //What is dataType?

makefile

@@ -1 +1 @@
-makefile_rel_1.12-gcc-6.3.0
+makefile_rel_1.13-gcc-6.3.0

makefile_rel_2014_win.make

@@ -1,70 +0,0 @@
-MATLAB_ROOT=C:\'Program Files'\MATLAB\R2016b_x64
-MEXE=mexw64
-#c:\local\boost_1_62_0\
-
-INCLUDES = -IC:\CAFE\CAFE\cpp\include -IC:\CAFE\CAFE\cpp -IC:\local\boost_1_62_0 \
--IC:\local\boost_1_62_0\boost  -IC:\epics\base-3.14.12.5\include -IC:\epics\base-3.14.12.5\include\os\WIN32 \
--I"C:\Program Files\MATLAB\R2016b_x64\extern\include" \
--Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore -Ic:\Qt\qt-4.8.6-msvc2010\include\QtXml
-
-CXX=cl
-CXXFLAGS = /W4 /EHsc
-OUTPUT_OPTION = /o $@
-LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
-C:\CAFE\CAFE\cpp\cafe.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-1_62.lib \
-C:\Qt\Qt-4.8.6-msvc2010\lib\QtCore4.lib C:\Qt\tq-4.8.6-msvc2010\lib\QtXml4.lib 
-#"C:\Program Files\MATLAB\R2016b_x64\extern\lib\win64\microsoft\libmat.lib" \
-#"C:\Program Files\MATLAB\R2016b_x64\extern\lib\win64\microsoft\libmex.lib" \
-#"C:\Program Files\MATLAB\R2016b_x64\extern\lib\win64\microsoft\libmx.lib"
-
-LIB_CAFE=C:\CAFE\CAFE\cpp\cafe.lib
-LIB_BOOST =C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-1_62.lib 
-
-LIB_BOOST2=C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib
-
-#LIB_BOOST2=C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib
-
-#LIB_BOOST=C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-1_62.lib
-
-LIB_QT=C:\Qt\Qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib 
-
-LIB_EPICS=C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib
-
-OBJ_DIR=windows-x64
-
-CAFE_OBJS  = C:\CAFE\CAFE\cpp\src\cafeCache.obj C:\CAFE\CAFE\cpp\src\cafeGroup.obj C:\CAFE\CAFE\cpp\src\cafe.obj C:\CAFE\CAFE\cpp\src\cafeVectors.obj \
-			 C:\CAFE\CAFE\cpp\src\cafeXML.obj C:\CAFE\CAFE\cpp\src\callbackHandlerCreate.obj C:\CAFE\CAFE\cpp\src\callbackHandlerMonitor.obj \
-			 C:\CAFE\CAFE\cpp\src\conduitGroup.obj C:\CAFE\CAFE\cpp\src\conduit.obj \
-			 C:\CAFE\CAFE\cpp\src\connectCallbacks.obj C:\CAFE\CAFE\cpp\src\connectGroup.obj \
-			 C:\CAFE\CAFE\cpp\src\connect.obj C:\CAFE\CAFE\cpp\src\exceptionsHelper.obj C:\CAFE\CAFE\cpp\src\granules.obj C:\CAFE\CAFE\cpp\src\handleHelper.obj \
-			 C:\CAFE\CAFE\cpp\src\helper.obj \
-			 C:\CAFE\CAFE\cpp\src\loadCollectionXMLParser.obj C:\CAFE\CAFE\cpp\src\loadGroupXMLParser.obj C:\CAFE\CAFE\cpp\src\methodCallbacks.obj \
-			 C:\CAFE\CAFE\cpp\src\policyHelper.obj \
-			 C:\CAFE\CAFE\cpp\src\restorePVGroupXMLParser.obj C:\CAFE\CAFE\cpp\src\transpose.obj
-
-#\NODEFAULTLIB
-$(OBJ_DIR)\mocha.$(MEXE): mocha.cpp $(OBJ_DIR)\macchinettaSwitch.obj 
-	"C:\Program Files\MATLAB\R2016b_x64\bin\win64\mex"  -v COMPFLAGS="$(COMPFLAGS) -Wall" mocha.cpp $(OBJ_DIR)/macchinettaSwitch.obj -DDB_TEXT_GLBLSOURCE -DMSCC -DWIN32 -DWIN64 -largeArrayDims  $(INCLUDES) $(LIB_EPICS) $(LIB_CAFE) $(LIB_BOOST) $(LIB_BOOST2) $(LIB_QT) \
-	-outdir $(OBJ_DIR) -output mocha.$(MEXE)
- 
-$(OBJ_DIR)\macchinettaSwitch.obj: macchinettaSwitch.cpp macchinettaHelper.h \
-					macchinetta.h containerMochaccino.h 
-	"C:\Program Files\MATLAB\R2016b_x64\bin\win64\mex"  -largeArrayDims \
-	-c macchinettaSwitch.cpp $(INCLUDES) -outdir $(OBJ_DIR)   
-	
-clean:
-	rm -f $(OBJ_DIR)/*.obj $(OBJ_DIR)/*.$(MEXE)
-

out

@@ -0,0 +1,3 @@
+mex CXXFLAGS='-v -largeArrayDims -ansi -fexceptions -fPIC -fno-omit-frame-pointer -pthread -std=c++1z' \
+-c macchinettaSwitch.cpp -I/opt/psi/Programming/matlab/2021b/extern/include -I/opt/gfa/cafe/cpp/cafe-1.15.0-gcc-7.3.0/include -I./ -I/usr/local/epics/base-7.0.6/include -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost  -outdir RHEL7-x86_64/2021b   
+Building with 'g++'.