From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp
index 1b83824..0485c6a 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp
@@ -6,8 +6,8 @@
#include <THFeature_i.h>
FaceExtractServerI::FaceExtractServerI() {
- long threadMax = appPref.getLongData("thread.max");
- long gpuIndex = appPref.getLongData("gpu.index");
+ long threadMax = appPref.getIntData("thread.max");
+ long gpuIndex = appPref.getIntData("gpu.index");
for (int i = 0; i < threadMax; i++) {
extractResourcesManager.pushResource(i);
}
@@ -31,6 +31,7 @@
FaceDetect::Data FaceExtractServerI::faceExtract(Ice::Int width, Ice::Int height, const FaceDetect::FacePos &pos,
const std::string &shareMemoryName, const Ice::Current &) {
ClockTimer ct("FaceExtractServerI::faceExtract");
+ INFO("faceExtract");
QSharedMemory shareMemory(QString(shareMemoryName.c_str()));
FaceDetect::Data feature;
if (shareMemory.attach()) {
@@ -46,7 +47,8 @@
}
return feature;
} else {
- throw std::runtime_error("shareMemory attach faild");
+ ERR("shareMemory attach faild");
+// throw std::runtime_error("shareMemory attach faild");
}
}
--
Gitblit v1.8.0