From 020e17cc5311d091d713eb4fabae2a3d50944916 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 13:13:33 +0800
Subject: [PATCH] add shm interface 2
---
shm.go | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/shm.go b/shm.go
index 911c2d9..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
@@ -80,14 +100,15 @@
// return nil, errors.New("shmServer created recv too much parameters")
}
+ time.Sleep(time.Millisecond)
shm.Unlink(url)
rw, err := shm.CreateSimplex(url, 0644, blocks, size)
if err == nil {
fmt.Println(rw.Name())
return &SHM{
- rw,
- agent,
+ rw: rw,
+ typ: agent,
}, nil
}
@@ -102,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