Deal with undocumented difference in qwhsdurn field for subtype 231

Author: ibmmqmet

README.md

@@ -51,10 +51,12 @@ July 2016
 
 August 2016
 * Add correlator field to better link WQ/WTID/WTAS
-* Add user-written content in docs directory. How to use SQL.       
+* Add user-written content in docs directory. How to use SQL.
 
 October 2016
 * Support reading from large (>2GB) files
+* SMF 115 subtype 231 (CHIN) records do not use same scale for qwhsdurn
+(though this seems to be undocumented)
 
 
 Pull requests

bin/aix/mqsmfcsv

@@ -108,6 +108,7 @@ char headings[HEADINGS_LEN];    /* Ensure these are big enough for any line*/
 char dataline[DATA_LEN];
 char tmpHead[64];                     /* Working space for a column heading*/
 unsigned int   recordType;
+unsigned short   recordSubType;
 
 /********************************************************************/
 /* Variables scoped to this module                                  */
@@ -153,7 +154,6 @@ int main( int argc, char *argv[] )
   unsigned int maxRecords = 0xFFFFFFFF;
   unsigned int unknownCount = 0;
   unsigned int ignoredCount = 0;
-  unsigned short recordSubType;
   unsigned short nextLength;
   int subTypesValid = 0;
   int qTriplet;

bin/linux/mqsmfcsv

@@ -362,9 +362,14 @@ extern char *strCfStatType  (int v);
   ADDSTRN("QMgr",commonF.qMgr,4,4); \
   ADDSTRN("MQ_Version",commonF.mqVer,3,3) \
   if (recordType == 115 && commonF.intstart != 0) { \
+    unsigned long long du = conv64(commonF.intduration)/1000000L; \
     ADDTIME("Interval_Start",commonF.intstart) \
     ADDHEAD("Interval_Duration",DDL_I,0); \
-    ADDDATA("%llu,",conv64(commonF.intduration)/1000000L) \
+    if (recordSubType == 231) { \
+    ADDDATA("%llu,",du/4096L); \
+    } else { \
+    ADDDATA("%llu,",du); \
+    } \
   }
 
 #define SMFPRINTSTART(n,p,l) \
@@ -424,6 +429,7 @@ extern BOOL  addEquals;
 extern BOOL  printHeaders;
 extern BOOL  sqlMode;
 extern unsigned int   recordType;
+extern unsigned short recordSubType;
 extern commonFields_t commonF;
 
 #endif