Update for MQ 930 - include new QQST structure

ibmmqmet · ibmmqmet · commit d2f7e7ad8fce · 2022-07-04T08:44:49.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,10 @@
 History (newest at top)
 =======================
 
+Jul 2022 (v5.4)
+* Update for MQ V9.3.0
+* New QQST structure in the 115 records
+
 Nov 2021 (v5.3.3)
 * Update for MQ V9.2.4 (no functional change)
 * Visual Studio 2022 setup script
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/convH.exe b/bin/win/convH.exe
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="924"
+  VERS="930"
 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=924
+VERS=930
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -26,6 +26,7 @@ SRC = mqsmf.c \
       t115/printQLST.c  \
       t115/printQMST.c  \
       t115/printQPST.c  \
+      t115/printQQST.c  \
       t115/printQSGM.c  \
       t115/printQSPH.c  \
       t115/printQSRS.c  \
diff --git a/src/Makefile.unix b/src/Makefile.unix
@@ -24,6 +24,7 @@ SRC = \
       t115/printQLST.c  \
       t115/printQMST.c  \
       t115/printQPST.c  \
+      t115/printQQST.c  \
       t115/printQSGM.c  \
       t115/printQSPH.c  \
       t115/printQSRS.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=924
+VERS=930
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -22,6 +22,7 @@ SRC = mqsmf.c \
       t115/printQLST.c  \
       t115/printQMST.c  \
       t115/printQPST.c  \
+      t115/printQQST.c  \
       t115/printQSGM.c  \
       t115/printQSPH.c  \
       t115/printQSRS.c  \
diff --git a/src/checkSize.c b/src/checkSize.c
@@ -26,6 +26,7 @@ fprintf(fp,"%s : %d\n","qlst",(int)sizeof(qlst));
 fprintf(fp,"%s : %d\n","qmac",(int)sizeof(qmac));
 fprintf(fp,"%s : %d\n","qmst",(int)sizeof(qmst));
 fprintf(fp,"%s : %d\n","qpst",(int)sizeof(qpst));
+fprintf(fp,"%s : %d\n","qqst",(int)sizeof(qqst));
 fprintf(fp,"%s : %d\n","qsgm",(int)sizeof(qsgm));
 fprintf(fp,"%s : %d\n","qsph",(int)sizeof(qsph));
 fprintf(fp,"%s : %d\n","qsrs",(int)sizeof(qsrs));
@@ -46,6 +47,11 @@ fprintf(fp,"%s : %d\n","qwsx",(int)sizeof(qwsx));
 fprintf(fp,"%s : %d\n","qwas",(int)sizeof(qwas));
 fprintf(fp,"%s : %d\n","qwa0",(int)sizeof(qwa0));
 fprintf(fp,"%s : %d\n","wq  ",(int)sizeof(wq));
+
+/* Print a few structure offsets that reflect problematic areas */
 fprintf(fp,"wq->maxqdpth: %d\n",(int)offsetof(wq,maxqdpth));
 fprintf(fp,"wq->z__001  : %d\n",(int)offsetof(wq,z__001  ));
+
+/* QQST is new during 930 development and initial version looked wrong. But it's now corrected. */
+fprintf(fp,"qqst->qqstdpth  : %d\n",(int)offsetof(qqst,qqstdpth  ));
 }
diff --git a/src/convH64.c b/src/convH64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020 IBM Corporation and other Contributors.
+ * Copyright (c) 2016, 2022 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
@@ -372,7 +372,7 @@ void printHeader(char *version)
   printf(" * by the convH program (convH64.c) in the src directory\n");
   printf(" * Do not try to edit this header manually.\n");
   printf(" * \n");
-  printf(" * (C) Copyright IBM Corp. 1993, 2021 All Rights Reserved.\n");
+  printf(" * (C) Copyright IBM Corp. 1993, 2022 All Rights Reserved.\n");
   printf(" * \n");
   printf(" */\n");
 }
diff --git a/src/mqsmf.c b/src/mqsmf.c
@@ -914,6 +914,18 @@ int main( int argc, char *argv[] )
         }
         break;
 
+#ifdef QQSTIDV
+     /* Pageset statistics introduced in MQ V9.3 - only compile this block if using */
+     /* a suitable header file.                                                   */
+      case SMFSUBTYPE_MQ_STAT_QUEUES:
+        for(i = 0; i < triplet[1].n; i++)
+        {
+          p = &dataBuf[triplet[1].offset + triplet[1].l * i];
+          printQQST((qqst *)p);
+        }
+        break;
+#endif
+
       case SMFSUBTYPE_MQ_STAT_RESERVED_1:
         /* These are internal undocumented structures. There's not much we can do */
         /* except ignore them. We will see them show up in the overall subtype    */ 
diff --git a/src/mqsmf.h b/src/mqsmf.h
@@ -75,6 +75,7 @@ typedef      unsigned int BOOL;
 #define SMFSUBTYPE_MQ_STAT_REGION  (7)
 #define SMFSUBTYPE_MQ_STAT_PAGESET (201)
 #define SMFSUBTYPE_MQ_STAT_BUFFER  (215)
+#define SMFSUBTYPE_MQ_STAT_QUEUES  (216)
 #define SMFSUBTYPE_MQ_STAT_CHANNEL (231)
 #define SMFSUBTYPE_MQ_STAT_RESERVED_1 (240)
 
@@ -191,6 +192,9 @@ extern void printQEST  (qest *);
 #ifdef QIS1IDV
 extern void printQIS1  (qis1 *);
 #endif
+#ifdef QQSTIDV
+extern void printQQST  (qqst *);
+#endif
 extern void printQIST  (qist *);
 extern void printQJST  (qjst *);
 extern void printQLST  (qlst *);
diff --git a/src/mqsmfstrucU.h b/src/mqsmfstrucU.h
@@ -1,9 +1,9 @@
 /*
- * This file was generated from cqsdsmfc.h version 924
+ * This file was generated from cqsdsmfc.h version 930
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
- * (C) Copyright IBM Corp. 1993, 2021 All Rights Reserved.
+ * (C) Copyright IBM Corp. 1993, 2022 All Rights Reserved.
  * 
  */
 #pragma pack(1)
@@ -621,8 +621,7 @@ int32_t   qpstsos;
 uint32_t  qpstloc : 1;
 uint32_t  qpstf4kb : 1;
 uint32_t         : 30;
-uint32_t  QPST_MSGP020_PUTIME;
-int32_t   filler__001[6];
+int32_t   filler__001[7];
 } qpst;
 #define QPSTIDV  0xD30F
 #define QPSTEYEV "QPST"
@@ -634,6 +633,29 @@ extern "C" {
 #endif
 typedef
 struct {
+uint16_t  qqstid;
+uint16_t  qqstll;
+char     qqsteyec[4];
+char     qqstqnam[48];
+uint32_t   qqstflag;
+signed   short  int qqstpsid;
+signed   short  int qqstbpid;
+char     qqstqsgn[4];
+char     qqstcfst[12];
+int32_t   qqstdpth;
+} qqst;
+#define QQSTIDV  0xD80F
+#define QQSTEYEV "QQST"
+#define QQSTDISP 0x80000000
+#define QQSTPART 0x40000000
+#if defined(__cplusplus)
+}
+#endif
+#if defined(__cplusplus)
+extern "C" {
+#endif
+typedef
+struct {
 uint16_t  qsgmid;
 uint16_t  qsgmll;
 char     qsgmeyec[4];
@@ -1324,6 +1346,21 @@ extern "C" {
 #endif
 typedef
 struct {
+uint32_t  qws30pso;
+uint16_t  qws30psl;
+uint16_t  qws30psn;
+uint32_t  qws30r1o;
+uint16_t  qws30r1l;
+uint16_t  qws30r1n;
+} qws3;
+#if defined(__cplusplus)
+}
+#endif
+#if defined(__cplusplus)
+extern "C" {
+#endif
+typedef
+struct {
 uint32_t  qws50pso;
 uint16_t  qws50psl;
 uint16_t  qws50psn;
diff --git a/src/mqsmfstrucW.h b/src/mqsmfstrucW.h
@@ -1,9 +1,9 @@
 /*
- * This file was generated from cqsdsmfc.h version 924
+ * This file was generated from cqsdsmfc.h version 930
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
- * (C) Copyright IBM Corp. 1993, 2021 All Rights Reserved.
+ * (C) Copyright IBM Corp. 1993, 2022 All Rights Reserved.
  * 
  */
 #pragma pack(1)
@@ -621,8 +621,7 @@ int32_t   qpstsos;
 uint32_t  qpstloc : 1;
 uint32_t  qpstf4kb : 1;
 uint32_t         : 30;
-uint32_t  QPST_MSGP020_PUTIME;
-int32_t   filler__001[6];
+int32_t   filler__001[7];
 } qpst;
 #define QPSTIDV  0xD30F
 #define QPSTEYEV "QPST"
@@ -634,6 +633,29 @@ extern "C" {
 #endif
 typedef
 struct {
+uint16_t  qqstid;
+uint16_t  qqstll;
+char     qqsteyec[4];
+char     qqstqnam[48];
+uint32_t   qqstflag;
+signed   short  int qqstpsid;
+signed   short  int qqstbpid;
+char     qqstqsgn[4];
+char     qqstcfst[12];
+int32_t   qqstdpth;
+} qqst;
+#define QQSTIDV  0xD80F
+#define QQSTEYEV "QQST"
+#define QQSTDISP 0x80000000
+#define QQSTPART 0x40000000
+#if defined(__cplusplus)
+}
+#endif
+#if defined(__cplusplus)
+extern "C" {
+#endif
+typedef
+struct {
 uint16_t  qsgmid;
 uint16_t  qsgmll;
 char     qsgmeyec[4];
@@ -1325,6 +1347,21 @@ extern "C" {
 #endif
 typedef
 struct {
+uint32_t  qws30pso;
+uint16_t  qws30psl;
+uint16_t  qws30psn;
+uint32_t  qws30r1o;
+uint16_t  qws30r1l;
+uint16_t  qws30r1n;
+} qws3;
+#if defined(__cplusplus)
+}
+#endif
+#if defined(__cplusplus)
+extern "C" {
+#endif
+typedef
+struct {
 uint32_t  qws50pso;
 uint16_t  qws50psl;
 uint16_t  qws50psn;
diff --git a/src/sizes.master b/src/sizes.master
@@ -14,6 +14,7 @@ qlst : 32
 qmac : 48
 qmst : 104
 qpst : 104
+qqst : 84
 qsgm : 48
 qsph : 88
 qsrs : 232
@@ -36,3 +37,4 @@ qwa0 : 56
 wq   : 2788
 wq->maxqdpth: 588
 wq->z__001  : 594
+qqst->qqstdpth  : 80
diff --git a/src/t115/printQQST.c b/src/t115/printQQST.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016,2022 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mark Taylor - Initial Contribution
+ */
+
+
+#include <stdio.h>
+#include "mqsmf.h"
+
+SMFPRINTGLOB;
+
+/* Queue statistics */
+void printQQST(qqst *p)
+{
+  char *c;
+  unsigned int *u;
+  uint32_t flags;
+
+  SMFPRINTSTART("QQST", p, conv16(p->qqstll));
+
+  ADDSTRENS("Queue",    p->qqstqnam);
+
+  flags = conv32(p->qqstflag);
+  if ((flags & QQSTDISP) == QQSTDISP) { 
+    c = "SHARED";
+  } else {
+    c = "PRIVATE";
+  }
+  ADDSTR("Queue_Disp",  c,7); /* 7 = max length of SHARED/PRIVATE */
+
+  /* When the record is partial the depth will be shown as 0 but might be incorrect */
+  if ((flags & QQSTPART) == QQSTPART) { 
+    c = "PARTIAL";
+  } else {
+    c = "FULL";
+  }
+  ADDSTR("Record",  c,7); /* 7 = max length of PARTIAL/FULL */
+
+  ADDSTRENS("QSG_Name", p->qqstqsgn);
+  ADDSTRENS("Structure",p->qqstcfst);
+
+  ADDS16("Pageset"  ,   p->qqstpsid); /* Pageset/Bufferpool will be -1 for shared queues */
+  ADDS16("BufferPool",  p->qqstbpid); /*   and for unallocated private queues            */
+  ADDS32("Current_Depth",p->qqstdpth);
+
+  SMFPRINTSTOP;
+
+  return;
+}
