Fix model extract race issue to all classes
This commit is contained in:
@@ -55,6 +55,15 @@ namespace ANSCENTER {
|
||||
ANS_DBG("FaceRecognizer", "ANSFRBase::Initialize FAILED");
|
||||
return false;
|
||||
}
|
||||
// Serialize derived init against concurrent extract re-entries on the
|
||||
// same folder. See ModelFolderLockGuard in Utility.h.
|
||||
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSFR::Initialize");
|
||||
if (!_flg.acquired()) {
|
||||
this->_logger.LogError("ANSFR::Initialize",
|
||||
"Timed out waiting for model-folder lock: " + _modelFolder,
|
||||
__FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
#ifdef CPU_MODE
|
||||
engineType = EngineType::CPU;
|
||||
ANS_DBG("FaceRecognizer", "CPU_MODE forced: engineType=CPU");
|
||||
@@ -199,6 +208,15 @@ namespace ANSCENTER {
|
||||
try {
|
||||
bool result = ANSFRBase::LoadModel(modelZipFilePath, modelZipPassword);
|
||||
if (!result) return false;
|
||||
// Serialize derived init against concurrent extract re-entries on the
|
||||
// same folder. See ModelFolderLockGuard in Utility.h.
|
||||
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSFaceRecognizer::LoadModel");
|
||||
if (!_flg.acquired()) {
|
||||
this->_logger.LogError("ANSFaceRecognizer::LoadModel",
|
||||
"Timed out waiting for model-folder lock: " + _modelFolder,
|
||||
__FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (engineType == EngineType::NVIDIA_GPU) {
|
||||
std::string onnxfile = CreateFilePath(_modelFolder, "ansfacerecognizer.onnx");
|
||||
|
||||
Reference in New Issue
Block a user