From d3d9b7341ef7613e0d2813b69491ffcef5736f48 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 18 一月 2024 14:11:31 +0800
Subject: [PATCH] less memory
---
api/bhsgo/bhome_node.go | 85 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go
index a295673..8ad02ff 100644
--- a/api/bhsgo/bhome_node.go
+++ b/api/bhsgo/bhome_node.go
@@ -14,10 +14,8 @@
bh "basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
)
-func unsafeGetBytes(s string) []byte {
- const MaxInt32 = 1<<31 - 1
- return (*[MaxInt32]byte)(unsafe.Pointer((*reflect.StringHeader)(
- unsafe.Pointer(&s)).Data))[: len(s)&MaxInt32 : len(s)&MaxInt32]
+func unsafeGetBytes(p unsafe.Pointer, s int) []byte {
+ return (*[0x7fffffff]byte)(p)[:s:s]
}
func ByteSlice2String(bs []byte) string {
@@ -46,7 +44,8 @@
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))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -55,11 +54,12 @@
data, _ := topics.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -68,11 +68,12 @@
data, _ := topics.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -81,11 +82,12 @@
data, _ := topics.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -94,11 +96,12 @@
data, _ := proc.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -111,11 +114,12 @@
data, _ := proc.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -125,11 +129,12 @@
data, _ := topic.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
@@ -140,11 +145,12 @@
data, _ := topic.Marshal()
creply := unsafe.Pointer(nil)
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 {
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
@@ -158,22 +164,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)
-
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 = string(C.GoBytes(cpid, cpid_len))
- //pub.Unmarshal(C.GoBytes(creply, creply_len))
-
- //const MaxInt32 = 1<<32 - 1
- const maxLen = 0x7fffffff
- *proc_id = ByteSlice2String((*[maxLen]byte)(unsafe.Pointer(cpid))[:cpid_len:cpid_len])
- pub.Unmarshal((*[maxLen]byte)(unsafe.Pointer(creply))[:creply_len:creply_len])
+ *proc_id = ByteSlice2String(unsafeGetBytes(cpid, int(cpid_len)))
+ pub.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
@@ -184,7 +184,7 @@
data, _ := req.Marshal()
creply := unsafe.Pointer(nil)
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 {
@@ -198,16 +198,18 @@
data, _ := req.Marshal()
cpid := unsafe.Pointer(nil)
cpid_len := C.int(0)
-
+
creply := unsafe.Pointer(nil)
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 {
- *proc_id = string(C.GoBytes(cpid, cpid_len))
- reply.Unmarshal(C.GoBytes(creply, creply_len))
+ // *proc_id = string(C.GoBytes(cpid, cpid_len))
+ // reply.Unmarshal(C.GoBytes(creply, creply_len))
+ *proc_id = ByteSlice2String(unsafeGetBytes(cpid, int(cpid_len)))
+ reply.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -215,16 +217,18 @@
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)
-
+
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))
+ 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)))
+ req.Unmarshal(unsafeGetBytes(creply, int(creply_len)))
}
return r
}
@@ -238,10 +242,11 @@
func GetLastError() (int, string) {
creply := unsafe.Pointer(nil)
creply_len := C.int(0)
-
+
r := C.BHGetLastError(&creply, &creply_len)
defer C.BHFree(creply, creply_len)
- return int(r), string(C.GoBytes(creply, creply_len))
+ // return int(r), string(C.GoBytes(creply, creply_len))
+ return int(r), ByteSlice2String(unsafeGetBytes(creply, int(creply_len)))
}
--
Gitblit v1.8.0