From fb46ee747046ea8634638fba3384ac20358deb49 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 26 八月 2019 14:16:31 +0800
Subject: [PATCH] update shm
---
shm.go | 72 ++++++++---------------------------
1 files changed, 17 insertions(+), 55 deletions(-)
diff --git a/shm.go b/shm.go
index 6b61dbc..0edb422 100644
--- a/shm.go
+++ b/shm.go
@@ -1,20 +1,17 @@
package deliver
import (
- "bytes"
"errors"
"fmt"
"io"
- "time"
-
- "github.com/tmthrgd/shm-go"
+ "basic.com/valib/shm.git"
)
// SHM share memory
type SHM struct {
- rw *shm.ReadWriteCloser
- typ td
+ rw *shm.ReadWriteCloser
+ typ td
}
// Send impl interface Diliver
@@ -23,26 +20,12 @@
return errors.New("please init shm producer first")
}
- ch := make(chan int)
- go func(){
- n, _ := s.rw.Write(data)
- ch <- n
- }()
- select{
- case <-ch:
- return nil
- case <- time.After(3 * time.Second):
- return errors.New("send time out")
+ n, err := s.rw.Write(data)
+ if n < 1 {
+ fmt.Println("recv data less than 1 length")
}
- return errors.New("send should't here")
-
- // n, err := s.rw.Write(data)
- // if n < 1 {
- // fmt.Println("recv data less than 1 length")
- // }
-
- // return err
+ return err
}
// Recv impl interface Diliver
@@ -52,33 +35,14 @@
return nil, errors.New("please open shm consumer first")
}
- ch := make(chan []byte)
- go func(){
- buffer := new(bytes.Buffer)
- _, err := s.rw.WriteTo(buffer)
- if err == nil || err == io.EOF {
- ch <- buffer.Bytes()
- }
- ch <- nil
- }()
- select{
- case d := <-ch:
- return d, nil
- case <- time.After(3 * time.Second):
- return nil, errors.New("recv time out")
+ data := make([]byte, maxRecvSize)
+ n, err := s.rw.Read(data)
+ if err == nil || err == io.EOF {
+ data = data[:n:n]
+ return data, nil
}
- return nil, errors.New("recv should't here")
-
-
- // data := make([]byte, maxRecvSize)
- // n, err := s.rw.Read(data)
- // if err == nil || err == io.EOF {
- // data = data[:n:n]
- // return data, nil
- // }
-
- // return nil, err
+ return nil, err
}
// Close impl interface Deliver
@@ -109,15 +73,13 @@
return nil, errors.New("shmServer created recv error 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")
+ if len(param) != 2 {
+ return nil, errors.New("shmServer created recv too much parameters")
}
+
shm.Unlink(url)
- rw, err := shm.CreateSimplex(url, 0644, blocks, size)
+ rw, err := shm.CreateSimplex(url, 0644, param[0], param[1])
if err == nil {
fmt.Println(rw.Name())
return &SHM{
--
Gitblit v1.8.0