From be392a6596e481d82032d85060d1a072d327e3f4 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 22 八月 2019 15:30:35 +0800
Subject: [PATCH] test shm
---
shm.go | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/shm.go b/shm.go
index 5a87130..ba48253 100644
--- a/shm.go
+++ b/shm.go
@@ -3,7 +3,7 @@
import (
"errors"
"fmt"
- "io"
+ // "io"
"time"
@@ -14,6 +14,8 @@
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")
}
@@ -100,7 +102,6 @@
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
@@ -109,18 +110,21 @@
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{
rw,
agent,
+ make([]byte, maxRecvSize),
}, nil
}
@@ -137,6 +141,7 @@
return &SHM{
rw,
coactee,
+ make([]byte, maxRecvSize),
}, nil
}
return nil, err
--
Gitblit v1.8.0