From b9cf4660f85b3457763de72781bc7bc84411f5de Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 30 八月 2019 16:26:45 +0800
Subject: [PATCH] reflect every time get
---
shm.go | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/shm.go b/shm.go
index 8dec56e..939a859 100644
--- a/shm.go
+++ b/shm.go
@@ -4,7 +4,9 @@
"errors"
"fmt"
"io"
+ "reflect"
"time"
+ "unsafe"
"basic.com/valib/shm.git"
)
@@ -38,17 +40,53 @@
return nil, errors.New("please open shm consumer first")
}
+ // orig
+
+ // data := make([]byte, maxRecvSize)
+ // n, err := s.rw.Read(data)
+ // if err == nil || err == io.EOF {
+ // data := data[:n:n]
+ // return data, nil
+ // }
+
+ // cur
+
+ // data, err := s.rw.DirectRead()
+ // if err == nil || err == io.EOF {
+ // return data, nil
+ // }
+
+ // new
+
if s.recvData == nil {
s.recvData = make([]byte, maxRecvSize)
}
+ sliceHeader := (*reflect.SliceHeader)(unsafe.Pointer(&s.recvData))
+ // sliceHeader.Cap = maxRecvSize
+ sliceHeader.Len = maxRecvSize
+
n, err := s.rw.Read(s.recvData)
if err == nil || err == io.EOF {
- data := make([]byte, n)
- copy(data, s.recvData)
- return data, nil
+ sliceHeader.Len = n
+ return s.recvData, nil
}
return nil, err
+}
+
+// Recv2 impl interface
+func (s *SHM) Recv2(data []byte) (int, error) {
+ if s == nil || s.rw == nil {
+ return 0, errors.New("please open shm consumer first")
+ }
+
+ n, err := s.rw.Read(data)
+ if err == nil || err == io.EOF {
+ data = data[:n:n]
+ return n, nil
+ }
+
+ return 0, err
}
// Close impl interface Deliver
@@ -93,9 +131,8 @@
if err == nil {
fmt.Println(rw.Name())
return &SHM{
- rw: rw,
- typ: agent,
- recvData: nil,
+ rw: rw,
+ typ: agent,
}, nil
}
@@ -110,9 +147,8 @@
rw, err := shm.OpenSimplex(url)
if err == nil {
return &SHM{
- rw: rw,
- typ: coactee,
- recvData: nil,
+ rw: rw,
+ typ: coactee,
}, nil
}
return nil, err
--
Gitblit v1.8.0