From 309302ff1743e28052a40a640b05b15ec3f58ebd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 22 五月 2020 17:47:59 +0800
Subject: [PATCH] attach 或 create shmqueue的时候增加错误判断
---
shmqueue.go | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/shmqueue.go b/shmqueue.go
index 2cc6908..b116869 100644
--- a/shmqueue.go
+++ b/shmqueue.go
@@ -12,7 +12,7 @@
)
const (
- TimePeriodPutOrGet = time.Duration(1) * time.Microsecond
+ TimePeriodPutOrGet = time.Duration(5)*time.Millisecond //ms
)
//Element info
@@ -72,6 +72,9 @@
shmLen = shmblocks*uint32(unsafe.Sizeof(datainfo)) + uint32(unsafe.Sizeof(shmstruct))
data, shmid := CreateRawShm(ctx, int(shmLen), key)
+ if shmid == -1 {
+ return nil
+ }
q := bytes2shmEsQueue(data)
//init parameters
q.capacity = shmblocks
@@ -104,6 +107,9 @@
var eqi EsQueueInfo
data, shmid := AttachRawShm(ctx, key)
+ if shmid == -1 {
+ return nil
+ }
shmdata := bytes2shmEsQueue(data)
eqi.EsCaches = ptr2esCache(unsafe.Pointer(&shmdata.cache), int(shmdata.capacity))
//fmt.Println("AttachQueue EsCaches:", eqi.EsCaches)
@@ -139,25 +145,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,19 +181,17 @@
// 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
@@ -215,7 +215,7 @@
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()
@@ -275,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)
@@ -305,10 +304,10 @@
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()
--
Gitblit v1.8.0