Fix mutex lock issues (OCR and FR)
This commit is contained in:
@@ -6,6 +6,9 @@
|
||||
#include "opencv2/imgproc.hpp"
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <atomic>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include "LabVIEWHeader/extcode.h"
|
||||
#include "ANSLicense.h"
|
||||
#include "ANSOCRBase.h"
|
||||
@@ -25,8 +28,30 @@ namespace ANSCENTER {
|
||||
private:
|
||||
std::unique_ptr<PaddleOCR::PPOCR> ppocr = std::make_unique<PaddleOCR::PPOCR>();
|
||||
std::mutex _mutex;
|
||||
std::atomic<bool> _modelLoading{ false };
|
||||
cv::Mat _frameBuffer; // Reusable buffer for color conversion
|
||||
|
||||
// Try to lock _mutex with a timeout for non-recursive mutex
|
||||
std::unique_lock<std::mutex> TryLockWithTimeout(
|
||||
const char* caller, unsigned int timeoutMs = 5000)
|
||||
{
|
||||
const auto deadline = std::chrono::steady_clock::now()
|
||||
+ std::chrono::milliseconds(timeoutMs);
|
||||
std::unique_lock<std::mutex> lk(_mutex, std::defer_lock);
|
||||
while (!lk.try_lock()) {
|
||||
if (std::chrono::steady_clock::now() >= deadline) {
|
||||
_logger.LogWarn(caller,
|
||||
"Mutex acquisition timed out after "
|
||||
+ std::to_string(timeoutMs) + " ms"
|
||||
+ (_modelLoading.load() ? " (model loading in progress)" : ""),
|
||||
__FILE__, __LINE__);
|
||||
return lk;
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1));
|
||||
}
|
||||
return lk;
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user