From a59cbf5e0cc306d862385e8d2670d2b0537ea9eb Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 15:01:00 +0800
Subject: [PATCH] recover
---
shm.go | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/shm.go b/shm.go
index 8dec56e..602bcfa 100644
--- a/shm.go
+++ b/shm.go
@@ -13,8 +13,6 @@
type SHM struct {
rw *shm.ReadWriteCloser
typ td
-
- recvData []byte
}
// Send impl interface Diliver
@@ -38,17 +36,33 @@
return nil, errors.New("please open shm consumer first")
}
- if s.recvData == nil {
- s.recvData = make([]byte, maxRecvSize)
- }
- n, err := s.rw.Read(s.recvData)
+ // data := make([]byte, maxRecvSize)
+ // n, err := s.rw.Read(data)
+ // if err == nil || err == io.EOF {
+ // data := data[:n:n]
+ // return data, nil
+ // }
+
+ data, err := s.rw.DirectRead()
if err == nil || err == io.EOF {
- data := make([]byte, n)
- copy(data, s.recvData)
return data, nil
}
-
return nil, err
+}
+
+// Recv2 impl interface
+func (s *SHM) Recv2(data []byte) error {
+ if s == nil || s.rw == nil {
+ return errors.New("please open shm consumer first")
+ }
+
+ n, err := s.rw.Read(data)
+ if err == nil || err == io.EOF {
+ data = data[:n:n]
+ return nil
+ }
+
+ return err
}
// Close impl interface Deliver
@@ -93,9 +107,8 @@
if err == nil {
fmt.Println(rw.Name())
return &SHM{
- rw: rw,
- typ: agent,
- recvData: nil,
+ rw: rw,
+ typ: agent,
}, nil
}
@@ -110,9 +123,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