From a2dfb4907fd11e0a64ba16419dce066509462297 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期三, 06 三月 2019 10:04:45 +0800 Subject: [PATCH] 修改部分bug --- QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp index efb8645..db552a4 100644 --- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp +++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp @@ -10,24 +10,24 @@ //RtspAnalysElement::RtspAnalysElement() {} -//std::string RtspAnalysElement::resetFdfs(std::string ip, unsigned int port, std::string content) { -// -// std::thread reset([&]() { -// fdfsClient.rwLock.rdlock(); -// if (fdfsClient.fastFds != nullptr) { -// delete fdfsClient.fastFds; -// } -// fdfsClient.fastFds = new FastFds("fastDfsClient.conf"); -// fdfsClient.rwLock.unlock(); -// }); -// reset.detach(); -// -// return ""; -//} +std::string RtspAnalysElement::resetFdfs(std::string ip, unsigned int port, std::string content) { + + std::thread reset([&]() { + fdfsClient.rwLock.rdlock(); + if (fdfsClient.fastFds != nullptr) { + delete fdfsClient.fastFds; + } + fdfsClient.fastFds = new FastFds("fastDfsClient.conf"); + fdfsClient.rwLock.unlock(); + }); + reset.detach(); + + return ""; +} RtspAnalysElement::RtspAnalysElement(LDBTool *_dbTool) : m_lDBTool(_dbTool), maxCount(50), currentCount(0) { init(); -// resetFdfs(); + resetFdfs(); { // std::thread httpServer([&]() { // //#todo port -- Gitblit v1.8.0