From 074c0c376a7b6c91bad7c45e050270a4a6856b6d Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 22 八月 2019 15:20:07 +0800
Subject: [PATCH] memleak bug fix
---
shm.go | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/shm.go b/shm.go
index 5a87130..6b61dbc 100644
--- a/shm.go
+++ b/shm.go
@@ -1,6 +1,7 @@
package deliver
import (
+ "bytes"
"errors"
"fmt"
"io"
@@ -12,8 +13,8 @@
// SHM share memory
type SHM struct {
- rw *shm.ReadWriteCloser
- typ td
+ rw *shm.ReadWriteCloser
+ typ td
}
// Send impl interface Diliver
@@ -53,12 +54,12 @@
ch := make(chan []byte)
go func(){
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
+ buffer := new(bytes.Buffer)
+ _, err := s.rw.WriteTo(buffer)
if err == nil || err == io.EOF {
- data = data[:n:n]
+ ch <- buffer.Bytes()
}
- ch <- data
+ ch <- nil
}()
select{
case d := <-ch:
@@ -100,7 +101,6 @@
var param []int
for _, v := range args {
- fmt.Println(v)
switch v.(type) {
case int:
param = append(param, v.(int))
@@ -109,13 +109,15 @@
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{
--
Gitblit v1.8.0