Support for new 903 fields

Author: ibmmqmet

README.md

@@ -62,6 +62,11 @@ February 2017
 * STCK durations printed as just microseconds value when in SQL mode. Still
 split as seconds/microseconds otherwise.
 
+May 2017
+* Added support for the 903 SMF extensions
+* Using a VERS flag during the build to select correct base header file
+and features
+
 
 Pull requests
 =============

bin/aix/convH

@@ -13,7 +13,7 @@ else
   targdir="../bin/linux"
 fi
 
-export PLATFLAGS=$flags CC=$cc
+export PLATFLAGS=$flags CC=$cc VERS=903
 make -e -f Makefile.unix $*
 
 rm -f $targdir/convH $targdir/mqsmfcsv

bin/aix/mqsmfcsv

@@ -2,6 +2,7 @@
 CC=i686-w64-mingw32-gcc
 CFLAGS= -I. -m32
 PLATFLAGS=
+VERS=903
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -36,15 +37,15 @@ HDR = mqsmfstruc.h \
       mqsmf.h
 
 mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
-	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS)
+	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
 	-rm -f out/*
 	-rm -f SMF-*
 	-mkdir out >/dev/null 2>&1 || true
 	cp $@ ../bin/win
 	# dbx ./$@
 
-mqsmfstruc.h: csqdsmfc.h convH.exe
-	./convH.exe < csqdsmfc.h > $@
+mqsmfstruc.h: csqdsmfc-$(VERS).h convH.exe dummy	
+	./convH.exe < csqdsmfc-$(VERS).h > $@
 
 convH.exe: convH.c
 	$(CC) -o $@ convH.c

bin/linux/convH

@@ -36,12 +36,12 @@ HDR = mqsmfstruc.h \
       mqsmf.h
 
 mqsmfcsv: $(SRC) $(HDR) Makefile.unix dummy
-	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS)
+	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
 
-mqsmfstruc.h: csqdsmfc.h convH
-	convH < csqdsmfc.h > $@
+mqsmfstruc.h: csqdsmfc-$(VERS).h convH dummy
+	convH < csqdsmfc-$(VERS).h > $@
 
-convH: convH.c
+convH: convH.c dummy
 	$(CC) -o $@ convH.c
 
 

bin/linux/mqsmfcsv

@@ -1,4 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J
+VERS=903
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -34,12 +35,12 @@ HDR = mqsmfstruc.h \
 
 mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
 	rm -f $@
-	$(CC) $(SRC) -I. /Fe$@ $(CFLAGS)
+	$(CC) $(SRC) -I. /Fe$@ $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
 	del /q *.obj
 	copy $@ ..\bin\win
 
-mqsmfstruc.h: csqdsmfc.h convH
-	convH < csqdsmfc.h > $@
+mqsmfstruc.h: csqdsmfc-$(VERS).h convH dummy
+	convH < csqdsmfc-$(VERS).h > $@
 
 convH: convH.c
 	$(CC) /Fe$@ convH.c

bin/win/mqsmfcsv.exe

@@ -38,6 +38,16 @@ void printQMST(qmst *p)
     ADDS32("Status",p->qmststus);
     ADDS32("Pubs"  ,p->qmstpubs);
   }
+#if CSQDSMF_VERSION >= 903
+  if (conv16(p->qmstll) >  offsetof(qmst,  qmstspp))/* Fields added for V7.0.3 */
+  {
+    ADDS64("PersPuts",    p->qmstspp);  /* Number of success pers puts   */
+    ADDS64("NonPersPuts", p->qmstsnp);  /* Number of success pers puts   */
+    ADDS64("PersPutBytes",    p->qmstpbp);  /* Number of success pers puts   */
+    ADDS64("NonPersPutBytes", p->qmstnbp);  /* Number of success pers puts   */
+  }
+#endif
+
   SMFPRINTSTOP;
 
   return;

mqsmfcsv.doc

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <mqsmf.h>
+#include "mqsmf.h"
 
 static FILE *fp = NULL;
 char *comma = "";