From 7385a596ec1a6831474d5815d3d6c614c667f270 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 26 八月 2019 14:15:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/deliver
---
shm.go | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/shm.go b/shm.go
index 6326e7f..f36dba2 100644
--- a/shm.go
+++ b/shm.go
@@ -3,11 +3,11 @@
import (
"errors"
"fmt"
- "io"
+ // "io"
"time"
- "github.com/tmthrgd/shm-go"
+ "basic.com/valib/shm.git"
)
// SHM share memory
@@ -53,20 +53,18 @@
return nil, errors.New("please open shm consumer first")
}
- ch := make(chan []byte)
+ ch := make(chan int)
go func(){
- var data []byte
- n, err := s.rw.Read(s.data)
- if err == nil || err == io.EOF {
- data = make([]byte, n)
- copy(data, s.data)
- // s.data = s.data[:n:n]
- }
- ch <- s.data
+ n, _ := s.rw.Read(s.data)
+ ch <- n
}()
select{
case d := <-ch:
- return d, nil
+ if d > 0{
+ data := make([]byte, d)
+ copy(data, s.data)
+ return data, nil
+ }
case <- time.After(3 * time.Second):
return nil, errors.New("recv time out")
}
--
Gitblit v1.8.0