From d1980f96745856299a784c5f43aa2ee5fd9fe8b5 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 22 八月 2019 14:33:36 +0800
Subject: [PATCH] bug fix
---
shm.go | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/shm.go b/shm.go
index 8d40445..106c4f2 100644
--- a/shm.go
+++ b/shm.go
@@ -5,6 +5,8 @@
"fmt"
"io"
+ "time"
+
"github.com/tmthrgd/shm-go"
)
@@ -20,12 +22,26 @@
return errors.New("please init shm producer first")
}
- n, err := s.rw.Write(data)
- if n < 1 {
- fmt.Println("recv data less than 1 length")
+ 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")
}
- return err
+ 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
}
// Recv impl interface Diliver
@@ -35,14 +51,36 @@
return nil, errors.New("please open shm consumer first")
}
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
- if err == nil || err == io.EOF {
- data = data[:n:n]
- return data, nil
+ ch := make(chan []byte)
+ go func(){
+ var body []byte
+ data := make([]byte, maxRecvSize)
+ n, err := s.rw.Read(data)
+ if err == nil || err == io.EOF {
+ body = make([]byte, n)
+ copy(body, data)
+ // 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")
}
- return nil, err
+ 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
}
// Close impl interface Deliver
@@ -65,7 +103,6 @@
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
@@ -74,13 +111,15 @@
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")
+ }
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