Updates for MQ 9.4.0: zHyperlink

Fix for #1

Author: ibmmqmet

CHANGES.md

@@ -2,6 +2,12 @@
 History (newest at top)
 =======================
 
+Jun 2024 (v5.5)
+* Update for MQ 9.4.0
+* New stats available for zHyperlink
+* Remove trailing spaces for ApplType (#1)
+* Initial build option added for MacOS
+
 Feb 2024 (v5.4.5)
 * Update for MQ V9.3.5 
 * QCCT now has info about 64-bit CHIN storage use

bin/aix/convH

@@ -4,7 +4,7 @@ plat=`uname`
 
 if [ -z "$VERS" ]
 then
-  VERS="935"
+  VERS="940"
 fi
 
 if [ "$plat" = "AIX" ]
@@ -13,6 +13,13 @@ then
   cc="xlc"
   targdir="../bin/aix"
   optim="-O3"
+elif [ "$plat" = "Darwin" ]
+then
+  # Ought to work through the -W flags so they can be removed without compiler warnings
+  flags="-m64  -Wno-pragma-pack  $CCEXTRAFLAGS -D PLATFORM_MACOS"
+  cc="gcc"
+  targdir="../bin/macos"
+  optim="-O3"
 else
   flags="-m64 $CCEXTRAFLAGS -D PLATFORM_LINUX"
   cc="gcc"
@@ -31,14 +38,19 @@ else
   flags="$flags $optim"
 fi
 
-export PLATFLAGS=$flags CC=$cc VERS=$VERS
+PLATFLAGS=$flags 
+CC=$cc 
+VERS=$VERS
+export PLATFLAGS CC VERS
+
 make -e -f Makefile.unix $*
 rc=$?
 if [ $rc -ne 0 ]
 then
   exit $rc
 fi
 
+mkdir -p $targdir >/dev/null 2>&1 
 rm -f $targdir/convH $targdir/mqsmfcsv
 cp convH mqsmfcsv $targdir
 

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=935
+VERS=940
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -54,7 +54,7 @@ all: sizeTest shipTest
 
 sizeTest: mqsmfcsv.exe
 	./mqsmfcsv.exe -v > sizes.tmp
-	diff -b sizes.tmp sizes.master.$(VERS)
+	diff -b sizes.tmp sizes/sizes.master.$(VERS)
 
 shipTest: mqsmfcsv.exe
 	cd ../testing/shipTest;./shipTest.sh csv sql json

bin/linux/convH

@@ -54,7 +54,7 @@ tests: all
 
 sizeTest: mqsmfcsv
 	./mqsmfcsv -v > sizes.tmp
-	diff -b sizes.tmp sizes.master.$(VERS)
+	diff -b sizes.tmp sizes/sizes.master.$(VERS)
 
 shipTest: mqsmfcsv
 	cd ../testing/shipTest;./shipTest.sh csv sql json

bin/linux/mqsmfcsv

@@ -1,5 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
-VERS=935
+VERS=940
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
@@ -46,10 +46,10 @@ HDR = mqsmfstrucW.h \
 
 checkSize: mqsmfcsv.exe
 	mqsmfcsv.exe -v > sizes.tmp
-	diff -b sizes.tmp sizes.master.$(VERS)  
+	diff -b sizes.tmp sizes/sizes.master.$(VERS)  
 
 mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
-	rm -f $@
+	del /q $@
 	$(CC) $(SRC) -I. /Fe$@ $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
 	del /q *.obj
 	copy $@ ..\bin\win

bin/win/mqsmfcsv.exe

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016,2023 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
@@ -93,7 +93,8 @@ typedef struct __stat64 mystat_t;
 #else
 typedef off_t myoff_t;
 typedef struct stat mystat_t;
-#define LLX "%08X"
+/*#define LLX "%08X"*/
+#define LLX "%llx"
 #endif
 
 #ifndef PATH_MAX
@@ -599,10 +600,10 @@ int main( int argc, char *argv[] )
     /* Some items from the record need to be shown for all types         */
     /* of structure. Save them into a shared block available for all.    */
     /*********************************************************************/
-    memcpy(commonF.qMgr,convStr(pSMFMQRecord->Header.SMFRECSSID,4),4);
-    memcpy(commonF.systemId,convStr(pSMFMQRecord->Header.SMFRECSID,4),4);
+    memcpy(commonF.qMgr,convStr(((unsigned char*)pSMFMQRecord->Header.SMFRECSSID),4),4);
+    memcpy(commonF.systemId,convStr(((unsigned char*)pSMFMQRecord->Header.SMFRECSID),4),4);
     if (recordType == SMFTYPE_MQ_STAT || recordType == SMFTYPE_MQ_ACCT) {
-      memcpy(commonF.mqVer,convStr(pSMFMQRecord->Header.u.s.SMFRECREL,3),3);
+      memcpy(commonF.mqVer,convStr((unsigned char*)(pSMFMQRecord->Header.u.s.SMFRECREL),3),3);
     }
 
 
@@ -1738,7 +1739,7 @@ int getOffsets(int sectionCount,void *offsetBlockStart, int offsetBlockType, int
       pAMSData->rb41qm.l = conv32(pAMSData->rb41qm.l);
       /* KLUDGE: Grab the queue manager name from the Data section since it is not */
       /* written to the subsystem ID field of the standard header.                 */
-      memcpy(commonF.qMgr, convStr(((char *)pAMSData) + pAMSData->rb41qm.offset, 4), 4);
+      memcpy(commonF.qMgr, convStr(((unsigned char *)pAMSData) + pAMSData->rb41qm.offset, 4), 4);
       if (doublet[1].offset + pAMSData->rb41qm.offset + pAMSData->rb41qm.l > recLength)
         recLength = doublet[1].offset + pAMSData->rb41qm.offset + pAMSData->rb41qm.l;
 

src/M

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023 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
@@ -486,25 +486,25 @@ extern void checkStructureSizes(FILE *);
   ADDSTRN(h,v,strlen(v),maxlen)             /* ASCII string null terminated*/
 
 #define ADDSTRB(h,v,len) \
-  ADDSTR(h,convBin(v,len),len*2+1)                         /* Binary string*/
+  ADDSTR(h,convBin((unsigned char*)v,len),len*2+1)                         /* Binary string*/
 
 #define ADDSTRBN(h,v,len,maxlen) \
-    ADDSTR(h,convBin(v,len),maxlen)  /* Binary string with known max length*/
+    ADDSTR(h,convBin((unsigned char*)v,len),maxlen)  /* Binary string with known max length*/
 
 #define ADDSTREN(h,v,l) \
-  ADDSTRN(h,convStr(v,l),l,l)                /* EBCDIC string, known length*/
+  ADDSTRN(h,convStr((unsigned char*)v,l),l,l)                /* EBCDIC string, known length*/
 
 #define ADDSTRENS(h,v) \
   ADDSTREN(h,v,sizeof(v))     /* EBCDIC string, length grabbed from sizeof */
 
 
 #define ADDSTRENM(h,v,l,maxlen) \
-  ADDSTRN(h,convStr(v,l),l,maxlen)    /* EBCDIC string, known length, fix max*/
+  ADDSTRN(h,convStr((unsigned char*)v,l),l,maxlen)    /* EBCDIC string, known length, fix max*/
 
 #define ADDSTRENIDX(h,idx, v,l) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
   ADDHEADIDX(tmpHead,DDL_C,l);\
-  smfAddString(l,convStr(v,l))               /* EBCDIC string, known length*/
+  smfAddString(l,convStr((unsigned char*)v,l))               /* EBCDIC string, known length*/
 
 #define ADDINDEX(n) \
   if (first) { \

src/Makefile.gcc.win

@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 935
+ * This file was generated from cqsdsmfc.h version 940
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
@@ -511,6 +511,28 @@ int32_t   qjstcp2n;
 int32_t   qjsthwc;
 int32_t   qjsthwe;
 int32_t   qjstencr;
+uint32_t  filler__003;
+uint32_t qjsthlsciw;
+uint32_t qjsthlmciw;
+uint32_t qjsthlcicntw;
+uint32_t qjsthlscis;
+uint32_t qjsthlmcis;
+uint32_t qjsthlcicnts;
+uint32_t qjsthlscif;
+uint32_t qjsthlmcif;
+uint32_t qjsthlcicntf;
+uint32_t qjsthlscicon;
+uint32_t qjsthlmcicon;
+uint32_t qjsthlconcicnt;
+uint64_t  qjsthlsciwtmax;
+uint64_t  qjsthlsciwtmin;
+uint64_t  qjsthlsciwttot;
+uint64_t  qjsthlmciwtmax;
+uint64_t  qjsthlmciwtmin;
+uint64_t  qjsthlmciwttot;
+uint64_t  qjsthliosqu[2];
+uint32_t qjsthlc;
+uint32_t qjsthle;
 } qjst;
 #define QJSTIDV  0x0093
 #define QJSTEYEV "QJST"

src/Makefile.unix

@@ -1,5 +1,5 @@
 /*
- * This file was generated from cqsdsmfc.h version 935
+ * This file was generated from cqsdsmfc.h version 940
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
@@ -511,6 +511,28 @@ int32_t   qjstcp2n;
 int32_t   qjsthwc;
 int32_t   qjsthwe;
 int32_t   qjstencr;
+uint32_t  filler__003;
+uint32_t qjsthlsciw;
+uint32_t qjsthlmciw;
+uint32_t qjsthlcicntw;
+uint32_t qjsthlscis;
+uint32_t qjsthlmcis;
+uint32_t qjsthlcicnts;
+uint32_t qjsthlscif;
+uint32_t qjsthlmcif;
+uint32_t qjsthlcicntf;
+uint32_t qjsthlscicon;
+uint32_t qjsthlmcicon;
+uint32_t qjsthlconcicnt;
+uint64_t  qjsthlsciwtmax;
+uint64_t  qjsthlsciwtmin;
+uint64_t  qjsthlsciwttot;
+uint64_t  qjsthlmciwtmax;
+uint64_t  qjsthlmciwtmin;
+uint64_t  qjsthlmciwttot;
+uint64_t  qjsthliosqu[2];
+uint32_t qjsthlc;
+uint32_t qjsthle;
 } qjst;
 #define QJSTIDV  0x0093
 #define QJSTEYEV "QJST"

src/Makefile.win

@@ -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 : 720
+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

src/mqsmf.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
@@ -288,12 +288,12 @@ char *strConnType(int v)
   switch (v)
   {
   case 1: c = "CICS"    ;break;
-  case 2: c = "TSO "    ;break;
+  case 2: c = "TSO"     ;break;
   case 3: c = "IMS Ctl ";break;
   case 4: c = "IMS MPP/BMP";break;
   case 5: c = "Cmd Svr" ;break;
   case 6: c = "CHIN"    ;break;
-  case 7: c = "RRS "    ;break;
+  case 7: c = "RRS"     ;break;
   }
   return c;
 }

src/mqsmf.h

@@ -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
@@ -34,7 +34,7 @@ void printQEST(qest *p)
     /* dump the data once when debug is enabled; but then reset   */
     /* the value to its original setting on exit from function.   */
     /**************************************************************/
-    if (convStr(p->qeststuc[i].qeststr,12)[0] != '.')
+    if (convStr(((unsigned char*)p->qeststuc[i].qeststr),12)[0] != '.')
     {
       SMFPRINTSTART("QEST",p,conv16(p->qestll));
       debugLevel = 0;

src/mqsmfstrucU.h

@@ -40,7 +40,7 @@ void printQIS1(qis1 *p)
   ADDBYTE("Pageset_Status"     ,p->qis1stat);
   ADDU32 ("Total_Pages"        ,p->qis1topg);
   ADDU32 ("Unused_Pages"       ,p->qis1unpg);
-  ADDU32 ("Persistent_Pages "  ,p->qis1ppg);
+  ADDU32 ("Persistent_Pages"   ,p->qis1ppg);
   ADDU32 ("Nonpersistent_Pages",p->qis1nppg);
   ADDU32 ("Full_Count"         ,p->qis1full);
   ADDU32 ("Put_Cursor_High"    ,p->qis1pchi);

src/mqsmfstrucW.h

@@ -32,8 +32,12 @@ void printQIST(qist *p)
   ADDU32 ("Lock_Marked_Msg"     ,p->qistlomm);
   ADDU32 ("Delete_Marked_Msg"   ,p->qistdlmm);
   ADDU32 ("Enumerates"          ,p->qistenum);
-  /* ADDU32 ("ReadAhead_IO"        ,p->qistraio);*/  /* The ReadAhead fields are never filled in, */
-  /* ADDU32 ("ReadAhead_BufferPool",p->qistrabp);*/  /* so not going to print them here           */
+#if 0 
+/* The ReadAhead fields are never filled in, */
+/* so not going to print them here           */
+   ADDU32 ("ReadAhead_IO"        ,p->qistraio);  
+   ADDU32 ("ReadAhead_BufferPool",p->qistrabp);  
+#endif
   ADDU32 ("Gets_From_Disk"      ,p->qistgetd);
   ADDU32 ("Gets_From_BufferPool",p->qistgetb);