From 47adbbbb6651527a7cf7416702d66fa7ddf5c2a9 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 30 八月 2019 16:36:57 +0800
Subject: [PATCH] recover
---
shm.go | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/shm.go b/shm.go
index 1505b32..534fc83 100644
--- a/shm.go
+++ b/shm.go
@@ -13,6 +13,8 @@
type SHM struct {
rw *shm.ReadWriteCloser
typ td
+
+ // recvData []byte
}
// Send impl interface Diliver
@@ -36,14 +38,53 @@
return nil, errors.New("please open shm consumer first")
}
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
+ // 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 {
- data = data[:n:n]
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 {
+ // 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
@@ -74,9 +115,6 @@
return nil, errors.New("shmServer created recv error parameters")
}
}
- if len(param) != 2 {
- return nil, errors.New("shmServer created recv too much parameters")
- }
blocks, size := 2, maxRecvSize
if len(param) == 2 {
@@ -91,8 +129,8 @@
if err == nil {
fmt.Println(rw.Name())
return &SHM{
- rw,
- agent,
+ rw: rw,
+ typ: agent,
}, nil
}
@@ -107,8 +145,8 @@
rw, err := shm.OpenSimplex(url)
if err == nil {
return &SHM{
- rw,
- coactee,
+ rw: rw,
+ typ: coactee,
}, nil
}
return nil, err
--
Gitblit v1.8.0