Update for MQ 924

Author: ibmmqmet

CHANGES.md

@@ -1,12 +1,16 @@
 
 History (newest at top)
 =======================
+
+Nov 2021 (v5.3.3)
+* Update for MQ V9.2.4 (no functional change)
+* Visual Studio 2022 setup script
+
 Jul 2021 (v5.3.2)
 * Recognise and ignore 115 subtype 240 (an internal undocumented stucture)
 * Fix an error in QESD interpretation
 * Update for MQ V9.2.3 (no real change)
 
-
 Mar  2021 (v5.3.1)
 * Update for MQ V9.2.2 (no real change)
 

bin/aix/convH

@@ -2,6 +2,11 @@
 
 plat=`uname`
 
+if [ -z "$VERS" ]
+then
+  VERS="924"
+fi
+
 if [ "$plat" = "AIX" ]
 then
   flags="-q64 -qmaxmem=-1 $CCEXTRAFLAGS -D PLATFORM_AIX"
@@ -26,7 +31,7 @@ else
   flags="$flags $optim"
 fi
 
-export PLATFLAGS=$flags CC=$cc VERS=923
+export PLATFLAGS=$flags CC=$cc VERS=$VERS
 make -e -f Makefile.unix $*
 
 rm -f $targdir/convH $targdir/mqsmfcsv

bin/aix/mqsmfcsv

@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
 # CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS 
 CFLAGS= -I. -m32  -DPLATFORM_WINDOWS 
 PLATFLAGS=
-VERS=923
+VERS=924
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/linux/convH

@@ -1,5 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
-VERS=923
+VERS=924
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/linux/mqsmfcsv

@@ -1,3 +1,3 @@
-rem This sets the environment for Visual Studio 2017
+rem This sets the environment for Visual Studio 2019
 rem Make sure we set up for a 32-bit program
 "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build"\vcvarsall x86

bin/win/mqsmfcsv.exe

@@ -0,0 +1,3 @@
+rem This sets the environment for Visual Studio 2022
+rem Make sure we set up for a 32-bit program
+"C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build"\vcvarsall x86

src/M

@@ -404,7 +404,9 @@ int main( int argc, char *argv[] )
     basename = inputFile;
   else
     basename = b+1;
-  fprintf(infoStream,"Input file: %s. Format: %s.\n",basename, useRDW?"RDW":"Without RDW");
+  fprintf(infoStream,"Input file: %s. Requested format: %s.\n",basename, useRDW?"RDW":"Without RDW");
+  fprintf(infoStream,"  If there are lots of parsing errors or unknown record types,\n");
+  fprintf(infoStream,"  or even a SEGV, then try using alternate RDW format option.\n\n");
 
   /********************************************************************/
   /* Open the checkpoint file for reading if we have been asked to do */
@@ -676,7 +678,7 @@ int main( int argc, char *argv[] )
         convDate(pqwhs->qwhsstck,dt);
         strcpy(commonF.stckFormatDate,dt[0]);
         strcpy(commonF.stckFormatDate,dt[1]);
-        if (recordType == 115)
+        if (recordType == SMFTYPE_MQ_STAT) 
         {
           if (conv16(pqwhs->qwhslen) >= 52)
           {
@@ -740,7 +742,7 @@ int main( int argc, char *argv[] )
        fprintf(infoStream,"Section count %d for %4.4s, qwhslen=%d\n",sectionCount,commonF.qMgr,conv16(pqwhs->qwhslen));
 
     /*********************************************************************/
-    /* One we know how many sections there are, copy the triplet values  */
+    /* Once we know how many sections there are, copy the triplet values */
     /* into a local array, doing the endianness conversion on the way.   */
     /* That makes it look a  bit easier rather than than having convxxx  */
     /* function calls everywhere else.                                   */
@@ -783,7 +785,7 @@ int main( int argc, char *argv[] )
     case SMFTYPE_MQ_STAT:
       switch(recordSubType)
       {
-      case 1:
+      case SMFSUBTYPE_MQ_STAT_BASIC: 
         /*****************************************************************/
         /* Some of the triplets seem to refer to internal/undocumented   */
         /* structures. Only the QSST and QJST are known elements.        */
@@ -806,7 +808,7 @@ int main( int argc, char *argv[] )
         }
         break;
 
-      case 2:
+      case SMFSUBTYPE_MQ_STAT_API:
         /*****************************************************************/
         /* All of the triplets may be used, so we can just iterate       */
         /* through them and pick the right formatter for each.           */
@@ -837,23 +839,23 @@ int main( int argc, char *argv[] )
         }
         break;
 
-      case 5:
+      case SMFSUBTYPE_MQ_STAT_POOL:
         for (i = 0; i < triplet[1].n; i++)
         {
           p = &dataBuf[triplet[1].offset + triplet[1].l * i];
           printQSPH((qsph *)p);
         }
         break;
 
-      case 6:
+      case SMFSUBTYPE_MQ_STAT_GETMAIN:
         for (i = 0; i < triplet[1].n; i++)
         {
           p = &dataBuf[triplet[1].offset + triplet[1].l * i];
           printQSGM((qsgm *)p);
         }
         break;
 
-      case 7:
+      case SMFSUBTYPE_MQ_STAT_REGION:
         for (i = 0; i < triplet[1].n; i++)
         {
           p = &dataBuf[triplet[1].offset + triplet[1].l * i];
@@ -864,7 +866,7 @@ int main( int argc, char *argv[] )
 #ifdef QIS1IDV
      /* Pageset statistics introduced in MQ V9 - only compile this block if using */
      /* the V9 header file.                                                       */
-     case 201:
+      case SMFSUBTYPE_MQ_STAT_PAGESET:
         for(i = 0; i < triplet[1].n; i++)
         {
           p = &dataBuf[triplet[1].offset + triplet[1].l * i];
@@ -873,15 +875,15 @@ int main( int argc, char *argv[] )
         break;
 #endif
 
-      case 215:
+      case SMFSUBTYPE_MQ_STAT_BUFFER:
         for(i = 0; i < triplet[1].n; i++)
         {
           p = &dataBuf[triplet[1].offset + triplet[1].l * i];
           printQPST((qpst *)p);
         }
         break;
 
-      case 231:
+      case SMFSUBTYPE_MQ_STAT_CHANNEL:
         /*****************************************************************/
         /* All of the triplets may be used, so we can just iterate       */
         /* through them and pick the right formatter for each.           */
@@ -912,7 +914,7 @@ int main( int argc, char *argv[] )
         }
         break;
 
-      case 240: 
+      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    */ 
         /* stats of records processed, but no other debug.                        */
@@ -1513,6 +1515,28 @@ static char *getFormatPercent(myoff_t totalFileSize,myoff_t pos)
   return formatPercentString;
 }
 
+
+/*****************************************************************/
+/* FUNCTION: laterThan                                           */
+/* PURPOSE:                                                      */
+/*   Is the qmgr version in the current record greater than      */
+/*   a particular level                                          */
+/* RETURN: 1 if later version; 0 otherwise                       */
+/*****************************************************************/
+int laterThan(int v)
+{
+  int rc = 0;
+  char mqVer[5] = {0};
+  static int currentVersion = -1;
+  if (currentVersion == -1) {
+    strncpy(mqVer,commonF.mqVer,4);
+    currentVersion = atoi(mqVer);
+  }
+  if (currentVersion > v) 
+    return 1;
+  return rc;
+}
+
 /*****************************************************************/
 /* FUNCTION: inconsistentVersions                                */
 /* PURPOSE:                                                      */

src/Makefile.gcc.win

@@ -65,6 +65,19 @@ typedef      unsigned int BOOL;
 #define SMFTYPE_ZCEE    (123)     /* z/OS Connect EE                */
 #define SMFTYPE_MQ_AMS  (180)     /* The default but can be changed */
 
+/********************************************************************/
+/* Various subtypes                                                 */
+/********************************************************************/
+#define SMFSUBTYPE_MQ_STAT_BASIC   (1)
+#define SMFSUBTYPE_MQ_STAT_API     (2)
+#define SMFSUBTYPE_MQ_STAT_POOL    (5)
+#define SMFSUBTYPE_MQ_STAT_GETMAIN (6)
+#define SMFSUBTYPE_MQ_STAT_REGION  (7)
+#define SMFSUBTYPE_MQ_STAT_PAGESET (201)
+#define SMFSUBTYPE_MQ_STAT_BUFFER  (215)
+#define SMFSUBTYPE_MQ_STAT_CHANNEL (231)
+#define SMFSUBTYPE_MQ_STAT_RESERVED_1 (240)
+
 /********************************************************************/
 /* Layout of the SMF records. Standard header for all types of SMF. */
 /* The SMFRECREL is not necessarily standard usage so we overlay it */
@@ -231,6 +244,7 @@ extern char  *convStr(unsigned char *,int);/* Convert EBCDIC string to ASCII*/
 extern char  *convSecUSec(unsigned long long s);/* Convert stck durations to string containing sec,usec*/
 extern void   convDate(unsigned long long s,char *dt[2]);  /* Convert stck to date/time*/
 extern int    looksLikeNum(int l, char *c);
+extern int    laterThan(int version); /* Is current record from qmgr version later than requested */
 
 extern char  *stckConv(unsigned long long stck, char * output);
 extern void   calcYMD(int y,int dY,int *m,int *dM);

src/Makefile.win

@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 923
+ * This file was generated from cqsdsmfc.h version 924
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
@@ -621,7 +621,8 @@ int32_t   qpstsos;
 uint32_t  qpstloc : 1;
 uint32_t  qpstf4kb : 1;
 uint32_t         : 30;
-int32_t   filler__001[7];
+uint32_t  QPST_MSGP020_PUTIME;
+int32_t   filler__001[6];
 } qpst;
 #define QPSTIDV  0xD30F
 #define QPSTEYEV "QPST"

src/m2019.bat

@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 923
+ * This file was generated from cqsdsmfc.h version 924
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
@@ -621,7 +621,8 @@ int32_t   qpstsos;
 uint32_t  qpstloc : 1;
 uint32_t  qpstf4kb : 1;
 uint32_t         : 30;
-int32_t   filler__001[7];
+uint32_t  QPST_MSGP020_PUTIME;
+int32_t   filler__001[6];
 } qpst;
 #define QPSTIDV  0xD30F
 #define QPSTEYEV "QPST"