ANSCENTER/ANSCORE
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix model extract race issue to all classes

Browse Source
This commit is contained in:
Tuan Nghia Nguyen
2026-04-24 12:19:54 +10:00
parent baa88bcc48
commit e2bf17289d
51 changed files with 1252 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ANSLPR/ANSLPR.cpp
View File

@@ -518,6 +518,15 @@ namespace ANSCENTER {
this->_logger.LogError("ANSFDBase::Initialize. Output model folder is not exist", _modelFolder, __FILE__, __LINE__);
return false; // That means the model file is not exist or the password is not correct
}
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
return true;
}
catch (std::exception& e) {

18
modules/ANSLPR/ANSLPR_CPU.cpp
View File

@@ -304,6 +304,15 @@ namespace ANSCENTER {
this->_logger.LogError("ANSALPR_CPU::Initialize. Output model folder is not exist", _modelFolder, __FILE__, __LINE__);
return false; // That means the model file is not exist or the password is not correct
}
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR_CPU::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR_CPU::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// 3. Load LD model
alprChecker.Init(MAX_ALPR_FRAME);
@@ -317,6 +326,15 @@ namespace ANSCENTER {
bool ANSALPR_CPU::LoadEngine() {
std::lock_guard<std::recursive_mutex> lock(_mutex);
try {
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR_CPU::LoadEngine");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR_CPU::LoadEngine",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// 1. Load license plate detection model (using CPU OpenVINO)
if (_lprDetector) _lprDetector.reset();
std::string lprModel = CreateFilePath(_modelFolder, "lprModel.xml");

18
modules/ANSLPR/ANSLPR_OCR.cpp
View File

@@ -177,6 +177,15 @@ namespace ANSCENTER
this->_logger.LogError("ANSALPR_OCR::Initialize", "Output model folder does not exist: " + _modelFolder, __FILE__, __LINE__);
return false;
}
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR_OCR::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR_OCR::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// Check country from country.txt
std::string countryFile = CreateFilePath(_modelFolder, "country.txt");
@@ -216,6 +225,15 @@ namespace ANSCENTER
bool ANSALPR_OCR::LoadEngine() {
std::lock_guard<std::recursive_mutex> lock(_mutex);
try {
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR_OCR::LoadEngine");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR_OCR::LoadEngine",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
WriteEventLog("ANSALPR_OCR::LoadEngine: Step 1 - Starting engine load");
this->_logger.LogInfo("ANSALPR_OCR::LoadEngine", "Step 1: Starting engine load", __FILE__, __LINE__);

18
modules/ANSLPR/ANSLPR_OD.cpp
View File

@@ -431,6 +431,15 @@ namespace ANSCENTER {
this->_logger.LogError("ANSALPR_OD::Initialize. Output model folder is not exist", _modelFolder, __FILE__, __LINE__);
return false; // That means the model file is not exist or the password is not correct
}
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR_OD::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR_OD::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// Check country
std::string countryFile = CreateFilePath(_modelFolder, "country.txt");
@@ -509,6 +518,15 @@ namespace ANSCENTER {
bool ANSALPR_OD::LoadEngine() {
std::lock_guard<std::recursive_mutex> lock(_mutex);
try {
// Serialize init against concurrent extract re-entries on the same
// folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSALPR_OD::LoadEngine");
if (!_flg.acquired()) {
this->_logger.LogError("ANSALPR_OD::LoadEngine",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
WriteEventLog("ANSALPR_OD::LoadEngine: Step 1 - Starting engine load");
this->_logger.LogInfo("ANSALPR_OD::LoadEngine", "Step 1: Starting engine load", __FILE__, __LINE__);