IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed callback copy count (#6607)

Browse Source
This commit is contained in:
Anton Pankratv 2021-09-30 15:09:47 +03:00 committed by GitHub
parent 757db35528
commit fab4056ceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inference-engine/src/plugin_api/cpp_interfaces/impl/ie_infer_async_request_thread_safe_default.hpp
View File

@ -404,15 +404,18 @@ private:
{
std::lock_guard<std::mutex> lock{_mutex};
_state = InferState::Idle;
callback = _callback;
std::swap(callback, _callback);
}
if (callback) {
try {
auto local_callback = std::move(callback);
local_callback(currentException);
callback(currentException);
} catch (...) {
currentException = std::current_exception();
}
std::lock_guard<std::mutex> lock{_mutex};
if (!_callback) {
std::swap(callback, _callback);
}
}
if (nullptr == currentException) {
promise.set_value();

17
inference-engine/tests/functional/plugin/shared/include/behavior/infer_request/callback.hpp
View File

@ -145,4 +145,21 @@ TEST_P(InferRequestCallbackTests, ReturnResultNotReadyFromWaitInAsyncModeForTooS
ASSERT_NO_THROW(req.Wait(InferenceEngine::InferRequest::WaitMode::RESULT_READY));
}
TEST_P(InferRequestCallbackTests, ImplDoseNotCopyCallback) {
// Skip test according to plugin specific disabledTestPatterns() (if any)
SKIP_IF_CURRENT_TEST_IS_DISABLED()
InferenceEngine::CNNNetwork cnnNet(function);
auto execNet = ie->LoadNetwork(cnnNet, targetDevice, configuration);
auto req = execNet.CreateInferRequest();
{
auto somePtr = std::make_shared<int>(42);
req.SetCompletionCallback([somePtr] {
ASSERT_EQ(1, somePtr.use_count());
});
}
ASSERT_NO_THROW(req.StartAsync());
ASSERT_NO_THROW(req.Wait(InferenceEngine::InferRequest::WaitMode::RESULT_READY));
}
} // namespace BehaviorTestsDefinitions