From 5026f256928cc3d3d6768faa63249bd343a4dd74 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 07 九月 2021 16:14:25 +0800
Subject: [PATCH] 调整defer C.BHFree的执行顺序
---
api/bhsgo/bhome_node.go | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go
index 7e558ec..16a5349 100644
--- a/api/bhsgo/bhome_node.go
+++ b/api/bhsgo/bhome_node.go
@@ -25,8 +25,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -37,8 +38,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -49,8 +51,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -61,8 +64,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -73,8 +77,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -89,8 +94,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -102,8 +108,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -116,8 +123,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
reply.Unmarshal(C.GoBytes(creply, creply_len))
}
@@ -133,12 +141,14 @@
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
+ 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,8 +159,9 @@
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
+ defer C.BHFree(creply, creply_len)
if r {
*msg_id = C.GoBytes(creply, creply_len)
}
@@ -162,11 +173,13 @@
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
+ defer C.BHFree(cpid, cpid_len)
+ defer C.BHFree(creply, creply_len)
if r {
*proc_id = string(C.GoBytes(cpid, cpid_len))
reply.Unmarshal(C.GoBytes(creply, creply_len))
@@ -177,11 +190,13 @@
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
+ 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))
@@ -197,8 +212,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