From 4338cf10114f5176d120719cbc51bdc2177eae1c Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 26 八月 2019 16:05:59 +0800
Subject: [PATCH] bug fix
---
shm.go | 67 +++++++++------------------------
1 files changed, 18 insertions(+), 49 deletions(-)
diff --git a/shm.go b/shm.go
index 5a87130..727d18c 100644
--- a/shm.go
+++ b/shm.go
@@ -4,10 +4,9 @@
"errors"
"fmt"
"io"
-
"time"
- "github.com/tmthrgd/shm-go"
+ "basic.com/valib/shm.git"
)
// SHM share memory
@@ -22,26 +21,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
@@ -51,33 +36,14 @@
return nil, errors.New("please open shm consumer first")
}
- ch := make(chan []byte)
- go func(){
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
- if err == nil || err == io.EOF {
- data = data[:n:n]
- }
- ch <- data
- }()
- 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
@@ -100,7 +66,6 @@
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
@@ -109,13 +74,17 @@
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{
--
Gitblit v1.8.0