From 3766acf3262235e825fb90f75266fc9de01d8b8e Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期四, 16 四月 2020 10:03:27 +0800
Subject: [PATCH] 根据github的go-queue作者的源码修改
---
shmqueue.go | 63 +++++++++++++------------------
1 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/shmqueue.go b/shmqueue.go
index 83ab92e..bf6dcfd 100644
--- a/shmqueue.go
+++ b/shmqueue.go
@@ -12,7 +12,7 @@
)
const (
- TimePeriodPutOrGet = time.Duration(1) * time.Microsecond
+ TimePeriodPutOrGet = time.Duration(5) * time.Microsecond
)
//Element info
@@ -139,25 +139,21 @@
// Capacity queue 瀹归噺锛屾�诲ぇ灏�
func (eqi *EsQueueInfo) QueueCapacity() int {
- var capMod uint32
- capMod = atomic.LoadUint32(&eqi.Queue.capMod)
- return int(capMod)
+ return int(eqi.Queue.capMod)
}
// Size queue 瀹為檯澶у皬
func (eqi *EsQueueInfo) QueueSize() int {
- var putPos, getPos, capMod uint32
+ var putPos, getPos uint32
var quantity uint32
- capMod = atomic.LoadUint32(&eqi.Queue.capMod)
getPos = atomic.LoadUint32(&eqi.Queue.getPos)
putPos = atomic.LoadUint32(&eqi.Queue.putPos)
if putPos >= getPos {
quantity = putPos - getPos
} else {
- //quantity = q.capMod + (putPos - getPos)
- quantity = (capMod + (putPos - getPos)) % capMod
+ quantity = eqi.Queue.capMod + (putPos - getPos)
}
return int(quantity)
@@ -179,24 +175,22 @@
// Put 鍗曟鍐欏叆锛屽彲鑳藉け璐�
func (eqi *EsQueueInfo) Put(val ElemInfo) (bool, int) {
- var putPos, putPosNew, getPos, posCnt, capMod ,capacity uint32
+ var putPos, putPosNew, getPos, posCnt 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)
if putPos >= getPos {
posCnt = putPos - getPos
} else {
- //posCnt = capMod + (putPos - getPos)
- posCnt = (capMod + (putPos - getPos)) % capMod
+ posCnt = capMod + (putPos - getPos)
}
//todo
- //if posCnt >= capMod-1 {
- if posCnt >= capMod {
+ if posCnt >= capMod-1 {
+ //if posCnt >= capMod {
runtime.Gosched()
return false, int(posCnt)
}
@@ -210,23 +204,22 @@
cache = &(eqi.EsCaches[putPosNew&capMod])
- tryMax := 100
- tryCount := 0
+ //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, capacity)
+ atomic.AddUint32(&cache.putNo, eqi.Queue.capacity)
return true, int(posCnt + 1)
} else {
runtime.Gosched()
}
- tryCount++
- if tryCount >= tryMax {
- fmt.Println("Put tryCount:", tryCount)
- return false, int(posCnt)
- }
+ //tryCount++
+ //if tryCount >= tryMax {
+ // return false, int(posCnt)
+ //}
}
}
@@ -282,11 +275,10 @@
// Get 鍗曟鑾峰彇锛屽彲鑳藉け璐�
func (eqi *EsQueueInfo) Get() (ElemInfo, bool, int) {
- var putPos, getPos, getPosNew, posCnt, capMod, capacity uint32
+ var putPos, getPos, getPosNew, posCnt 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)
@@ -309,24 +301,23 @@
cache = &(eqi.EsCaches[getPosNew&capMod])
- tryMax := 100
- tryCount := 0
+ //tryMax := 100
+ //tryCount := 0
for {
getNo := atomic.LoadUint32(&cache.getNo)
putNo := atomic.LoadUint32(&cache.putNo)
- if getPosNew == getNo && getNo == putNo-capacity {
+ if getPosNew == getNo && getNo == putNo-eqi.Queue.capacity {
val := cache.value
- cache.value = ElemInfo{PicId: 0}
- atomic.AddUint32(&cache.getNo, capacity)
+ cache.value = ElemInfo{PicId: 0, InfoId:0}
+ atomic.AddUint32(&cache.getNo, eqi.Queue.capacity)
return val, true, int(posCnt - 1)
} else {
runtime.Gosched()
}
- tryCount++
- if tryCount >= tryMax {
- fmt.Println("Get tryCount:", tryCount)
- return ElemInfo{}, false, int(posCnt)
- }
+ //tryCount++
+ //if tryCount >= tryMax {
+ // return ElemInfo{}, false, int(posCnt)
+ //}
}
}
--
Gitblit v1.8.0