Update for MQ 9.3.5

ibm-messaging · Feb 22, 2024 · d808420 · d808420
1 parent fe82951
commit d808420
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,12 @@
 History (newest at top)
 =======================
 
+Feb 2024 (v5.4.5)
+* Update for MQ V9.3.5 
+* QCCT now has info about 64-bit CHIN storage use
+  * Previous "Storage_Usage" renamed to "Storage_Usage_31" 
+  * New fields added
+
 Oct 2023 (v5.4.4)
 * Try to recognise some input file corruption and cleanly exit
 * Update for MQ V9.3.4 (no changes to SMF records)

diff --git a/bin/aix/convH b/bin/aix/convH
diff --git a/bin/aix/mqsmfcsv b/bin/aix/mqsmfcsv
diff --git a/bin/linux/convH b/bin/linux/convH
diff --git a/bin/linux/mqsmfcsv b/bin/linux/mqsmfcsv
diff --git a/bin/win/mqsmfcsv.exe b/bin/win/mqsmfcsv.exe
diff --git a/src/M b/src/M
@@ -4,7 +4,7 @@ plat=`uname`
 
 if [ -z "$VERS" ]
 then
-  VERS="934"
+  VERS="935"
 fi
 
 if [ "$plat" = "AIX" ]

diff --git a/src/Makefile.gcc.win b/src/Makefile.gcc.win
@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
 # CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS 
 CFLAGS= -I. -m32  -DPLATFORM_WINDOWS 
 PLATFLAGS=
-VERS=934
+VERS=935
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

diff --git a/src/Makefile.win b/src/Makefile.win
@@ -1,5 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
-VERS=934
+VERS=935
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

diff --git a/src/mqsmfstrucU.h b/src/mqsmfstrucU.h
@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 934
+ * This file was generated from cqsdsmfc.h version 935
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
@@ -137,6 +137,8 @@ uint32_t qcctmxac;
 uint32_t qcctmxtp;
 uint32_t qcctmxlu;
 uint32_t qcctstus;
+uint64_t      qcctstab;
+uint64_t      qcctslim;
 } qcct;
 #define QCCTIDV  0xE741
 #define QCCTEYEV "QCCT"

diff --git a/src/mqsmfstrucW.h b/src/mqsmfstrucW.h
@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 934
+ * This file was generated from cqsdsmfc.h version 935
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
@@ -137,6 +137,8 @@ uint32_t qcctmxac;
 uint32_t qcctmxtp;
 uint32_t qcctmxlu;
 uint32_t qcctstus;
+uint64_t      qcctstab;
+uint64_t      qcctslim;
 } qcct;
 #define QCCTIDV  0xE741
 #define QCCTEYEV "QCCT"

diff --git a/src/sizes.master.935 b/src/sizes.master.935
@@ -0,0 +1,40 @@
+q5st : 672
+qcct : 64
+qct_dsp : 36
+qct_adp : 32
+qct_ssl : 48
+qct_dns : 48
+qcst : 324
+qest : 4104
+qesd : 336
+qist : 80
+qis1 : 104
+qjst : 596
+qlst : 32
+qmac : 48
+qmst : 104
+qpst : 104
+qqst : 552
+qsgm : 48
+qsph : 88
+qsrs : 232
+qsst : 72
+qtst : 96
+qwac : 176
+qwhc : 92
+qwhs : 52
+wtas : 2344
+wtid : 208
+qwst : 28
+qws0 : 96
+qws1 : 72
+qws5 : 16
+qws8 : 16
+qws9 : 16
+qwsx : 48
+qwas : 28
+qwa0 : 56
+wq   : 2800
+wq->maxqdpth: 588
+wq->z__001  : 594
+qqst->qqstdpth  : 80
diff --git a/src/t115/printQCCT.c b/src/t115/printQCCT.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 IBM Corporation and other Contributors.
+ * Copyright (c) 2016, 2024 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -27,7 +27,11 @@ void printQCCT(qcct *p)
   ADDU32 ("Active_Chl_Max"        ,p->qcctmxac);
   ADDU32 ("Max_TCP_Chl"           ,p->qcctmxtp);
   ADDU32 ("Max_LU62_Chl"          ,p->qcctmxlu);
-  ADDU32 ("Storage_Usage"         ,p->qcctstus);
+  ADDU32 ("Storage_Usage_31"      ,p->qcctstus);
+  if (conv16(p->qcctll) > offsetof(qcct,qcctstab)) {
+    ADDU64("Storage_Usage_64" , p->qcctstab);
+    ADDU64("Storage_Limit_64" , p->qcctslim);
+  }
   SMFPRINTSTOP;
 
   return;

diff --git a/src/t116/printQCST.c b/src/t116/printQCST.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016,2020 IBM Corporation and other Contributors.
+ * Copyright (c) 2016,2024 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -27,7 +27,7 @@ void printQCST(qcst *p)
   ADDSTR  ("Type"            ,strMQCHT((int)p->qcstchty),20);
   ADDSTR  ("Status"          ,strMQCHS((int)p->qcstchst),20);
   ADDSTR  ("Stat_Setting"    ,strMQMON((int)p->qcststcl),20);
-  ADDSTREN("Connection_Name" ,p->qcstcnnm,48);
+  ADDSTRENM("Connection_Name" ,p->qcstcnnm,48,48);
   ADDTIME ("Start"           ,p->qcststrt);
   ADDTIME ("Stop"            ,p->qcstludt);
   ADDTIME ("Last_Msg"        ,p->qcstlmst);

diff --git a/src/t116/printWTID.c b/src/t116/printWTID.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 IBM Corporation and other Contributors.
+ * Copyright (c) 2016,2024 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -29,7 +29,7 @@ void printWTID(wtid *p, unsigned char *correlid)
   ADDSTRB ("UOW_ID", p->wtiduowi, 24);
   ADDSTRB ("Accounting_Token", p->wtidacct, 22);
   ADDSTREN("Channel_Name", p->wtidchl, 20);
-  ADDSTREN("Channel_Connection_Name", p->wtidchlc, 48);
+  ADDSTRENM("Channel_Connection_Name", p->wtidchlc, 48, 48);
   ADDSTRB ("Context_Token", p->wtidctxt, 16);
   ADDSTREN("MVS_UserId", p->wtidtran, 8);