From 0688756b71b40e0ac60c68af2fa1fe4aaeb1718d Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 13 二月 2017 16:27:41 +0800
Subject: [PATCH] replace log to support android
---
RtspFace/SensetimeFaceAPIWrapper/src/FaceDBPool.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/RtspFace/SensetimeFaceAPIWrapper/src/FaceDBPool.cpp b/RtspFace/SensetimeFaceAPIWrapper/src/FaceDBPool.cpp
index 147d4e1..680d1e0 100644
--- a/RtspFace/SensetimeFaceAPIWrapper/src/FaceDBPool.cpp
+++ b/RtspFace/SensetimeFaceAPIWrapper/src/FaceDBPool.cpp
@@ -9,7 +9,7 @@
int ret = pthread_mutex_lock((pthread_mutex_t*)mut); \
if(ret != 0) \
{ \
- LOG_ERROR << "pthread_mutex_lock " << #mut << ": " << ret; \
+ LOG_ERROR << "pthread_mutex_lock " << #mut << ": " << ret << std::endl; \
return _ret; \
} \
}
@@ -18,7 +18,7 @@
int ret = pthread_mutex_unlock((pthread_mutex_t*)mut); \
if(ret != 0) \
{ \
- LOG_ERROR << "pthread_mutex_unlock " << #mut << ": " << ret; \
+ LOG_ERROR << "pthread_mutex_unlock " << #mut << ": " << ret << std::endl; \
return _ret; \
} \
}
@@ -40,7 +40,7 @@
{
int dbid;
pthread_mutex_t db_mutex;
- faceAPI* api;
+ FaceDB* api;
ThreadSafeFaceDB() : dbid(-1), db_mutex(), api(nullptr)
{
@@ -69,7 +69,7 @@
facedb_map_t* _face_db_map = (facedb_map_t*)face_db_map;
for (facedb_map_t::iterator iter = _face_db_map->begin(); iter != _face_db_map->end(); ++iter)
{
- iter->second->api->db_save();
+ iter->second->api->finally();
delete iter->second->api;
delete iter->second;
}
@@ -81,7 +81,7 @@
pool_mutex = nullptr;
}
-void FaceDBPool::manage(int dbid, faceAPI* db)
+void FaceDBPool::manage(int dbid, FaceDB* db)
{
if (dbid < 0 || db == nullptr)
return;
@@ -109,14 +109,14 @@
if (iter == _face_db_map->end())
return;
- iter->second->api->db_save();
+ iter->second->api->finally();
delete iter->second->api;
delete iter->second;
_face_db_map->erase(iter);
}
-faceAPI* FaceDBPool::get_free(int dbid)
+FaceDB* FaceDBPool::get_free(int dbid)
{
ThreadSafeFaceDB* tsfdb = nullptr;
{
--
Gitblit v1.8.0