Update to reference MQ 9.2.3; fix QESD interpretation

Author: ibmmqmet

CHANGES.md

@@ -1,6 +1,12 @@
 
 History (newest at top)
 =======================
+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

@@ -26,7 +26,7 @@ else
   flags="$flags $optim"
 fi
 
-export PLATFLAGS=$flags CC=$cc VERS=922
+export PLATFLAGS=$flags CC=$cc VERS=923
 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=922
+VERS=923
 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=922
+VERS=923
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/linux/mqsmfcsv

@@ -159,6 +159,8 @@ static unsigned int startingRecords = 0;
 static myoff_t pos;
 static int offsetCorrection = 0;
 
+static BOOL warn115_240=FALSE;
+
 static time_t startTime = 0;
 static char *formatRate;
 
@@ -910,6 +912,18 @@ int main( int argc, char *argv[] )
         }
         break;
 
+      case 240: 
+        /* 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.                        */
+        if (!warn115_240) 
+        {
+          sprintf(tmpHead,"Internal SMF %d subtype %d records found",SMFTYPE_MQ_STAT,recordSubType);
+          fprintf(infoStream,"%s\n",tmpHead);
+          warn115_240=TRUE;
+        }
+        break; 
+
       default:
         knownSubType = FALSE;
         sprintf(tmpHead,"Unknown SMF %d subtype %d",SMFTYPE_MQ_STAT,recordSubType);

bin/win/mqsmfcsv.exe

@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 922
+ * This file was generated from cqsdsmfc.h version 923
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 

src/M

@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 922
+ * This file was generated from cqsdsmfc.h version 923
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 

src/Makefile.gcc.win

@@ -47,6 +47,7 @@ void printQESD(qesd *p)
       ADDU32  ("Pages_Reallocated", p -> qesdsmrp);
       ADDU32  ("Pages_Cleaned_Up" , p -> qesdsmcp);
       ADDU32  ("Failed_Allocates" , p -> qesdsmfl);
+
       ADDU32  ("Max_Msg_Count"    , p -> qesdsmmm);
       ADDU32  ("Max_Used_Blocks"  , p -> qesdsmmu);
       ADDU32  ("Min_Free_Blocks"  , p -> qesdsmmf);
@@ -58,6 +59,7 @@ void printQESD(qesd *p)
       ADDU32  ("Free_Empty_Buffers", p -> qesdbffe);
       ADDU32  ("Pool_Waiters"     , p -> qesdbfpw);
       ADDU32  ("Buffer_Waiters"   , p -> qesdbfbw);
+
       ADDU32  ("Buffer_Get_Count", p -> qesdbfgb);
       ADDU32  ("Buffer_Get_Valid", p -> qesdbfgv);
       ADDU32  ("Buffer_Get_Empty", p -> qesdbfgm);
@@ -73,9 +75,11 @@ void printQESD(qesd *p)
       ADDU32  ("Waited_For_Pool"  , p -> qesdbfwp);
       ADDU32  ("Waited_For_Buffer", p -> qesdbfwb);
       ADDSTCK ("Pool_Wait_Time"   , p -> qesdbfpt);
-      ADDU32  ("Buffer_Wait_Time" , p -> qesdbfmu);
-      ADDU32  ("Buffer_Max_Used"  , p -> qesdbfmf);
-      ADDU32  ("Buffer_Min_Free"  , p -> qesdbfmp);
+      ADDU32  ("Buffer_Wait_Time" , p -> qesdbfbt);
+
+      ADDU32  ("Buffer_Max_Used"  , p -> qesdbfmu);
+      ADDU32  ("Buffer_Min_Free"  , p -> qesdbfmf);
+      ADDU32  ("Pool_Max_Waiters" , p -> qesdbfmp);
       ADDU32  ("Buffer_Max_Waiters", p -> qesdbfmb);
 
       ADDU32  ("High_Allocated_Ctl_Interval", p -> qesdioha);