Update for MQ V9 pageset statistics

Better handling of CR/LF in Unix makefiles

Author: ibmmqmet

.gitignore

@@ -3,6 +3,8 @@
 /src/*.exe
 /src/*.obj
 mqsmfstruc.h
+src/convH
+src/mqsmfcsv
 csq*
 /src/t2
 /src/t3

README.md

@@ -5,22 +5,22 @@ to simplify import of statistics to spreadsheets and databases.
 Description
 ===========
 On z/OS, IBM MQ generates SMF accounting and statistics records to track
-the usage of the product. These are often used for capacity planning, 
+the usage of the product. These are often used for capacity planning,
 for performance tuning, or for chargeback.
 
-This package has been created to simplify the task of doing your 
-own analysis of MQ SMF records from a z/OS system, by making it 
+This package has been created to simplify the task of doing your
+own analysis of MQ SMF records from a z/OS system, by making it
 easy to import formatted records into a database or spreadsheet.
 
-The program takes the data from a z/OS dataset, downloaded to a 
-local file, and then runs on a Windows or Unix system, creating 
-standard CSV (comma-separated value) output files. 
+The program takes the data from a z/OS dataset, downloaded to a
+local file, and then runs on a Windows or Unix system, creating
+standard CSV (comma-separated value) output files.
 
 Unlike packages such as SupportPac MP1B, there is no interpretation
 at all of the SMF data. That can be done by your own spreadsheet or
 database programs and macros.
 
-This makes the code for the program very easy to understand; all the 
+This makes the code for the program very easy to understand; all the
 structures in the SMF records are printed directly.
 
 See mqsmfcsv.doc for more information on using or building this code, and
@@ -30,11 +30,13 @@ thoughts on possible enhancements to the code or this repository.
 History
 =======
 March 2016 - Initial release
-
+April 2016 - Update to support MQ V9 pageset statistics
+             Improved formatting for import to Access
+             Fixed some mis-labelled columns
 
 Pull requests
 =============
-Contributions to this package can be accepted under the terms of the 
+Contributions to this package can be accepted under the terms of the
 IBM Contributor License Agreement, found in the file CLA.md of this repository.
 
 When submitting a pull request, you must include a statement stating you accept the terms in CLA.md.

bin/aix/convH

@@ -1,17 +1,21 @@
-#!/bin/ksh
-
-plat=`uname`
-
-if [ "$plat" = "AIX" ]
-then
-  flags="-q32 "
-  cc="xlc"
-else
-  flags="-m32 "
-  cc="gcc"
-fi
-
-export PLATFLAGS=$flags CC=$cc
-make -e -f Makefile.unix $*
-
-
+#!/bin/ksh
+
+plat=`uname`
+
+if [ "$plat" = "AIX" ]
+then
+  flags="-q32 "
+  cc="xlc"
+  targdir="../bin/aix"
+else
+  flags="-m32 "
+  cc="gcc"
+  targdir="../bin/linux"
+fi
+
+export PLATFLAGS=$flags CC=$cc
+make -e -f Makefile.unix $*
+
+rm -f $targdir/convH $targdir/mqsmfcsv
+cp convH mqsmfcsv $targdir
+

bin/aix/mqsmfcsv

@@ -15,6 +15,7 @@ SRC = mqsmf.c \
       printQCCT.c  \
       printQESD.c  \
       printQEST.c  \
+      printQIS1.c  \
       printQIST.c  \
       printQJST.c  \
       printQLST.c  \
@@ -38,13 +39,15 @@ mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
 	-rm -f out/*
 	-rm -f SMF-*
 	-mkdir out >/dev/null 2>&1 || true
+	copy $@ ..\bin\win
 	# dbx ./$@
 
 mqsmfstruc.h: csqdsmfc.h convH.exe
 	./convH.exe < csqdsmfc.h > $@
 
 convH.exe: convH.c
 	$(CC) -o $@ convH.c
+	copy $@ ..\bin\win
 
 
 dummy:

bin/linux/convH

@@ -1,46 +1,47 @@
-
-CC=cc
-CFLAGS= -I. 
-PLATFLAGS=
-SRC = mqsmf.c \
-      smfDate.c \
-      smfConv.c \
-      printDEBUG.c \
-      printQ5ST.c    \
-      printQCST.c    \
-      printQCTADP.c  \
-      printQCTDNS.c  \
-      printQCTDSP.c  \
-      printQCTSSL.c  \
-      printQCCT.c  \
-      printQESD.c  \
-      printQEST.c  \
-      printQIST.c  \
-      printQJST.c  \
-      printQLST.c  \
-      printQMAC.c  \
-      printQMST.c  \
-      printQPST.c  \
-      printQSGM.c  \
-      printQSPH.c  \
-      printQSRS.c  \
-      printQSST.c  \
-      printQTST.c  \
-      printWQ.c    \
-      printWTAS.c  \
-      printWTID.c
-
-HDR = mqsmfstruc.h \
-      mqsmf.h
-
-mqsmfcsv: $(SRC) $(HDR) Makefile.unix
-	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS)
-
-mqsmfstruc.h: csqdsmfc.h convH
-	convH < csqdsmfc.h > $@
-
-convH: convH.c
-	$(CC) -o $@ convH.c
-
-
-dummy:
+
+CC=cc
+CFLAGS= -I. 
+PLATFLAGS=
+SRC = mqsmf.c \
+      smfDate.c \
+      smfConv.c \
+      printDEBUG.c \
+      printQ5ST.c    \
+      printQCST.c    \
+      printQCTADP.c  \
+      printQCTDNS.c  \
+      printQCTDSP.c  \
+      printQCTSSL.c  \
+      printQCCT.c  \
+      printQESD.c  \
+      printQEST.c  \
+      printQIS1.c  \
+      printQIST.c  \
+      printQJST.c  \
+      printQLST.c  \
+      printQMAC.c  \
+      printQMST.c  \
+      printQPST.c  \
+      printQSGM.c  \
+      printQSPH.c  \
+      printQSRS.c  \
+      printQSST.c  \
+      printQTST.c  \
+      printWQ.c    \
+      printWTAS.c  \
+      printWTID.c
+
+HDR = mqsmfstruc.h \
+      mqsmf.h
+
+mqsmfcsv: $(SRC) $(HDR) Makefile.unix dummy
+	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS)
+
+mqsmfstruc.h: csqdsmfc.h convH
+	convH < csqdsmfc.h > $@
+
+convH: convH.c
+	$(CC) -o $@ convH.c
+
+
+dummy:

bin/linux/mqsmfcsv

@@ -1,46 +1,49 @@
-CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J
-SRC = mqsmf.c \
-      smfDate.c \
-      smfConv.c \
-      printDEBUG.c \
-      printQ5ST.c    \
-      printQCST.c    \
-      printQCCT.c  \
-      printQCTADP.c\
-      printQCTDNS.c\
-      printQCTDSP.c\
-      printQCTSSL.c\
-      printQESD.c  \
-      printQEST.c  \
-      printQIST.c  \
-      printQJST.c  \
-      printQLST.c  \
-      printQMAC.c  \
-      printQMST.c  \
-      printQPST.c  \
-      printQSGM.c  \
-      printQSPH.c  \
-      printQSRS.c  \
-      printQSST.c  \
-      printQTST.c  \
-      printWQ.c    \
-      printWTAS.c  \
-      printWTID.c
-
-HDR = mqsmfstruc.h \
-      mqsmf.h
-
-mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
-	rm -f $@
-	$(CC) $(SRC) -I. /Fe$@ $(CFLAGS)
-	del /q *.obj
-
-mqsmfstruc.h: csqdsmfc.h convH
-	convH < csqdsmfc.h > $@
-
-convH: convH.c
-	$(CC) /Fe$@ convH.c
-
-
-dummy:
-
+CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J
+SRC = mqsmf.c \
+      smfDate.c \
+      smfConv.c \
+      printDEBUG.c \
+      printQ5ST.c    \
+      printQCST.c    \
+      printQCCT.c  \
+      printQCTADP.c\
+      printQCTDNS.c\
+      printQCTDSP.c\
+      printQCTSSL.c\
+      printQESD.c  \
+      printQEST.c  \
+      printQIS1.c  \
+      printQIST.c  \
+      printQJST.c  \
+      printQLST.c  \
+      printQMAC.c  \
+      printQMST.c  \
+      printQPST.c  \
+      printQSGM.c  \
+      printQSPH.c  \
+      printQSRS.c  \
+      printQSST.c  \
+      printQTST.c  \
+      printWQ.c    \
+      printWTAS.c  \
+      printWTID.c
+
+HDR = mqsmfstruc.h \
+      mqsmf.h
+
+mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
+	rm -f $@
+	$(CC) $(SRC) -I. /Fe$@ $(CFLAGS)
+	del /q *.obj
+	copy $@ ..\bin\win
+
+mqsmfstruc.h: csqdsmfc.h convH
+	convH < csqdsmfc.h > $@
+
+convH: convH.c
+	$(CC) /Fe$@ convH.c
+	copy $@ ..\bin\win
+
+
+dummy:
+