From 91f7d13bdf60a2df6bedff6467f550c7c643f3fc Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 28 三月 2020 09:03:52 +0800
Subject: [PATCH] 给强制写入和读取增加context资源管理
---
shmqueue.go | 86 ++++++++++++++++++++++++++++--------------
shmwrap.go | 11 ++---
2 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/shmqueue.go b/shmqueue.go
index 3495406..8c5b3a4 100644
--- a/shmqueue.go
+++ b/shmqueue.go
@@ -12,7 +12,7 @@
)
const (
- TimePeriodPutOrGet = time.Duration(10) * time.Microsecond
+ TimePeriodPutOrGet = time.Duration(1) * time.Microsecond
)
//Element info
@@ -218,18 +218,29 @@
}
//PutForce 寮哄埗鍐欏叆锛屽け璐ュ垯缁х画閲嶅啓锛岀洿鍒版垚鍔熶负姝�
-func (eqi *EsQueueInfo) PutForce(val ElemInfo) int {
+func (eqi *EsQueueInfo) PutForce(ctx context.Context, val ElemInfo) int {
ok, qua := eqi.Put(val)
for !ok {
- time.Sleep(TimePeriodPutOrGet)
- ok, qua = eqi.Put(val)
+ loopB:
+ for {
+ select {
+ case <-ctx.Done():
+ return 0
+ default:
+ ok, qua = eqi.Put(val)
+ if ok {
+ break loopB
+ }
+ time.Sleep(TimePeriodPutOrGet)
+ }
+ }
}
return qua
}
//PutForceWithinTime 鍦╰imeout ms鐨勬椂闂村唴锛屽己鍒跺啓鍏ワ紝澶辫触鍒欑户缁噸鍐欙紝鐩村埌鎴愬姛涓烘鎴栬�呰秴鏃堕��鍑�
-func (eqi *EsQueueInfo) PutForceWithinTime(val ElemInfo, timeout int) (bool, int) {
+func (eqi *EsQueueInfo) PutForceWithinTime(ctx context.Context, val ElemInfo, timeout int) (bool, int) {
ok, qua := eqi.Put(val)
if ok {
return ok, qua
@@ -238,18 +249,21 @@
to := time.NewTimer(time.Duration(timeout) * time.Millisecond)
defer to.Stop()
- for {
- select {
- case <-to.C:
- return false, 0
- default:
- ok, qua = eqi.Put(val)
- if ok {
- return ok, qua
+ loopB:
+ for {
+ select {
+ case <-ctx.Done():
+ return false, 0
+ case <-to.C:
+ return false, 0
+ default:
+ ok, qua = eqi.Put(val)
+ if ok {
+ break loopB
+ }
+ time.Sleep(TimePeriodPutOrGet)
}
- time.Sleep(TimePeriodPutOrGet)
}
- }
return ok, qua
}
@@ -296,18 +310,29 @@
}
//GetForce 寮哄埗鑾峰彇鏁版嵁锛屽け璐ュ垯缁х画鑾峰彇锛岀洿鍒版垚鍔熶负姝�
-func (eqi *EsQueueInfo) GetForce() (ElemInfo, int) {
+func (eqi *EsQueueInfo) GetForce(ctx context.Context) (ElemInfo, int) {
val, ok, qua := eqi.Get()
for !ok {
- time.Sleep(TimePeriodPutOrGet)
- val, ok, qua = eqi.Get()
+ loopB:
+ for {
+ select {
+ case <-ctx.Done():
+ return ElemInfo{}, 0
+ default:
+ val, ok, qua = eqi.Get()
+ if ok {
+ break loopB
+ }
+ time.Sleep(TimePeriodPutOrGet)
+ }
+ }
}
return val, qua
}
//GetForceWithinTime 鍦╰imeout ms鐨勬椂闂村唴锛屽己鍒惰幏鍙栨暟鎹紝澶辫触鍒欑户缁幏鍙栵紝鐩村埌鎴愬姛涓烘
-func (eqi *EsQueueInfo) GetForceWithinTime(timeout int) (ElemInfo, bool, int) {
+func (eqi *EsQueueInfo) GetForceWithinTime(ctx context.Context, timeout int) (ElemInfo, bool, int) {
val, ok, qua := eqi.Get()
if ok {
return val, ok, qua
@@ -316,18 +341,21 @@
to := time.NewTimer(time.Duration(timeout) * time.Millisecond)
defer to.Stop()
- for {
- select {
- case <-to.C:
- return ElemInfo{}, false, 0
- default:
- val, ok, qua = eqi.Get()
- if ok {
- return val, ok, qua
+ loopB:
+ for {
+ select {
+ case <-ctx.Done():
+ return ElemInfo{}, false, 0
+ case <-to.C:
+ return ElemInfo{}, false, 0
+ default:
+ val, ok, qua = eqi.Get()
+ if ok {
+ break loopB
+ }
+ time.Sleep(TimePeriodPutOrGet)
}
- time.Sleep(TimePeriodPutOrGet)
}
- }
return val, ok, qua
}
diff --git a/shmwrap.go b/shmwrap.go
index 12dba41..73aefc0 100644
--- a/shmwrap.go
+++ b/shmwrap.go
@@ -10,13 +10,14 @@
// NewBlock shm block with size
func NewBlock(size int, key int) ([]byte, int, error) {
id, err := shm.Get(key, size, shm.IPC_CREAT|0666)
- fmt.Println("Get:", id, err)
if err != nil || id == -1 {
+ fmt.Println("NewBlock Get:", key, err)
return nil, -1, err
}
data, err2 := shm.At(id, 0, 0)
if err2 != nil {
+ fmt.Println("NewBlock At:", key, err2)
return nil, -1, err2
}
@@ -26,13 +27,14 @@
// AttachBlock attach exist shm
func AttachBlock(key int) ([]byte, int, error) {
id, err := shm.Get(key, 0, 0)
- fmt.Println("Get:", id, err)
if err != nil || id == -1 { //no exist
+ fmt.Println("AttachBlock Get:", key, err)
return nil, -1, err
}
data, err2 := shm.At(id, 0, 0)
if err2 != nil {
+ fmt.Println("AttachBlock At:", key, err2)
return nil, -1, err2
}
@@ -50,7 +52,6 @@
// context for quit
func CreateRawShm(ctx context.Context, size int, key int) ([]byte, int) {
data, id, err := AttachBlock(key)
- fmt.Println("err:", err)
if err != nil {
loopB:
for {
@@ -60,8 +61,6 @@
default:
if err == nil {
break loopB
- } else {
- fmt.Println("createShm error:", err)
}
time.Sleep(time.Millisecond)
data, id, err = NewBlock(size, key)
@@ -83,8 +82,6 @@
default:
if err == nil {
break loopB
- } else {
- fmt.Println("createShm error:", err)
}
time.Sleep(time.Millisecond)
data, id, err = AttachBlock(key)
--
Gitblit v1.8.0