From 4d3d7ff8857866f347eb71875e6598226c6aeb88 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 30 九月 2021 11:35:50 +0800
Subject: [PATCH] do BHFree defer and call BHFree after call sendReply
---
api/bhsgo/bhome_node.go | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go
index bbd195a..4ecb201 100644
--- a/api/bhsgo/bhome_node.go
+++ b/api/bhsgo/bhome_node.go
@@ -27,8 +27,8 @@
creply_len := C.int(0)
r := C.BHRegister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -40,8 +40,8 @@
creply_len := C.int(0)
r := C.BHRegisterTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -53,8 +53,8 @@
creply_len := C.int(0)
r := C.BHSubscribeTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -66,8 +66,8 @@
creply_len := C.int(0)
r := C.BHSubscribeNetTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -79,8 +79,8 @@
creply_len := C.int(0)
r := C.BHHeartbeat(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -96,8 +96,8 @@
creply_len := C.int(0)
r := C.BHUnregister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -110,8 +110,8 @@
creply_len := C.int(0)
r := C.BHQueryTopicAddress(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -125,8 +125,8 @@
creply_len := C.int(0)
r := C.BHQueryProcs(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
return r
@@ -147,9 +147,9 @@
r := C.BHReadSub(&cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(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))
}
@@ -164,8 +164,8 @@
creply_len := C.int(0)
r := C.BHAsyncRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len) > 0
+ defer C.BHFree(creply, creply_len)
if r {
- defer C.BHFree(creply, creply_len)
*msg_id = C.GoBytes(creply, creply_len)
}
return r
@@ -181,9 +181,9 @@
creply_len := C.int(0)
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
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(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))
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -198,9 +198,9 @@
creply_len := C.int(0)
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)
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
+ if r {
*proc_id = string(C.GoBytes(cpid, cpid_len))
req.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -209,6 +209,7 @@
func SendReply(src unsafe.Pointer, rep *bh.MsgRequestTopicReply) bool {
data, _ := rep.Marshal()
+ defer C.BHFree(src)
return C.BHSendReply(src, getPtr(&data), C.int(len(data))) > 0
}
--
Gitblit v1.8.0