From af0d6c12d1ae7debb72b30e18d37581cda866137 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 13 一月 2020 10:43:36 +0800
Subject: [PATCH] debug
---
run.go | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/run.go b/run.go
index cc5a50b..d24d1e3 100644
--- a/run.go
+++ b/run.go
@@ -14,16 +14,12 @@
type channel struct {
index int
- msg chan protomsg.SdkMessage
+ life int
}
-//////////////////////////////////////////////////////////////////
-const (
- cacheFrameNum = 3
- trackChnTimeout = time.Duration(10)
-)
-
func (f *face) channelAvailable() int {
+ f.mapChanLock.Lock()
+ defer f.mapChanLock.Unlock()
for i := 0; i < f.maxChannel; i++ {
found := false
@@ -40,13 +36,6 @@
return -1
}
-func (f *face) channelRelease(id string) {
- f.mapChanLock.Lock()
- defer f.mapChanLock.Unlock()
-
- delete(f.mapChan, id)
-}
-
func (f *face) channelExist(id string) (*channel, bool) {
f.mapChanLock.Lock()
defer f.mapChanLock.Unlock()
@@ -56,28 +45,57 @@
}
func (f *face) channelNew(id string) *channel {
- f.mapChanLock.Lock()
- defer f.mapChanLock.Unlock()
index := f.channelAvailable()
if index < 0 {
return nil
}
+ f.mapChanLock.Lock()
c := &channel{
index: index,
- msg: make(chan protomsg.SdkMessage, cacheFrameNum),
+ life: f.maxLife,
}
-
f.mapChan[id] = c
+ f.mapChanLock.Unlock()
+
return c
+}
+
+func (f *face) maintainChannel(ctx context.Context, ch <-chan string) {
+ for {
+ select {
+ case <-ctx.Done():
+ return
+ case id := <-ch:
+ f.mapChanLock.Lock()
+ for k, v := range f.mapChan {
+ v.life--
+ if k == id {
+ v.life = f.maxLife
+ }
+ }
+ for k, v := range f.mapChan {
+ if v.life < 0 {
+ delete(f.mapChan, k)
+ }
+ }
+ f.mapChanLock.Unlock()
+
+ default:
+ time.Sleep(10 * time.Millisecond)
+ }
+ }
}
type face struct {
handle *SDKFace
list *sdkhelper.LockList
- maxChannel int
+ maxChannel int
+
+ maxLife int
+ chLife chan string
mapChan map[string]*channel
mapChanLock sync.Mutex
@@ -162,6 +180,8 @@
handle: handle,
list: sdkhelper.NewLockList(maxChan + maxChan/2),
+ maxLife: trckInterval * 10,
+ chLife: make(chan string, maxChan),
maxChannel: maxChan,
mapChan: make(map[string]*channel, maxChan),
@@ -186,19 +206,24 @@
func Run(ctx context.Context, i interface{}) {
s := i.(*face)
+ go s.maintainChannel(ctx, s.chLife)
+
chRcv, chSnd := sdkhelper.FlowCreate(ctx, s.id, s.shm, s.ipc2Rule, s.ruleMsgMaxCacheSize, s.fnLogger)
go sdkhelper.FlowBatch(ctx, chRcv, chSnd, s.typ, s.list.Push, s.list.Drain, s.run, s.release, s.fnLogger)
}
func (f *face) run(msgs []protomsg.SdkMessage, out chan<- sdkstruct.MsgSDK, typ string) {
- f.fnLogger("######run batch images")
+ wg := &sync.WaitGroup{}
for _, msg := range msgs {
+ f.fnLogger("######Maintain :", msg.Cid)
+ f.chLife <- msg.Cid
+ f.fnLogger("######Maintain Over :", msg.Cid)
+
if c, ok := f.channelExist(msg.Cid); ok {
- f.fnLogger("######push image")
- c.msg <- msg
- f.fnLogger("######push over image")
+ wg.Add(1)
+ go f.track(wg, &msg, c.index, out)
} else {
nc := f.channelNew(msg.Cid)
@@ -217,78 +242,52 @@
imgW, imgH := int(i.Width), int(i.Height)
ret := f.handle.TrackerResize(imgW, imgH, nc.index)
f.fnLogger("ResizeFaceTracker: cid: ", msg.Cid, " chan: ", nc.index, " wXh: ", imgW, "x", imgH, " result:", ret)
- go f.detectTrackOneChn(nc, out)
- nc.msg <- msg
+ wg.Add(1)
+ go f.track(wg, &msg, nc.index, out)
}
}
- f.fnLogger("######run over batch images")
-
+ wg.Wait()
+ f.fnLogger("######Wait for All track")
}
-func (f *face) detectTrackOneChn(c *channel, out chan<- sdkstruct.MsgSDK) {
- tm := time.Now()
- sc := 0
+func (f *face) track(wg *sync.WaitGroup, msg *protomsg.SdkMessage, tchan int, out chan<- sdkstruct.MsgSDK) {
- dtchn := c.index
- f.fnLogger("DETECTTRACKONECHN DTCHN: ", dtchn)
- var curCid string
+ defer wg.Done()
- for {
- select {
- case rMsg := <-c.msg:
+ rMsg := *msg
- if !sdkhelper.ValidRemoteMessage(rMsg, f.typ, f.fnLogger) {
- sdkhelper.EjectResult(nil, rMsg, out)
- f.fnLogger("Face!!!!!!SkdMessage Invalid")
+ f.fnLogger("######Recv From: ", rMsg.Cid, " Chan: ", tchan)
- continue
- }
+ if !sdkhelper.ValidRemoteMessage(rMsg, f.typ, f.fnLogger) {
+ sdkhelper.EjectResult(nil, rMsg, out)
+ f.fnLogger("Face!!!!!!SkdMessage Invalid: ", tchan)
- i := sdkhelper.UnpackImage(rMsg, f.typ, f.fnLogger)
- if i == nil || i.Data == nil || i.Width <= 0 || i.Height <= 0 {
- sdkhelper.EjectResult(nil, rMsg, out)
- f.fnLogger("Face!!!!!!Unpack Image From SkdMessage Failed")
-
- continue
- }
-
- curCid = i.Cid
-
- // conv to bgr24 and resize
- imgW, imgH := int(i.Width), int(i.Height)
-
- f.fnLogger("######face sdk run")
- count, data, _ := f.handle.Run(i.Data, imgW, imgH, 3, dtchn)
- f.fnLogger("######face over sdk run")
-
- f.fnLogger("######face eject data")
- sdkhelper.EjectResult(data, rMsg, out)
- f.fnLogger("######face over eject data")
-
- var id, name string
- if rMsg.Tasklab != nil {
- id, name = rMsg.Tasklab.Taskid, rMsg.Tasklab.Taskname
- }
- f.fnLogger("CAMERAID: ", rMsg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT ", f.typ, " COUNT: ", count)
-
- sc++
- if sc == 25 {
- f.fnLogger("CHAN:%d, FACE RUN 25 FRAME USE TIME: ", dtchn, time.Since(tm))
- sc = 0
- tm = time.Now()
- }
-
- if time.Since(tm) > time.Second {
- f.fnLogger("CHAN: ", dtchn, " FACE RUN ", sc, " FRAME USE TIME: ", time.Since(tm))
- sc = 0
- tm = time.Now()
- }
- case <-time.After(trackChnTimeout * time.Second):
- f.fnLogger("Timeout to get image, curCid:", curCid)
- if curCid != "" {
- f.channelRelease(curCid)
- }
- return
- }
+ return
}
+
+ i := sdkhelper.UnpackImage(rMsg, f.typ, f.fnLogger)
+ if i == nil || i.Data == nil || i.Width <= 0 || i.Height <= 0 {
+ sdkhelper.EjectResult(nil, rMsg, out)
+ f.fnLogger("Face!!!!!!Unpack Image From SkdMessage Failed: ", tchan)
+
+ return
+ }
+
+ // conv to bgr24 and resize
+ imgW, imgH := int(i.Width), int(i.Height)
+
+ f.fnLogger("######Run cid:", rMsg.Cid, "chan: ", tchan)
+ count, data, _ := f.handle.Run(i.Data, imgW, imgH, 3, tchan)
+ f.fnLogger("######Over run cid:", rMsg.Cid, "chan: ", tchan)
+
+ f.fnLogger("######Eject cid:", rMsg.Cid, "chan: ", tchan)
+ sdkhelper.EjectResult(data, rMsg, out)
+ f.fnLogger("######Over eject cid:", rMsg.Cid, "chan: ", tchan)
+
+ var id, name string
+ if rMsg.Tasklab != nil {
+ id, name = rMsg.Tasklab.Taskid, rMsg.Tasklab.Taskname
+ }
+ f.fnLogger("Chan: ", tchan, "CAMERAID: ", rMsg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT ", f.typ, " COUNT: ", count)
+
}
--
Gitblit v1.8.0