From 6151028a8e0e63ed6967faa7c23ff56b076879df Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 05 四月 2019 11:22:03 +0800
Subject: [PATCH] 解决GB28181推多路流问题
---
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
index 4210f31..1c7ca29 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
@@ -54,10 +54,13 @@
//#todo map 1->2 modify 2->1
bool FaceDBCompareServer::compare(thread::id key, AlarmData *alarmData, int topN) {
+ m_dbRWLocks_Lock.wrlock();
if (m_dbRWLocks.find(key) == m_dbRWLocks.end()) {
m_dbRWLocks[key] = RWLock();
}
RWLock &t_rwl = m_dbRWLocks[key];
+ DBG("m_dbRWLocks ok");
+ m_dbRWLocks_Lock.unlock();
// ClockTimer clockTimer("compare ");
RWLock t_rwLock;
@@ -116,7 +119,9 @@
int maxSearchFaces = alarmData->num;
t_rwl.wrlock();
+ DBG("topResult[key] before");
auto &t_topResult = topResult[key];
+ DBG("topResult[key] ok");
t_topResult.clear();
for (auto &item : t_compareResults) {
auto &it = item.second;
--
Gitblit v1.8.0