Fix model extract race issue to all classes
This commit is contained in:
@@ -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__);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user