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 | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/shm.go b/shm.go
index 911c2d9..6b61dbc 100644
--- a/shm.go
+++ b/shm.go
@@ -1,17 +1,20 @@
package deliver
import (
+ "bytes"
"errors"
"fmt"
"io"
+
+ "time"
"github.com/tmthrgd/shm-go"
)
// SHM share memory
type SHM struct {
- rw *shm.ReadWriteCloser
- typ td
+ rw *shm.ReadWriteCloser
+ typ td
}
// Send impl interface Diliver
@@ -20,12 +23,26 @@
return errors.New("please init shm producer first")
}
- n, err := s.rw.Write(data)
- if n < 1 {
- fmt.Println("recv data less than 1 length")
+ 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")
}
- return err
+ 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
}
// Recv impl interface Diliver
@@ -35,14 +52,33 @@
return nil, errors.New("please open shm consumer first")
}
- data := make([]byte, maxRecvSize)
- n, err := s.rw.Read(data)
- if err == nil || err == io.EOF {
- data = data[:n:n]
- return data, nil
+ ch := make(chan []byte)
+ go func(){
+ buffer := new(bytes.Buffer)
+ _, err := s.rw.WriteTo(buffer)
+ if err == nil || err == io.EOF {
+ ch <- buffer.Bytes()
+ }
+ ch <- nil
+ }()
+ select{
+ case d := <-ch:
+ return d, nil
+ case <- time.After(3 * time.Second):
+ return nil, errors.New("recv time out")
}
- return nil, err
+ 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
}
// Close impl interface Deliver
@@ -79,7 +115,6 @@
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, blocks, size)
--
Gitblit v1.8.0