From b45e986f51e4545a9f42e6f387829a75d589c69a Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期三, 15 四月 2020 15:54:45 +0800
Subject: [PATCH] shmqueue的get和put,增加超次数退出
---
shmqueue.go | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/shmqueue.go b/shmqueue.go
index 489c38e..83ab92e 100644
--- a/shmqueue.go
+++ b/shmqueue.go
@@ -139,13 +139,17 @@
// Capacity queue 瀹归噺锛屾�诲ぇ灏�
func (eqi *EsQueueInfo) QueueCapacity() int {
- return int(eqi.Queue.capMod)
+ var capMod uint32
+ capMod = atomic.LoadUint32(&eqi.Queue.capMod)
+ return int(capMod)
}
// Size queue 瀹為檯澶у皬
func (eqi *EsQueueInfo) QueueSize() int {
- var putPos, getPos uint32
+ var putPos, getPos, capMod uint32
var quantity uint32
+
+ capMod = atomic.LoadUint32(&eqi.Queue.capMod)
getPos = atomic.LoadUint32(&eqi.Queue.getPos)
putPos = atomic.LoadUint32(&eqi.Queue.putPos)
@@ -153,7 +157,7 @@
quantity = putPos - getPos
} else {
//quantity = q.capMod + (putPos - getPos)
- quantity = (eqi.Queue.capMod + (putPos - getPos)) % eqi.Queue.capMod
+ quantity = (capMod + (putPos - getPos)) % capMod
}
return int(quantity)
@@ -175,10 +179,11 @@
// Put 鍗曟鍐欏叆锛屽彲鑳藉け璐�
func (eqi *EsQueueInfo) Put(val ElemInfo) (bool, int) {
- var putPos, putPosNew, getPos, posCnt uint32
+ var putPos, putPosNew, getPos, posCnt, capMod ,capacity uint32
var cache *esCache
- capMod := eqi.Queue.capMod
+ capacity = atomic.LoadUint32(&eqi.Queue.capacity)
+ capMod = atomic.LoadUint32(&eqi.Queue.capMod)
getPos = atomic.LoadUint32(&eqi.Queue.getPos)
putPos = atomic.LoadUint32(&eqi.Queue.putPos)
@@ -205,15 +210,22 @@
cache = &(eqi.EsCaches[putPosNew&capMod])
+ tryMax := 100
+ tryCount := 0
for {
getNo := atomic.LoadUint32(&cache.getNo)
putNo := atomic.LoadUint32(&cache.putNo)
if putPosNew == putNo && getNo == putNo {
cache.value = val
- atomic.AddUint32(&cache.putNo, eqi.Queue.capacity)
+ atomic.AddUint32(&cache.putNo, capacity)
return true, int(posCnt + 1)
} else {
runtime.Gosched()
+ }
+ tryCount++
+ if tryCount >= tryMax {
+ fmt.Println("Put tryCount:", tryCount)
+ return false, int(posCnt)
}
}
}
@@ -270,10 +282,11 @@
// Get 鍗曟鑾峰彇锛屽彲鑳藉け璐�
func (eqi *EsQueueInfo) Get() (ElemInfo, bool, int) {
- var putPos, getPos, getPosNew, posCnt uint32
+ var putPos, getPos, getPosNew, posCnt, capMod, capacity uint32
var cache *esCache
- capMod := eqi.Queue.capMod
+ capacity = atomic.LoadUint32(&eqi.Queue.capacity)
+ capMod = atomic.LoadUint32(&eqi.Queue.capMod)
putPos = atomic.LoadUint32(&eqi.Queue.putPos)
getPos = atomic.LoadUint32(&eqi.Queue.getPos)
@@ -296,17 +309,24 @@
cache = &(eqi.EsCaches[getPosNew&capMod])
+ tryMax := 100
+ tryCount := 0
for {
getNo := atomic.LoadUint32(&cache.getNo)
putNo := atomic.LoadUint32(&cache.putNo)
- if getPosNew == getNo && getNo == putNo-eqi.Queue.capacity {
+ if getPosNew == getNo && getNo == putNo-capacity {
val := cache.value
cache.value = ElemInfo{PicId: 0}
- atomic.AddUint32(&cache.getNo, eqi.Queue.capacity)
+ atomic.AddUint32(&cache.getNo, capacity)
return val, true, int(posCnt - 1)
} else {
runtime.Gosched()
}
+ tryCount++
+ if tryCount >= tryMax {
+ fmt.Println("Get tryCount:", tryCount)
+ return ElemInfo{}, false, int(posCnt)
+ }
}
}
--
Gitblit v1.8.0