From 372e4a07b802f5966acc76d80179ee5569886e6f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 15 一月 2020 10:25:25 +0800
Subject: [PATCH] bug fixed
---
run.go | 86 +++++++++----------------------------------
1 files changed, 18 insertions(+), 68 deletions(-)
diff --git a/run.go b/run.go
index 50cf58f..03f9f23 100644
--- a/run.go
+++ b/run.go
@@ -2,24 +2,19 @@
import (
"context"
- "os"
"sync"
"time"
"face/common"
- "basic.com/libgowrapper/sdkstruct.git"
- "basic.com/pubsub/protomsg.git"
"basic.com/valib/gogpu.git"
)
-
-const maxTryBeforeReboot = 10
type face struct {
handle *SDKFace
maxChannel int
- ftrackChans map[string]chan protomsg.SdkMessage
+ ftrackChans map[string]chan common.MsgRS
ftrackChannels map[string]int
ftrackChanStats []bool
chnLock sync.Mutex
@@ -32,40 +27,6 @@
ipc2Rule string
ruleMsgMaxCacheSize int
reserved map[string]interface{}
-
- running bool
- rebootUntil int
- mtxRunning sync.Mutex
-}
-
-func (f *face) maybeReboot(ctx context.Context) {
- for {
- select {
- case <-ctx.Done():
- return
- default:
- f.mtxRunning.Lock()
- running := f.running
- f.mtxRunning.Unlock()
-
- if running {
- f.rebootUntil = 0
-
- f.mtxRunning.Lock()
- f.running = false
- f.mtxRunning.Unlock()
-
- } else {
- f.rebootUntil++
- f.fnLogger("Face No Running: ", f.rebootUntil)
- if f.rebootUntil > maxTryBeforeReboot {
- f.fnLogger("Face Too Long Running, Reboot")
- os.Exit(0)
- }
- }
- time.Sleep(time.Second)
- }
- }
}
// Create create sdk
@@ -139,7 +100,7 @@
handle: handle,
maxChannel: maxChan,
- ftrackChans: make(map[string]chan protomsg.SdkMessage, maxChan),
+ ftrackChans: make(map[string]chan common.MsgRS, maxChan),
ftrackChannels: make(map[string]int, maxChan),
ftrackChanStats: make([]bool, maxChan, maxChan),
@@ -151,9 +112,6 @@
ipc2Rule: ipc2Rule,
ruleMsgMaxCacheSize: ruleMaxSize,
reserved: reserved,
-
- running: true,
- rebootUntil: maxTryBeforeReboot,
}
}
@@ -173,8 +131,8 @@
)
ipcRcv := common.GetIpcAddress(s.shm, s.id+postPull)
ipcSnd := common.GetIpcAddress(s.shm, s.id+postPush)
- chRcv := make(chan []byte, s.maxChannel)
- chSnd := make(chan sdkstruct.MsgSDK, s.maxChannel)
+ chRcv := make(chan common.MsgRS, s.maxChannel)
+ chSnd := make(chan common.MsgRS, s.maxChannel)
rcver := common.NewReciever(ipcRcv, chRcv, s.shm, s.fnLogger)
snder := common.NewSender(ipcSnd, chSnd, s.shm, s.fnLogger)
@@ -187,8 +145,6 @@
go torule.Run(ctx)
go s.run(ctx, chRcv, chSnd)
-
- go s.maybeReboot(ctx)
}
//////////////////////////////////////////////////////////////////
@@ -223,36 +179,33 @@
f.chnLock.Unlock()
}
-func (f *face) run(ctx context.Context, in <-chan []byte, out chan<- sdkstruct.MsgSDK) {
-
- chMsg := make(chan protomsg.SdkMessage, f.maxChannel)
- go common.UnserilizeProto(ctx, in, chMsg, f.fnLogger)
+func (f *face) run(ctx context.Context, in <-chan common.MsgRS, out chan<- common.MsgRS) {
for {
select {
case <-ctx.Done():
f.handle.Free()
return
- case rMsg := <-chMsg:
+ case rMsg := <-in:
if !common.ValidRemoteMessage(rMsg, f.typ, f.fnLogger) {
f.fnLogger("FACE TRACK VALIDREMOTEMESSAGE INVALID")
common.EjectResult(nil, rMsg, out)
continue
}
- if _, ok := f.ftrackChans[rMsg.Cid]; ok {
+ if _, ok := f.ftrackChans[rMsg.Msg.Cid]; ok {
f.fnLogger("Face Cache Size: ", len(f.ftrackChans))
- f.ftrackChans[rMsg.Cid] <- rMsg
+ f.ftrackChans[rMsg.Msg.Cid] <- rMsg
} else {
- f.ftrackChans[rMsg.Cid] = make(chan protomsg.SdkMessage, f.maxChannel)
+ f.ftrackChans[rMsg.Msg.Cid] = make(chan common.MsgRS, f.maxChannel)
chn := f.getAvailableChn()
if chn < 0 {
f.fnLogger("TOO MUCH CHANNEL")
common.EjectResult(nil, rMsg, out)
continue
}
- f.ftrackChannels[rMsg.Cid] = chn
+ f.ftrackChannels[rMsg.Msg.Cid] = chn
i := common.UnpackImage(rMsg, f.typ, f.fnLogger)
if i == nil {
@@ -262,9 +215,9 @@
// conv to bgr24 and resize
imgW, imgH := int(i.Width), int(i.Height)
ret := f.handle.TrackerResize(imgW, imgH, chn)
- f.fnLogger("ResizeFaceTracker: cid: ", rMsg.Cid, " chan: ", chn, " wXh: ", imgW, "x", imgH, " result:", ret)
- go f.detectTrackOneChn(ctx, f.ftrackChans[rMsg.Cid], out, chn)
- f.ftrackChans[rMsg.Cid] <- rMsg
+ f.fnLogger("ResizeFaceTracker: cid: ", rMsg.Msg.Cid, " chan: ", chn, " wXh: ", imgW, "x", imgH, " result:", ret)
+ go f.detectTrackOneChn(ctx, f.ftrackChans[rMsg.Msg.Cid], out, chn)
+ f.ftrackChans[rMsg.Msg.Cid] <- rMsg
}
default:
time.Sleep(time.Millisecond * 100)
@@ -272,7 +225,7 @@
}
}
-func (f *face) detectTrackOneChn(ctx context.Context, in <-chan protomsg.SdkMessage, out chan<- sdkstruct.MsgSDK, dtchn int) {
+func (f *face) detectTrackOneChn(ctx context.Context, in <-chan common.MsgRS, out chan<- common.MsgRS, dtchn int) {
tm := time.Now()
sc := 0
f.fnLogger("DETECTTRACKONECHN DTCHN: ", dtchn)
@@ -301,20 +254,17 @@
// conv to bgr24 and resize
imgW, imgH := int(i.Width), int(i.Height)
- f.fnLogger("Face Start Run:", dtchn, "CAMERAID: ", rMsg.Cid)
+ f.fnLogger("Face Start Run:", dtchn, "CAMERAID: ", rMsg.Msg.Cid)
count, data, _ := f.handle.Run(i.Data, imgW, imgH, 3, dtchn)
common.EjectResult(data, rMsg, out)
- f.mtxRunning.Lock()
- f.running = true
- f.mtxRunning.Unlock()
var id, name string
- if rMsg.Tasklab != nil {
- id, name = rMsg.Tasklab.Taskid, rMsg.Tasklab.Taskname
+ if rMsg.Msg.Tasklab != nil {
+ id, name = rMsg.Msg.Tasklab.Taskid, rMsg.Msg.Tasklab.Taskname
}
- f.fnLogger("Chan:", dtchn, "CAMERAID: ", rMsg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT ", f.typ, " COUNT: ", count)
+ f.fnLogger("Chan:", dtchn, "CAMERAID: ", rMsg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT ", f.typ, " COUNT: ", count)
sc++
if sc == 25 {
--
Gitblit v1.8.0