From 2561a007b8d8999a4750046d0cfb3b1ad5af50ac Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 09 四月 2024 15:29:32 +0800
Subject: [PATCH] test for perf
---
api/bhsgo/bhome_node.go | 121 ++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 55 deletions(-)
diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go
index 4a729a4..11a3005 100644
--- a/api/bhsgo/bhome_node.go
+++ b/api/bhsgo/bhome_node.go
@@ -8,7 +8,6 @@
import "C"
import (
- "fmt"
"unsafe"
bh "basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
@@ -18,9 +17,7 @@
if *p == nil || s == 0 {
return nil
}
- fmt.Println("unsafeGetBytes creply", *p, "len", s)
- d := (*[0x7fffffff]byte)(*p)[:s:s]
- return d
+ return (*[0x7fffffff]byte)(*p)[:s:s]
}
func ByteSlice2String(bs []byte) string {
@@ -43,8 +40,8 @@
func Register(proc *bh.ProcInfo, reply *bh.MsgCommonReply, timeout_ms int) bool {
data, _ := proc.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
r := C.BHRegister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
defer C.BHFree(creply, creply_len)
@@ -57,8 +54,8 @@
func RegisterTopics(topics *bh.MsgTopicList, reply *bh.MsgCommonReply, timeout_ms int) bool {
data, _ := topics.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
r := C.BHRegisterTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
defer C.BHFree(creply, creply_len)
@@ -71,16 +68,14 @@
func Subscribe(topics *bh.MsgTopicList, reply *bh.MsgCommonReply, timeout_ms int) bool {
data, _ := topics.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
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))
- fmt.Println("creply", creply, "len", creply_len)
d := unsafeGetBytes(&creply, int(creply_len))
- fmt.Println("data len", len(d))
reply.Unmarshal(d)
}
return r
@@ -88,8 +83,8 @@
func SubscribeNet(topics *bh.MsgTopicList, reply *bh.MsgCommonReply, timeout_ms int) bool {
data, _ := topics.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
r := C.BHSubscribeNetTopics(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
defer C.BHFree(creply, creply_len)
@@ -102,8 +97,8 @@
func Heartbeat(proc *bh.ProcInfo, reply *bh.MsgCommonReply, timeout_ms int) bool {
data, _ := proc.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
r := C.BHHeartbeat(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
defer C.BHFree(creply, creply_len)
@@ -120,8 +115,8 @@
func Unregister(proc *bh.ProcInfo, reply *bh.MsgCommonReply, timeout_ms int) bool {
data, _ := proc.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
r := C.BHUnregister(getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0
defer C.BHFree(creply, creply_len)
@@ -135,15 +130,15 @@
func QueryTopicAddress(dest_addr *bh.BHAddress, topic *bh.MsgQueryTopic, reply *bh.MsgQueryTopicReply, timeout_ms int) bool {
dest, _ := dest_addr.Marshal()
data, _ := topic.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
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))
reply.Unmarshal(unsafeGetBytes(&creply, int(creply_len)))
}
+ C.BHFree(creply, creply_len)
return r
}
@@ -151,15 +146,15 @@
func QueryProcs(dest_addr *bh.BHAddress, topic *bh.MsgQueryProc, reply *bh.MsgQueryProcReply, timeout_ms int) bool {
dest, _ := dest_addr.Marshal()
data, _ := topic.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
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))
reply.Unmarshal(unsafeGetBytes(&creply, int(creply_len)))
}
+ C.BHFree(creply, creply_len)
return r
}
@@ -170,19 +165,16 @@
}
func ReadSub(proc_id *string, pub *bh.MsgPublish, timeout_ms int) bool {
- cpid := unsafe.Pointer(nil)
- cpid_len := C.int(0)
-
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var cpid, creply unsafe.Pointer
+ var cpid_len, creply_len C.int
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 {
- *proc_id = ByteSlice2String(unsafeGetBytes(&cpid, int(cpid_len)))
+ *proc_id = string(unsafeGetBytes(&cpid, int(cpid_len)))
pub.Unmarshal(unsafeGetBytes(&creply, int(creply_len)))
}
+ C.BHFree(cpid, cpid_len)
+ C.BHFree(creply, creply_len)
return r
}
@@ -190,8 +182,8 @@
func AsyncRequest(dest_addr *bh.BHAddress, req *bh.MsgRequestTopic, msg_id *[]byte) bool {
dest, _ := dest_addr.Marshal()
data, _ := req.Marshal()
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
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)
@@ -204,60 +196,79 @@
func Request(dest_addr *bh.BHAddress, req *bh.MsgRequestTopic, proc_id *string, reply *bh.MsgRequestTopicReply, timeout_ms int) bool {
dest, _ := dest_addr.Marshal()
data, _ := req.Marshal()
- cpid := unsafe.Pointer(nil)
- cpid_len := C.int(0)
-
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var cpid, creply unsafe.Pointer
+ var cpid_len, creply_len C.int
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))
- *proc_id = ByteSlice2String(unsafeGetBytes(&cpid, int(cpid_len)))
+ *proc_id = string(unsafeGetBytes(&cpid, int(cpid_len)))
reply.Unmarshal(unsafeGetBytes(&creply, int(creply_len)))
}
+ C.BHFree(cpid, cpid_len)
+ C.BHFree(creply, creply_len)
return r
}
func ReadRequest(proc_id *string, req *bh.MsgRequestTopic, psrc *unsafe.Pointer, timeout_ms int) bool {
- cpid := unsafe.Pointer(nil)
- cpid_len := C.int(0)
-
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var cpid, creply unsafe.Pointer
+ var cpid_len, creply_len C.int
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))
- *proc_id = ByteSlice2String(unsafeGetBytes(&cpid, int(cpid_len)))
+ *proc_id = string(unsafeGetBytes(&cpid, int(cpid_len)))
req.Unmarshal(unsafeGetBytes(&creply, int(creply_len)))
}
+ C.BHFree(cpid, cpid_len)
+ C.BHFree(creply, creply_len)
return r
}
func SendReply(src unsafe.Pointer, rep *bh.MsgRequestTopicReply) bool {
data, _ := rep.Marshal()
- defer C.BHFree(src, 0)
- return C.BHSendReply(src, getPtr(&data), C.int(len(data))) > 0
+ ret := C.BHSendReply(src, getPtr(&data), C.int(len(data))) > 0
+ C.BHFree(src, 0)
+ return ret
}
func GetLastError() (int, string) {
- creply := unsafe.Pointer(nil)
- creply_len := C.int(0)
+ var creply unsafe.Pointer
+ var creply_len C.int
r := C.BHGetLastError(&creply, &creply_len)
defer C.BHFree(creply, creply_len)
// return int(r), string(C.GoBytes(creply, creply_len))
- return int(r), ByteSlice2String(unsafeGetBytes(&creply, int(creply_len)))
+ return int(r), string(unsafeGetBytes(&creply, int(creply_len)))
}
func Cleanup() {
C.BHCleanup()
}
+
+// ///////////////////////////////////////////////////
+func Request2(dest_addr *bh.BHAddress, data []byte, proc_id *string, replyPtr *unsafe.Pointer, replyLen *int, timeout_ms int) bool {
+ dest, _ := dest_addr.Marshal()
+ var cpid, creply unsafe.Pointer
+ var cpid_len, creply_len C.int
+
+ 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 {
+ *proc_id = string(unsafeGetBytes(&cpid, int(cpid_len)))
+ *replyPtr = creply
+ *replyLen = int(creply_len)
+ }
+ C.BHFree(cpid, cpid_len)
+ return r
+}
+func CFree(p unsafe.Pointer, size int) {
+ if p != nil {
+ C.BHFree(p, C.int(size))
+ }
+}
+func SendReply2(src unsafe.Pointer, data []byte) bool {
+ return C.BHSendReply(src, getPtr(&data), C.int(len(data))) > 0
+}
--
Gitblit v1.8.0