Fix mutex lock issues
This commit is contained in:
@@ -35,6 +35,7 @@ namespace ANSCENTER {
|
||||
|
||||
bool ANSSAM::LoadModel(const std::string& modelZipFilePath, const std::string& modelZipPassword) {
|
||||
std::lock_guard<std::recursive_mutex> lock(_mutex);
|
||||
ModelLoadingGuard mlg(_modelLoading);
|
||||
try {
|
||||
bool result = ANSODBase::LoadModel(modelZipFilePath, modelZipPassword);
|
||||
if (!result) return false;
|
||||
@@ -67,6 +68,7 @@ namespace ANSCENTER {
|
||||
}
|
||||
bool ANSSAM::LoadModelFromFolder(std::string licenseKey, ModelConfig modelConfig, std::string modelName, std::string className, const std::string& modelFolder, std::string& labelMap) {
|
||||
std::lock_guard<std::recursive_mutex> lock(_mutex);
|
||||
ModelLoadingGuard mlg(_modelLoading);
|
||||
try {
|
||||
bool result = ANSODBase::LoadModelFromFolder(licenseKey, modelConfig, modelName, className, modelFolder, labelMap);
|
||||
if (!result) return false;
|
||||
@@ -108,6 +110,7 @@ namespace ANSCENTER {
|
||||
{
|
||||
try {
|
||||
std::lock_guard<std::recursive_mutex> lock(_mutex);
|
||||
ModelLoadingGuard mlg(_modelLoading);
|
||||
_modelConfig = modelConfig;
|
||||
bool result = ANSODBase::Initialize(licenseKey, modelConfig, modelZipFilePath, modelZipPassword, labelMap);
|
||||
if (!result) return false;
|
||||
@@ -146,7 +149,7 @@ namespace ANSCENTER {
|
||||
}
|
||||
std::vector<Object> ANSSAM::RunInference(const cv::Mat& input,const std::string& camera_id)
|
||||
{
|
||||
std::lock_guard<std::recursive_mutex> lock(_mutex);
|
||||
if (!PreInferenceCheck("ANSSAM::RunInference")) return {};
|
||||
|
||||
try {
|
||||
if (!_licenseValid || !_isInitialized || input.empty() ||
|
||||
|
||||
Reference in New Issue
Block a user