Fix mutex lock issues (OCR and FR)
This commit is contained in:
@@ -1046,6 +1046,46 @@ namespace ANSCENTER
|
||||
MoveDetectsHandler _handler;
|
||||
const size_t QUEUE_SIZE = 10;
|
||||
std::recursive_mutex _mutex;
|
||||
std::atomic<bool> _modelLoading{ false };
|
||||
|
||||
// Pre-inference gate for ANSFDBase subclasses
|
||||
bool PreInferenceCheck(const char* caller) {
|
||||
if (_modelLoading.load()) return false;
|
||||
auto lk = TryLockWithTimeout(caller);
|
||||
if (!lk.owns_lock()) return false;
|
||||
if (!_licenseValid || !_isInitialized)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
struct ModelLoadingGuard {
|
||||
std::atomic<bool>& flag;
|
||||
explicit ModelLoadingGuard(std::atomic<bool>& f) : flag(f) { flag.store(true); }
|
||||
~ModelLoadingGuard() { flag.store(false); }
|
||||
ModelLoadingGuard(const ModelLoadingGuard&) = delete;
|
||||
ModelLoadingGuard& operator=(const ModelLoadingGuard&) = delete;
|
||||
};
|
||||
|
||||
std::unique_lock<std::recursive_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::recursive_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;
|
||||
}
|
||||
|
||||
ANSCENTER::EngineType engineType;
|
||||
|
||||
bool _facelivenessEngineValid{ false };
|
||||
|
||||
Reference in New Issue
Block a user