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 | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/shm.go b/shm.go
index 8d40445..602bcfa 100644
--- a/shm.go
+++ b/shm.go
@@ -4,8 +4,9 @@
"errors"
"fmt"
"io"
+ "time"
- "github.com/tmthrgd/shm-go"
+ "basic.com/valib/shm.git"
)
// SHM share memory
@@ -35,14 +36,33 @@
return nil, errors.New("please open shm consumer first")
}
- data := make([]byte, maxRecvSize)
+ // 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 {
+ 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 data, nil
+ return nil
}
- return nil, err
+ return err
}
// Close impl interface Deliver
@@ -65,7 +85,6 @@
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
@@ -74,18 +93,22 @@
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 {
+ blocks, size = param[0], param[1]
+ // return nil, errors.New("shmServer created recv too much parameters")
}
+ time.Sleep(time.Millisecond)
shm.Unlink(url)
- rw, err := shm.CreateSimplex(url, 0644, param[0], param[1])
+ rw, err := shm.CreateSimplex(url, 0644, blocks, size)
if err == nil {
fmt.Println(rw.Name())
return &SHM{
- rw,
- agent,
+ rw: rw,
+ typ: agent,
}, nil
}
@@ -100,8 +123,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