From cf6237c84f750ff595064c6685039ebffd4ef50d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 22 十月 2019 09:45:28 +0800
Subject: [PATCH] 对人脸追踪加锁
---
ruleserver/personTrack.go | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 19bec0c..9bf036e 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -2,11 +2,14 @@
import (
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/logger.git"
"github.com/golang/protobuf/proto"
- "ruleprocess/logger"
+ "ruleprocess/structure"
+ "sync"
)
var TrackPond = make(map[string]*PersonTrack)
+var lock = sync.RWMutex{}
type PersonTrack struct {
Faces []*Face // 浜鸿劯鐨勬暟缁� 鏀逛负鏁伴噺
@@ -20,7 +23,7 @@
var num int = 25
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
func FaceIsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
@@ -34,9 +37,13 @@
} else {
if TrackPond[msg.Cid] != nil {
logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+ lock.Lock()
TrackPond[msg.Cid].Faces = nil
+ lock.Unlock()
} else {
+ lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ lock.Unlock()
logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
@@ -50,7 +57,7 @@
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
func BodyIsSame(msg *protomsg.SdkMessage) bool{
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
if len(sdkinfo.Sdkdata) > 1 {
@@ -82,30 +89,38 @@
} else {
if TrackPond[msg.Cid] != nil {
logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ lock.Lock()
TrackPond[msg.Cid].Yolo = yoloNum
+ lock.Unlock()
} else {
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
+ lock.Unlock()
}
return false
}
} else {
if TrackPond[msg.Cid] != nil {
+ lock.Lock()
TrackPond[msg.Cid].Yolo = 0
+ lock.Unlock()
} else {
+ lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
+ lock.Unlock()
}
logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0")
continue
}
}
}
- logger.Debug("---------------------------------杩借釜缁撴潫--------------------------------------")
+ logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
return false
}
func TrackOrNot(label map[string]interface{}) bool{
- if label["yolo"] != nil && len(label["yolo"].([]Result)) > 0 {
- for _,res := range label["yolo"].([]Result) {
+ if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
+ for _,res := range label["yolo"].([]structure.Result) {
if res.TimeLabel == "10" {
return true
}
@@ -115,16 +130,21 @@
}
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
-func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) string {
+func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
if TrackPond[cameraId] != nil {
logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
+ for _,face := range TrackPond[cameraId].Faces {
+ logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�",face.Id,face.Score)
+ }
faceParam := protomsg.ParamFacePos{}
err := proto.Unmarshal(sdkinfor.Sdkdata, &faceParam)
if err != nil {
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
}
logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
-
+ for _,face := range faceParam.Faces {
+ logger.Info("鏂版潵鐨勭殑face鏁版嵁锛�",face.Pos.FaceID,face.Pos.FAngle.Confidence)
+ }
var facesTemp []protomsg.ResultFaceDetect
for _,face := range faceParam.Faces {
facesTemp = append(facesTemp,*face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
@@ -143,21 +163,26 @@
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence > val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
faceFlag = true
logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
+ lock.Lock()
val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
+ lock.Unlock()
}
}
if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
- logger.Info("娣诲姞鏁版嵁鏇存柊缂撳瓨")
+ logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
i++
}
}
logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
+ logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
+ for _, temp := range facesTemp {
+ logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�",temp.Pos.FaceID,temp.Pos.FAngle.Confidence)
+ }
sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
}
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
// 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
for i := 0; i < len(TrackPond[cameraId].Faces); {
flag := false
@@ -170,12 +195,15 @@
i++
} else {
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
- logger.Info("鍒犻櫎鏁版嵁鏇存柊缂撳瓨")
+ logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
+ lock.Lock()
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+ lock.Unlock()
}
}
} else {
- return "false"
+ lock.Lock()
+ TrackPond[cameraId] = &PersonTrack{Faces: nil}
+ lock.Unlock()
}
- return "false"
}
--
Gitblit v1.8.0