Fix model extract race issue to all classes
This commit is contained in:
@@ -691,6 +691,15 @@ namespace ANSCENTER
|
||||
try {
|
||||
bool result = ANSODBase::Initialize(licenseKey, modelConfig, modelZipFilePath, modelZipPassword, labelMap);
|
||||
if (!result) return false;
|
||||
// Serialize derived init against concurrent extract re-entries on the
|
||||
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
|
||||
ModelFolderLockGuard _flg(_modelFolder, "ANSSAM3::Initialize");
|
||||
if (!_flg.acquired()) {
|
||||
this->_logger.LogError("ANSSAM3::Initialize",
|
||||
"Timed out waiting for model-folder lock: " + _modelFolder,
|
||||
__FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
_modelConfig.detectionType = DetectionType::SEGMENTATION;
|
||||
if (_modelConfig.modelConfThreshold < 0.1f)
|
||||
@@ -751,6 +760,15 @@ namespace ANSCENTER
|
||||
try {
|
||||
bool result = ANSODBase::LoadModel(modelZipFilePath, modelZipPassword);
|
||||
if (!result) return false;
|
||||
// Serialize derived init against concurrent extract re-entries on the
|
||||
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
|
||||
ModelFolderLockGuard _flg(_modelFolder, "ANSSAM3::LoadModel");
|
||||
if (!_flg.acquired()) {
|
||||
this->_logger.LogError("ANSSAM3::LoadModel",
|
||||
"Timed out waiting for model-folder lock: " + _modelFolder,
|
||||
__FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
_modelConfig.detectionType = DetectionType::SEGMENTATION;
|
||||
if (_modelConfig.modelConfThreshold < 0.1f)
|
||||
@@ -809,6 +827,15 @@ namespace ANSCENTER
|
||||
try {
|
||||
bool result = ANSODBase::LoadModelFromFolder(licenseKey, modelConfig, modelName, className, modelFolder, labelMap);
|
||||
if (!result) return false;
|
||||
// Serialize derived init against concurrent extract re-entries on the
|
||||
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
|
||||
ModelFolderLockGuard _flg(_modelFolder, "ANSSAM3::LoadModelFromFolder");
|
||||
if (!_flg.acquired()) {
|
||||
this->_logger.LogError("ANSSAM3::LoadModelFromFolder",
|
||||
"Timed out waiting for model-folder lock: " + _modelFolder,
|
||||
__FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
_modelConfig = modelConfig;
|
||||
_modelConfig.detectionType = DetectionType::SEGMENTATION;
|
||||
|
||||
Reference in New Issue
Block a user