From 47a19e070f57d92aadf52c62361da6ab5397bd4c Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期四, 04 六月 2020 16:13:59 +0800
Subject: [PATCH] 将git的shm库变成本地
---
shmqueue.go | 147 +++++++++++++++++++++++-------------------------
1 files changed, 70 insertions(+), 77 deletions(-)
diff --git a/shmqueue.go b/shmqueue.go
index f926652..33b61e5 100644
--- a/shmqueue.go
+++ b/shmqueue.go
@@ -3,7 +3,7 @@
import (
"context"
"fmt"
- "github.com/gen2brain/shm"
+ shm "basic.com/valib/goshm.git"
"reflect"
"runtime"
"sync/atomic"
@@ -12,7 +12,7 @@
)
const (
- TimePeriodPutOrGet = time.Duration(10) * time.Microsecond
+ TimePeriodPutOrGet = time.Duration(5)*time.Millisecond //ms
)
//Element info
@@ -72,65 +72,29 @@
shmLen = shmblocks*uint32(unsafe.Sizeof(datainfo)) + uint32(unsafe.Sizeof(shmstruct))
data, shmid := CreateRawShm(ctx, int(shmLen), key)
- fmt.Println("shmid:", shmid)
- fmt.Printf("data:%p\n", data)
q := bytes2shmEsQueue(data)
- fmt.Printf("q:%p\n", q)
- fmt.Println("esqueue:", q)
- fmt.Printf("q.capacity:%p\n", &q.capacity)
- fmt.Printf("q.capMod:%p\n", &q.capMod)
- fmt.Printf("q.putPos:%p\n", &q.putPos)
- fmt.Printf("q.getPos:%p\n", &q.getPos)
- fmt.Printf("q.cache:%p\n", &q.cache)
//init parameters
q.capacity = shmblocks
q.capMod = q.capacity - 1
q.putPos = 0
q.getPos = 0
- fmt.Println("int(q.capacity)", int(q.capacity))
eqi.EsCaches = ptr2esCache(unsafe.Pointer(&q.cache), int(q.capacity))
- fmt.Printf("EsCaches:%p\n", &eqi.EsCaches)
- fmt.Printf("EsCaches[0]:%p\n", &(eqi.EsCaches[0]))
- fmt.Printf("EsCaches[1]:%p\n", &(eqi.EsCaches[1]))
- fmt.Println("int(q.capacity)", int(q.capacity))
for i := 0; i < int(q.capacity); i++ {
- fmt.Println("i", i)
- fmt.Printf("EsCaches[%d]:%p\n", i, &(eqi.EsCaches[i]))
- fmt.Printf("EsCaches[%d].getNo:%p\n", i, &(eqi.EsCaches[i].getNo))
- fmt.Printf("EsCaches[%d].putNo:%p\n", i, &(eqi.EsCaches[i].putNo))
-
eqi.EsCaches[i].getNo = uint32(i)
eqi.EsCaches[i].putNo = uint32(i)
- fmt.Printf("cache.putNo:%p\n", &(eqi.EsCaches[i].putNo))
- fmt.Printf("cache.putNo:%p\n", &(eqi.EsCaches[i].putNo))
- fmt.Println("cache:", eqi.EsCaches[i])
}
cache := &eqi.EsCaches[0]
cache.getNo = q.capacity
cache.putNo = q.capacity
- fmt.Println("cache:", cache)
- cache0 := eqi.EsCaches[0]
- fmt.Printf("cache0:%p\n", &(cache0))
- fmt.Printf("cache0.getNo:%p\n", &(cache0.getNo))
- fmt.Printf("cache0.putNo:%p\n", &(cache0.putNo))
- fmt.Println("cache0:", cache0)
-
- cache1 := eqi.EsCaches[1]
- fmt.Printf("cache1:%p\n", &(cache1))
- fmt.Printf("cache1.getNo:%p\n", &(cache1.getNo))
- fmt.Printf("cache1.putNo:%p\n", &(cache1.putNo))
- fmt.Println("cache1:", cache1)
-
- fmt.Println("EsCaches:", eqi.EsCaches)
+ //fmt.Println("NewQueue EsCaches:", eqi.EsCaches)
eqi.ShmData = data
eqi.ShmID = shmid
eqi.ShmKey = key
eqi.Queue = q
- time.Sleep(10 * time.Second)
return &eqi
}
@@ -140,11 +104,9 @@
var eqi EsQueueInfo
data, shmid := AttachRawShm(ctx, key)
- fmt.Println("shmid:", shmid)
shmdata := bytes2shmEsQueue(data)
- fmt.Println("shmdata:", shmdata)
eqi.EsCaches = ptr2esCache(unsafe.Pointer(&shmdata.cache), int(shmdata.capacity))
- fmt.Println("EsCaches:", eqi.EsCaches)
+ //fmt.Println("AttachQueue EsCaches:", eqi.EsCaches)
eqi.Queue = shmdata
eqi.ShmKey = key
@@ -157,7 +119,7 @@
// ReleaseQueue detach an exist shm queue
func (eqi *EsQueueInfo) ReleaseQueue() {
fmt.Printf("ReleaseQueue: key=%x\n", eqi.ShmKey)
- DestroyShm(eqi.ShmData)
+ DetachShm(eqi.ShmData)
}
// RemoveShmId remove an exist shm queue (ipcrm -m shmid)
@@ -184,14 +146,14 @@
func (eqi *EsQueueInfo) QueueSize() int {
var putPos, getPos uint32
var quantity uint32
+
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 = (eqi.Queue.capMod + (putPos - getPos)) % eqi.Queue.capMod
+ quantity = eqi.Queue.capMod + (putPos - getPos)
}
return int(quantity)
@@ -202,7 +164,8 @@
var elems []ElemInfo
for i := 0; i < len(eqi.EsCaches); i++ {
- if eqi.EsCaches[i].value.PicId != 0 && eqi.EsCaches[i].value.InfoId != 0 {
+ if eqi.EsCaches[i].value.PicId != -1 && eqi.EsCaches[i].value.InfoId != -1 &&
+ eqi.EsCaches[i].value.PicId != 0 && eqi.EsCaches[i].value.InfoId != 0 {
elems = append(elems, eqi.EsCaches[i].value)
}
}
@@ -222,8 +185,7 @@
if putPos >= getPos {
posCnt = putPos - getPos
} else {
- //posCnt = capMod + (putPos - getPos)
- posCnt = (capMod + (putPos - getPos)) % capMod
+ posCnt = capMod + (putPos - getPos)
}
//todo
@@ -256,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
@@ -276,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
}
@@ -324,7 +300,7 @@
putNo := atomic.LoadUint32(&cache.putNo)
if getPosNew == getNo && getNo == putNo-eqi.Queue.capacity {
val := cache.value
- cache.value = ElemInfo{PicId: 0}
+ cache.value = ElemInfo{PicId: 0, InfoId:0}
atomic.AddUint32(&cache.getNo, eqi.Queue.capacity)
return val, true, int(posCnt - 1)
} else {
@@ -334,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
@@ -354,23 +341,29 @@
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
}
// round 鍒版渶杩戠殑2鐨勫�嶆暟
func minQuantity(v uint32) uint32 {
+ if v < 2 {
+ return 2
+ }
v--
v |= v >> 1
v |= v >> 2
--
Gitblit v1.8.0