Fix issue #99

Add timezone offsets for mqmetric calculations

Author: ibmmqmet

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changelog
 Newest updates are at the top of this file.
 
-## April XX 2019
+## April 23 2019
+* Fixed memory leak in InqMP
+* mqmetric - Added ability to set a timezone offset
 * mqmetric - Added fields from SBSTATUS
 
 ## April 03 2019

buildInDocker.sh

@@ -30,7 +30,7 @@ cd $GOPATH/src
 for pkg in $ORG/$REPO/ibmmq $ORG/$REPO/mqmetric
 do
   lib=`basename $pkg`
-  echo "Building $lib"
+  echo "Building package: $lib"
   go install  $pkg
 done
 
@@ -41,6 +41,6 @@ srcdir=src/$ORG/$REPO/samples
 for samp in $srcdir/*.go
 do
   exe=`basename $samp .go`
-  echo "Building $exe"
+  echo "Building program: $exe"
   go build -o bin/$exe $samp
 done

ibmmq/mqi.go

@@ -1172,7 +1172,6 @@ func (handle *MQMessageHandle) DltMP(godmpo *MQDMPO, name string) error {
 /*
 InqMP is the function to inquire about the value of a message property.
 */
-
 func (handle *MQMessageHandle) InqMP(goimpo *MQIMPO, gopd *MQPD, name string) (string, interface{}, error) {
 	var mqrc C.MQLONG
 	var mqcc C.MQLONG
@@ -1198,11 +1197,18 @@ func (handle *MQMessageHandle) InqMP(goimpo *MQIMPO, gopd *MQPD, name string) (s
 		mqName.VSPtr = (C.MQPTR)(C.malloc(namebufsize))
 		mqName.VSBufSize = namebufsize
 	}
+	// VSPtr is either explicit malloc or comes from CString which does a
+	// malloc. Either way, the buffer should be freed at the end.
+	defer C.free(unsafe.Pointer(mqName.VSPtr))
 
 	copyIMPOtoC(&mqimpo, goimpo)
 	copyPDtoC(&mqpd, gopd)
 
+	// Use a local buffer instead of something global so we don't
+	// have to worry about multiple threads accessing it.
 	propertyPtr = C.PMQVOID(C.malloc(propbufsize))
+	defer C.free(unsafe.Pointer(propertyPtr))
+
 	bufferLength := C.MQLONG(namebufsize)
 
 	C.MQINQMP(handle.qMgr.hConn,
@@ -1217,10 +1223,6 @@ func (handle *MQMessageHandle) InqMP(goimpo *MQIMPO, gopd *MQPD, name string) (s
 		&mqcc,
 		&mqrc)
 
-	if len(name) > 0 {
-		C.free(unsafe.Pointer(mqName.VSPtr))
-	}
-
 	mqreturn := MQReturn{MQCC: int32(mqcc),
 		MQRC: int32(mqrc),
 		verb: "MQINQMP",
@@ -1238,7 +1240,7 @@ func (handle *MQMessageHandle) InqMP(goimpo *MQIMPO, gopd *MQPD, name string) (s
 		p := (*C.MQBYTE)(propertyPtr)
 		propertyValue = (int8)(*p)
 	case C.MQTYPE_INT16:
-		p := (*C.MQBYTE)(propertyPtr)
+		p := (*C.MQINT16)(propertyPtr)
 		propertyValue = (int16)(*p)
 	case C.MQTYPE_INT32:
 		p := (*C.MQINT32)(propertyPtr)

mqmetric/mqif.go

@@ -41,15 +41,18 @@ var (
 	commandLevel     int32
 	resolvedQMgrName string
 
+	tzOffsetSecs float64
+
 	qmgrConnected = false
 	queuesOpened  = false
 	subsOpened    = false
 )
 
 type ConnectionConfig struct {
-	ClientMode bool
-	UserId     string
-	Password   string
+	ClientMode   bool
+	UserId       string
+	Password     string
+	TZOffsetSecs float64
 }
 
 /*
@@ -64,6 +67,8 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 	gocno := ibmmq.NewMQCNO()
 	gocsp := ibmmq.NewMQCSP()
 
+	tzOffsetSecs = cc.TZOffsetSecs
+
 	// Explicitly force client mode if requested. Otherwise use the "default"
 	// connection mechanism depending on what is installed or configured.
 	if cc.ClientMode {

mqmetric/status.go

@@ -122,7 +122,7 @@ func statusTimeDiff(now time.Time, d string, t string) int64 {
 		}
 		parsedT, err = time.ParseInLocation(timeStampLayout, d+" "+t, now.Location())
 		if err == nil {
-			diff := now.Sub(parsedT).Seconds()
+			diff := now.Sub(parsedT).Seconds() + tzOffsetSecs
 
 			if diff < 0 { // Cannot have status from the future
 				// TODO: Perhaps issue a one-time warning as it might indicate timezone offsets
@@ -132,7 +132,7 @@ func statusTimeDiff(now time.Time, d string, t string) int64 {
 			rc = int64(diff)
 		}
 	}
-	//fmt.Printf("statusTimeDiff d:%s t:%s diff:%d err:%v\n",d,t,rc,err)
+	//fmt.Printf("statusTimeDiff d:%s t:%s diff:%d tzoffset: %f err:%v\n", d, t, rc, tzOffsetSecs, err)
 	return rc
 }
 

samples/amqsprop.go

@@ -86,6 +86,13 @@ func setProperties(putMsgHandle ibmmq.MQMessageHandle) error {
 		fmt.Printf("PROP2: %v\n", err)
 	}
 
+	name = "PROP2CINT16"
+	v2c := 4242
+	err = putMsgHandle.SetMP(smpo, name, pd, int16(v2c))
+	if err != nil {
+		fmt.Printf("PROP2: %v\n", err)
+	}
+
 	name = "PROP3BOOL"
 	v3 := true
 	err = putMsgHandle.SetMP(smpo, name, pd, v3)