From 0ac4c151e08a9735d085c08ca5bcd9b50944d650 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 26 八月 2019 16:41:35 +0800
Subject: [PATCH] memleak
---
shm.go | 80 +++++++++++++--------------------------
1 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/shm.go b/shm.go
index 9260cdd..8dec56e 100644
--- a/shm.go
+++ b/shm.go
@@ -4,16 +4,17 @@
"errors"
"fmt"
"io"
-
"time"
- "github.com/tmthrgd/shm-go"
+ "basic.com/valib/shm.git"
)
// SHM share memory
type SHM struct {
rw *shm.ReadWriteCloser
typ td
+
+ recvData []byte
}
// Send impl interface Diliver
@@ -22,26 +23,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 +38,17 @@
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")
+ if s.recvData == nil {
+ s.recvData = make([]byte, maxRecvSize)
+ }
+ n, err := s.rw.Read(s.recvData)
+ if err == nil || err == io.EOF {
+ data := make([]byte, n)
+ copy(data, s.recvData)
+ 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
@@ -108,21 +79,23 @@
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]
-
+ time.Sleep(time.Millisecond)
shm.Unlink(url)
rw, err := shm.CreateSimplex(url, 0644, blocks, size)
if err == nil {
fmt.Println(rw.Name())
return &SHM{
- rw,
- agent,
+ rw: rw,
+ typ: agent,
+ recvData: nil,
}, nil
}
@@ -137,8 +110,9 @@
rw, err := shm.OpenSimplex(url)
if err == nil {
return &SHM{
- rw,
- coactee,
+ rw: rw,
+ typ: coactee,
+ recvData: nil,
}, nil
}
return nil, err
--
Gitblit v1.8.0