From a624336de555c4fcdaac56497f3f36ab920df1d5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 13 一月 2020 09:15:27 +0800
Subject: [PATCH] debug
---
run.go | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/run.go b/run.go
index 3e9c399..06eb86a 100644
--- a/run.go
+++ b/run.go
@@ -23,6 +23,8 @@
)
func (f *face) channelAvailable() int {
+ f.mapChanLock.Lock()
+ defer f.mapChanLock.Unlock()
for i := 0; i < f.maxChannel; i++ {
found := false
@@ -55,20 +57,20 @@
}
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,
- msgs: sdkhelper.NewLockList(6),
+ msgs: sdkhelper.NewLockList(3),
}
-
f.mapChan[id] = c
+ f.mapChanLock.Unlock()
+
return c
}
@@ -191,8 +193,6 @@
func (f *face) run(msgs []protomsg.SdkMessage, out chan<- sdkstruct.MsgSDK, typ string) {
- f.fnLogger("######run batch images")
-
for _, msg := range msgs {
if c, ok := f.channelExist(msg.Cid); ok {
f.fnLogger("######push image: ", c.index)
@@ -220,8 +220,6 @@
nc.msgs.Push(msg)
}
}
- f.fnLogger("######run over batch images")
-
}
func (f *face) detectTrackOneChn(c *channel, out chan<- sdkstruct.MsgSDK) {
@@ -236,7 +234,7 @@
select {
case <-time.After(trackChnTimeout * time.Second):
- f.fnLogger("Timeout to get image, curCid:", curCid)
+ f.fnLogger("######Timeout to get image, curCid:", curCid)
if curCid != "" {
f.channelRelease(curCid)
}
@@ -270,13 +268,9 @@
// conv to bgr24 and resize
imgW, imgH := int(i.Width), int(i.Height)
- f.fnLogger("######face sdk run: ", dtchn)
count, data, _ := f.handle.Run(i.Data, imgW, imgH, 3, dtchn)
- f.fnLogger("######face over sdk run: ", dtchn)
- f.fnLogger("######face eject data: ", dtchn)
sdkhelper.EjectResult(data, rMsg, out)
- f.fnLogger("######face over eject data: ", dtchn)
var id, name string
if rMsg.Tasklab != nil {
--
Gitblit v1.8.0