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 | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/shm.go b/shm.go
index 16bc8f1..8dec56e 100644
--- a/shm.go
+++ b/shm.go
@@ -4,19 +4,22 @@
"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
func (s *SHM) Send(data []byte) error {
- if s.rw == nil {
+ if s == nil || s.rw == nil {
return errors.New("please init shm producer first")
}
@@ -31,14 +34,17 @@
// Recv impl interface Diliver
func (s *SHM) Recv() ([]byte, error) {
- if s.rw == nil {
+ if s == nil || s.rw == nil {
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
}
@@ -47,6 +53,9 @@
// Close impl interface Deliver
func (s *SHM) Close() {
+ if s == nil {
+ return
+ }
if s.rw != nil {
s.rw.Close()
}
@@ -55,54 +64,56 @@
}
}
-func shmServer(m Mode, url string, args ...interface{}) *SHM {
+func shmServer(m Mode, url string, args ...interface{}) (*SHM, error) {
if m != Shm {
- fmt.Println("this is not a shm mode: ", m)
- return nil
+ return nil, errors.New("please use deliver.Shm mode")
}
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
default:
- fmt.Println("shmProducer recv error parameters")
- return nil
+ return nil, errors.New("shmServer created recv error parameters")
}
}
- if len(param) != 2 {
- fmt.Println("shmProducer recv too much parameter: ", len(param))
- return nil
+
+ 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)
- if rw, err := shm.CreateSimplex(url, 0644, param[0], param[1]); err == nil {
+
+ 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
}
- fmt.Println("create simple shm error")
- return nil
+ return nil, err
}
-func shmClient(m Mode, url string, args ...interface{}) *SHM {
-
+func shmClient(m Mode, url string, args ...interface{}) (*SHM, error) {
if m != Shm {
- fmt.Println("this is not a shm mode: ", m)
- return nil
+ return nil, errors.New("please use deliver.Shm mode")
}
- if rw, err := shm.OpenSimplex(url); err == nil {
+ rw, err := shm.OpenSimplex(url)
+ if err == nil {
return &SHM{
- rw,
- coactee,
- }
+ rw: rw,
+ typ: coactee,
+ recvData: nil,
+ }, nil
}
- fmt.Println("shmConsumer open error")
- return nil
+ return nil, err
}
--
Gitblit v1.8.0