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 | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index dc69af8..9bf036e 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -2,12 +2,14 @@
import (
"basic.com/pubsub/protomsg.git"
- "github.com/golang/protobuf/proto"
"basic.com/valib/logger.git"
+ "github.com/golang/protobuf/proto"
"ruleprocess/structure"
+ "sync"
)
var TrackPond = make(map[string]*PersonTrack)
+var lock = sync.RWMutex{}
type PersonTrack struct {
Faces []*Face // 浜鸿劯鐨勬暟缁� 鏀逛负鏁伴噺
@@ -35,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 + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
@@ -83,18 +89,26 @@
} 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
@@ -149,7 +163,9 @@
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 { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
@@ -180,10 +196,14 @@
} else {
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
+ lock.Lock()
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+ lock.Unlock()
}
}
} else {
+ lock.Lock()
TrackPond[cameraId] = &PersonTrack{Faces: nil}
+ lock.Unlock()
}
}
--
Gitblit v1.8.0