From 97428da8d339d3d0c4d00aa328d76a32c7858412 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期五, 17 九月 2021 19:44:24 +0800
Subject: [PATCH] Fix the memory leakage.
---
api/bhsgo/bhome_node.go | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go
index 7e558ec..bbd195a 100644
--- a/api/bhsgo/bhome_node.go
+++ b/api/bhsgo/bhome_node.go
@@ -4,7 +4,7 @@
#include "../../src/bh_api.h"
*/
-// #cgo LDFLAGS: -L/usr/local/lib -lbhome_shmq -lstdc++ -lpthread -lrt
+// #cgo LDFLAGS: -L/usr/local/lib -lshm_queue -lstdc++ -lpthread -lrt
import "C"
import (
@@ -25,9 +25,10 @@
data, _ := proc.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHRegister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -37,9 +38,10 @@
data, _ := topics.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHRegisterTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -49,9 +51,10 @@
data, _ := topics.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHSubscribeTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -61,9 +64,10 @@
data, _ := topics.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHSubscribeNetTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -73,9 +77,10 @@
data, _ := proc.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHHeartbeat(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -89,9 +94,10 @@
data, _ := proc.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHUnregister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -102,9 +108,10 @@
data, _ := topic.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHQueryTopicAddress(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -116,9 +123,10 @@
data, _ := topic.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHQueryProcs(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -133,14 +141,19 @@
func ReadSub(proc_id *string, pub *bh.MsgPublish, timeout_ms int) bool {
cpid := unsafe.Pointer(nil)
cpid_len := C.int(0)
- defer C.BHFree(cpid, cpid_len)
+
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHReadSub(&cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0
- *proc_id = string(C.GoBytes(cpid, cpid_len))
- pub.Unmarshal(C.GoBytes(creply, creply_len))
+ if r {
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
+ *proc_id = string(C.GoBytes(cpid, cpid_len))
+ pub.Unmarshal(C.GoBytes(creply, creply_len))
+ }
+
return r
}
@@ -149,9 +162,10 @@
data, _ := req.Marshal()
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHAsyncRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len) > 0
if r {
+ defer C.BHFree(creply, creply_len)
*msg_id = C.GoBytes(creply, creply_len)
}
return r
@@ -162,12 +176,14 @@
data, _ := req.Marshal()
cpid := unsafe.Pointer(nil)
cpid_len := C.int(0)
- defer C.BHFree(cpid, cpid_len)
+
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
*proc_id = string(C.GoBytes(cpid, cpid_len))
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -177,12 +193,14 @@
func ReadRequest(proc_id *string, req *bh.MsgRequestTopic, psrc *unsafe.Pointer, timeout_ms int) bool {
cpid := unsafe.Pointer(nil)
cpid_len := C.int(0)
- defer C.BHFree(cpid, cpid_len)
+
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHReadRequest(&cpid, &cpid_len, &creply, &creply_len, psrc, C.int(timeout_ms)) > 0
if r {
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
*proc_id = string(C.GoBytes(cpid, cpid_len))
req.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -197,8 +215,9 @@
func GetLastError() (int, string) {
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
- defer C.BHFree(creply, creply_len)
+
r := C.BHGetLastError(&creply, &creply_len)
+ defer C.BHFree(creply, creply_len)
return int(r), string(C.GoBytes(creply, creply_len))
}
--
Gitblit v1.8.0