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 | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/shm.go b/shm.go
index 8d40445..8dec56e 100644
--- a/shm.go
+++ b/shm.go
@@ -4,14 +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
@@ -35,10 +38,13 @@
return nil, errors.New("please open shm consumer first")
}
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
+ if s.recvData == nil {
+ s.recvData = make([]byte, maxRecvSize)
+ }
+ n, err := s.rw.Read(s.recvData)
if err == nil || err == io.EOF {
- data = data[:n:n]
+ data := make([]byte, n)
+ copy(data, s.recvData)
return data, nil
}
@@ -65,7 +71,6 @@
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
@@ -74,18 +79,23 @@
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")
}
+ time.Sleep(time.Millisecond)
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,
+ rw: rw,
+ typ: agent,
+ recvData: nil,
}, nil
}
@@ -100,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