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 | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/shm.go b/shm.go
index 9260cdd..f36dba2 100644
--- a/shm.go
+++ b/shm.go
@@ -3,17 +3,19 @@
import (
"errors"
"fmt"
- "io"
+ // "io"
"time"
- "github.com/tmthrgd/shm-go"
+ "basic.com/valib/shm.git"
)
// SHM share memory
type SHM struct {
rw *shm.ReadWriteCloser
typ td
+
+ data []byte
}
// Send impl interface Diliver
@@ -51,18 +53,18 @@
return nil, errors.New("please open shm consumer first")
}
- ch := make(chan []byte)
+ ch := make(chan int)
go func(){
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
- if err == nil || err == io.EOF {
- data = data[:n:n]
- }
- ch <- 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")
}
@@ -108,13 +110,12 @@
return nil, errors.New("shmServer created recv error parameters")
}
}
+
blocks, size := 2, maxRecvSize
- if len(param) != 2 {
- return nil, errors.New("shmServer created recv too much parameters")
+ if len(param) == 2 {
+ blocks, size = param[0], param[1]
+ // return nil, errors.New("shmServer created recv too much parameters")
}
-
- blocks, size = param[0], param[1]
-
shm.Unlink(url)
rw, err := shm.CreateSimplex(url, 0644, blocks, size)
@@ -123,6 +124,7 @@
return &SHM{
rw,
agent,
+ make([]byte, maxRecvSize),
}, nil
}
@@ -139,6 +141,7 @@
return &SHM{
rw,
coactee,
+ make([]byte, maxRecvSize),
}, nil
}
return nil, err
--
Gitblit v1.8.0