From 25f94726888e19d6efed7b393217d9f56a0ca767 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 18:44:46 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
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