Skip to content

Commit 511c1bd

Browse files
ibmmqmetibmmqmet
committed
Add formatters for AMS & z/OS Connect EE 123 subtype version 1
1 parent 668a074 commit 511c1bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2938
-474
lines changed

‎CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11

22
History (newest at top)
33
=======================
4+
July 2020 (v5.3)
5+
* Update for MQ V9.2
6+
* Support for AMS SMF type 180 (thanks to Andrew Mattingly)
7+
* Experimental support for z/OS Connect EE type 123 (subtype version 1)
8+
49
Apr 2020 (v5.2.1)
510
* Update for MQ V9.1.5
611
* Include mqsmfstruc.h so you can build without copying a header from z/OS

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ structures in the SMF records are printed directly.
2626
See mqsmfcsv.doc for more information on using or building this code, and
2727
thoughts on possible enhancements to the code or this repository.
2828

29+
Recent enhancements to the package have gone beyond the primary SMF
30+
formatters for the MQ 115 and 116 records. The program can now also
31+
format MQ AMS (180) and z/OS Connect EE (123) records. But the name
32+
of the program is not changing to reflect that broader scope.
2933

3034
Pull requests
3135
=============

‎bin/aix/convH

0 Bytes
Binary file not shown.

‎bin/aix/mqsmfcsv

25.7 KB
Binary file not shown.

‎bin/linux/mqsmfcsv

17.6 KB
Binary file not shown.

‎bin/win/convH.exe

0 Bytes
Binary file not shown.

‎bin/win/mqsmfcsv.exe

13.5 KB
Binary file not shown.

‎mqsmfcsv.doc

2 KB
Binary file not shown.

‎src/M

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ else
2626
flags="$flags $optim"
2727
fi
2828

29-
export PLATFLAGS=$flags CC=$cc VERS=915
29+
export PLATFLAGS=$flags CC=$cc VERS=920
3030
make -e -f Makefile.unix $*
3131

3232
rm -f $targdir/convH $targdir/mqsmfcsv

‎src/Makefile.gcc.win

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
33
# CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS
44
CFLAGS= -I. -m32 -DPLATFORM_WINDOWS
55
PLATFLAGS=
6-
VERS=915
6+
VERS=920
77
SRC = mqsmf.c \
88
smfDDL.c \
99
smfDate.c \
@@ -12,32 +12,39 @@ SRC = mqsmf.c \
1212
smfPrint.c \
1313
checkSize.c \
1414
printDEBUG.c \
15-
printQ5ST.c \
16-
printQCST.c \
17-
printQCTADP.c \
18-
printQCTDNS.c \
19-
printQCTDSP.c \
20-
printQCTSSL.c \
21-
printQCCT.c \
22-
printQESD.c \
23-
printQEST.c \
24-
printQIS1.c \
25-
printQIST.c \
26-
printQJST.c \
27-
printQLST.c \
28-
printQMAC.c \
29-
printQMST.c \
30-
printQPST.c \
31-
printQSGM.c \
32-
printQSPH.c \
33-
printQSRS.c \
34-
printQSST.c \
35-
printQTST.c \
36-
printWQ.c \
37-
printWTAS.c \
38-
printWTID.c
15+
t115/printQ5ST.c \
16+
t115/printQCTADP.c \
17+
t115/printQCTDNS.c \
18+
t115/printQCTDSP.c \
19+
t115/printQCTSSL.c \
20+
t115/printQCCT.c \
21+
t115/printQESD.c \
22+
t115/printQEST.c \
23+
t115/printQIS1.c \
24+
t115/printQIST.c \
25+
t115/printQJST.c \
26+
t115/printQLST.c \
27+
t115/printQMST.c \
28+
t115/printQPST.c \
29+
t115/printQSGM.c \
30+
t115/printQSPH.c \
31+
t115/printQSRS.c \
32+
t115/printQSST.c \
33+
t115/printQTST.c \
34+
t116/printQCST.c \
35+
t116/printQMAC.c \
36+
t116/printWQ.c \
37+
t116/printWTAS.c \
38+
t116/printWTID.c \
39+
t123/printDataV1.c \
40+
t123/printDataV2.c \
41+
t123/printServerV1.c \
42+
t123/printServerV2.c \
43+
t180/printAMS.c
3944

40-
HDR = mqsmfstruc.h \
45+
HDR = mqsmfstrucW.h \
46+
t180/smf180.h \
47+
t123/smf123.h \
4148
mqsmf.h
4249

4350
default: mqsmfcsv.exe
@@ -57,8 +64,8 @@ mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
5764
-mkdir out >/dev/null 2>&1 || true
5865
cp $@ ../bin/win
5966

60-
mqsmfstruc.h: convH.exe dummy
61-
./convH.exe $(VERS) < csqdsmfc-$(VERS).h > $@
67+
mqsmfstrucW.h: convH.exe dummy
68+
(test -s csqdsmfc-$(VERS).h && ./convH.exe $(VERS) < csqdsmfc-$(VERS).h > $@) || exit 0
6269

6370
convH.exe: convH64.c
6471
$(CC) $(CFLAGS) -o $@ convH64.c

‎src/Makefile.unix

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,40 @@ SRC = \
1010
smfJson.c \
1111
checkSize.c \
1212
printDEBUG.c \
13-
printQ5ST.c \
14-
printQCST.c \
15-
printQCTADP.c \
16-
printQCTDNS.c \
17-
printQCTDSP.c \
18-
printQCTSSL.c \
19-
printQCCT.c \
20-
printQESD.c \
21-
printQEST.c \
22-
printQIS1.c \
23-
printQIST.c \
24-
printQJST.c \
25-
printQLST.c \
26-
printQMAC.c \
27-
printQMST.c \
28-
printQPST.c \
29-
printQSGM.c \
30-
printQSPH.c \
31-
printQSRS.c \
32-
printQSST.c \
33-
printQTST.c \
34-
printWQ.c \
35-
printWTAS.c \
36-
printWTID.c \
13+
t115/printQ5ST.c \
14+
t115/printQCTADP.c \
15+
t115/printQCTDNS.c \
16+
t115/printQCTDSP.c \
17+
t115/printQCTSSL.c \
18+
t115/printQCCT.c \
19+
t115/printQESD.c \
20+
t115/printQEST.c \
21+
t115/printQIS1.c \
22+
t115/printQIST.c \
23+
t115/printQJST.c \
24+
t115/printQLST.c \
25+
t115/printQMST.c \
26+
t115/printQPST.c \
27+
t115/printQSGM.c \
28+
t115/printQSPH.c \
29+
t115/printQSRS.c \
30+
t115/printQSST.c \
31+
t115/printQTST.c \
32+
t116/printQCST.c \
33+
t116/printQMAC.c \
34+
t116/printWQ.c \
35+
t116/printWTAS.c \
36+
t116/printWTID.c \
37+
t123/printDataV1.c \
38+
t123/printDataV2.c \
39+
t123/printServerV1.c \
40+
t123/printServerV2.c \
41+
t180/printAMS.c \
3742
mqsmf.c
3843

39-
HDR = mqsmfstruc.h \
44+
HDR = mqsmfstrucU.h \
45+
t123/smf123.h \
46+
t180/smf180.h \
4047
mqsmf.h
4148

4249
default: sizeTest
@@ -54,8 +61,8 @@ shipTest: mqsmfcsv
5461
mqsmfcsv: $(SRC) $(HDR) Makefile.unix dummy
5562
$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
5663

57-
mqsmfstruc.h: convH csqdsmfc-$(VERS).h
58-
convH $(VERS) < csqdsmfc-$(VERS).h > $@
64+
mqsmfstrucU.h: convH dummy # csqdsmfc-$(VERS).h
65+
(test -s csqdsmfc-$(VERS).h && convH $(VERS) < csqdsmfc-$(VERS).h > $@) || exit 0
5966

6067
convH: convH64.c dummy
6168
$(CC) -o $@ convH64.c

‎src/Makefile.win

Lines changed: 65 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,65 @@
1-
CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
2-
VERS=915
3-
SRC = mqsmf.c \
4-
smfDDL.c \
5-
smfDate.c \
6-
smfConv.c \
7-
smfJson.c \
8-
smfPrint.c \
9-
checkSize.c \
10-
printDEBUG.c \
11-
printQ5ST.c \
12-
printQCST.c \
13-
printQCCT.c \
14-
printQCTADP.c\
15-
printQCTDNS.c\
16-
printQCTDSP.c\
17-
printQCTSSL.c\
18-
printQESD.c \
19-
printQEST.c \
20-
printQIS1.c \
21-
printQIST.c \
22-
printQJST.c \
23-
printQLST.c \
24-
printQMAC.c \
25-
printQMST.c \
26-
printQPST.c \
27-
printQSGM.c \
28-
printQSPH.c \
29-
printQSRS.c \
30-
printQSST.c \
31-
printQTST.c \
32-
printWQ.c \
33-
printWTAS.c \
34-
printWTID.c
35-
36-
HDR = mqsmfstruc.h \
37-
mqsmf.h
38-
39-
checkSize: mqsmfcsv.exe
40-
mqsmfcsv.exe -v > sizes.tmp
41-
diff -b sizes.master sizes.tmp
42-
43-
mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
44-
rm -f $@
45-
$(CC) $(SRC) -I. /Fe$@ $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
46-
del /q *.obj
47-
copy $@ ..\bin\win
48-
49-
mqsmfstruc.h: convH.exe dummy
50-
convH $(VERS) < csqdsmfc-$(VERS).h > $@
51-
52-
convH.exe: convH64.c
53-
$(CC) $(CFLAGS) /Fe$@ convH64.c
54-
copy $@ ..\bin\win
55-
56-
57-
dummy:
58-
1+
CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
2+
VERS=920
3+
SRC = mqsmf.c \
4+
smfDDL.c \
5+
smfDate.c \
6+
smfConv.c \
7+
smfJson.c \
8+
smfPrint.c \
9+
checkSize.c \
10+
printDEBUG.c \
11+
t115/printQ5ST.c \
12+
t115/printQCCT.c \
13+
t115/printQCTADP.c\
14+
t115/printQCTDNS.c\
15+
t115/printQCTDSP.c\
16+
t115/printQCTSSL.c\
17+
t115/printQESD.c \
18+
t115/printQEST.c \
19+
t115/printQIS1.c \
20+
t115/printQIST.c \
21+
t115/printQJST.c \
22+
t115/printQLST.c \
23+
t115/printQMST.c \
24+
t115/printQPST.c \
25+
t115/printQSGM.c \
26+
t115/printQSPH.c \
27+
t115/printQSRS.c \
28+
t115/printQSST.c \
29+
t115/printQTST.c \
30+
t116/printQCST.c \
31+
t116/printQMAC.c \
32+
t116/printWQ.c \
33+
t116/printWTAS.c \
34+
t116/printWTID.c \
35+
t123/printDataV1.c \
36+
t123/printDataV2.c \
37+
t123/printServerV1.c \
38+
t123/printServerV2.c \
39+
t180/printAMS.c
40+
41+
HDR = mqsmfstrucW.h \
42+
t123/smf123.h \
43+
t180/smf180.h \
44+
mqsmf.h
45+
46+
checkSize: mqsmfcsv.exe
47+
mqsmfcsv.exe -v > sizes.tmp
48+
diff -b sizes.master sizes.tmp
49+
50+
mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
51+
rm -f $@
52+
$(CC) $(SRC) -I. /Fe$@ $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
53+
del /q *.obj
54+
copy $@ ..\bin\win
55+
56+
mqsmfstrucW.h: convH.exe dummy
57+
if exist csqdsmfc-$(VERS).h convH $(VERS) < csqdsmfc-$(VERS).h > $@
58+
59+
convH.exe: convH64.c
60+
$(CC) $(CFLAGS) /Fe$@ convH64.c
61+
copy $@ ..\bin\win
62+
63+
64+
dummy:
65+

0 commit comments

Comments
 (0)