From 0c22e1e1b5c77fa5d09600200239bd3a0907fc78 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 22 八月 2019 14:53:29 +0800
Subject: [PATCH] mem leak bug
---
shm.go | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/shm.go b/shm.go
index 911c2d9..6326e7f 100644
--- a/shm.go
+++ b/shm.go
@@ -5,6 +5,8 @@
"fmt"
"io"
+ "time"
+
"github.com/tmthrgd/shm-go"
)
@@ -12,6 +14,8 @@
type SHM struct {
rw *shm.ReadWriteCloser
typ td
+
+ data []byte
}
// Send impl interface Diliver
@@ -20,12 +24,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 +53,35 @@
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(){
+ var data []byte
+ n, err := s.rw.Read(s.data)
+ if err == nil || err == io.EOF {
+ data = make([]byte, n)
+ copy(data, s.data)
+ // s.data = s.data[:n:n]
+ }
+ ch <- s.data
+ }()
+ 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 +118,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)
@@ -88,6 +126,7 @@
return &SHM{
rw,
agent,
+ make([]byte, maxRecvSize),
}, nil
}
@@ -104,6 +143,7 @@
return &SHM{
rw,
coactee,
+ make([]byte, maxRecvSize),
}, nil
}
return nil, err
--
Gitblit v1.8.0