diff options
author | Artem Nosach (GitHub) <ANosach@luxoft.com> | 2016-07-18 11:50:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-18 11:50:46 +0300 |
commit | 7ae459d489ba7a6f3ea2c9517c5673ca26159481 (patch) | |
tree | d6afa431d613f535ead18011d90116516ca8515a | |
parent | 2761539513429f53a7f2d7f80b68eb8e7b1bdb99 (diff) | |
parent | f9490277e8d188411f8f4a0ee21958e51393c521 (diff) | |
download | sdl_core-7ae459d489ba7a6f3ea2c9517c5673ca26159481.tar.gz |
Merge pull request #693 from dtrunov/fix/SDL_crashes_if_execute_auto_smoke_test_during_active_video_streaming
Fix core crash during streaming and execution smoke test.
7 files changed, 82 insertions, 40 deletions
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities.h b/src/components/application_manager/include/application_manager/hmi_capabilities.h index 98b9099384..f94c8125c8 100644 --- a/src/components/application_manager/include/application_manager/hmi_capabilities.h +++ b/src/components/application_manager/include/application_manager/hmi_capabilities.h @@ -416,6 +416,15 @@ class HMICapabilities { void Init(resumption::LastState* last_state); + /** + * @brief return component which follows for correctness of + * languages + * @return HMI language handler + */ + HMILanguageHandler& get_hmi_language_handler() { + return hmi_language_handler_; + } + protected: /* * @brief Loads capabilities from local file in case SDL was launched diff --git a/src/components/application_manager/include/application_manager/hmi_language_handler.h b/src/components/application_manager/include/application_manager/hmi_language_handler.h index 6e4d9785f6..e8af02c189 100644 --- a/src/components/application_manager/include/application_manager/hmi_language_handler.h +++ b/src/components/application_manager/include/application_manager/hmi_language_handler.h @@ -98,6 +98,13 @@ class HMILanguageHandler : public event_engine::EventObserver { hmi_apis::Common_Language::eType tts); void Init(resumption::LastState* value); + /** + * @brief Removes application from container after + * removing application from core + * @param app_id id application for removing + */ + void OnUnregisterApplication(uint32_t app_id); + private: void SendOnLanguageChangeToMobile(uint32_t connection_key); diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h index 93784e9671..31da7647fa 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -151,7 +151,7 @@ class HmiState { /** * @brief state_id state type - * @return reutrn state type + * @return return state type */ StateID state_id() const { return state_id_; diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 8ec093d99a..7aa1bd550d 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -320,6 +320,7 @@ std::vector<ApplicationSharedPtr> ApplicationManagerImpl::IviInfoUpdated( } void ApplicationManagerImpl::OnApplicationRegistered(ApplicationSharedPtr app) { + LOG4CXX_AUTO_TRACE(logger_); DCHECK_OR_RETURN_VOID(app); sync_primitives::AutoLock lock(applications_list_lock_); const mobile_apis::HMILevel::eType default_level = GetDefaultHmiLevel(app); @@ -2586,6 +2587,8 @@ void ApplicationManagerImpl::UnregisterApplication( resume_ctrl_.RemoveApplicationFromSaved(app_to_remove); } applications_.erase(app_to_remove); + (hmi_capabilities_.get_hmi_language_handler()) + .OnUnregisterApplication(app_id); AppV4DevicePredicate finder(handle); ApplicationSharedPtr app = FindApp(accessor, finder); if (!app) { diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index 526ce6e672..412827f7c8 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -542,16 +542,25 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() { *(application.get()), resumption, need_restore_vr); SendResponse(true, result_code, add_info.c_str(), &response_params); - if (result_code != mobile_apis::Result::RESUME_FAILED) { - resumer.StartResumption(application, hash_id); + // Check if application exists, because application might be unregestered + // during sending reponse to mobile. + application = application_manager_.application(key); + if (application) { + LOG4CXX_DEBUG(logger_, "Application with app_id = " << key << " exists."); + if (result_code != mobile_apis::Result::RESUME_FAILED) { + resumer.StartResumption(application, hash_id); + } else { + resumer.StartResumptionOnlyHMILevel(application); + } + + // By default app subscribed to CUSTOM_BUTTON + SendSubscribeCustomButtonNotification(); + MessageHelper::SendChangeRegistrationRequestToHMI(application, + application_manager_); } else { - resumer.StartResumptionOnlyHMILevel(application); + LOG4CXX_DEBUG(logger_, + "Application with app_id = " << key << " doesn't exist."); } - - // By default app subscribed to CUSTOM_BUTTON - SendSubscribeCustomButtonNotification(); - MessageHelper::SendChangeRegistrationRequestToHMI(application, - application_manager_); } void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( diff --git a/src/components/application_manager/src/hmi_language_handler.cc b/src/components/application_manager/src/hmi_language_handler.cc index 72ab60eb3a..d37467ee76 100644 --- a/src/components/application_manager/src/hmi_language_handler.cc +++ b/src/components/application_manager/src/hmi_language_handler.cc @@ -131,6 +131,10 @@ void HMILanguageHandler::on_event(const event_engine::Event& event) { is_tts_language_received_ = true; break; case hmi_apis::FunctionID::BasicCommunication_OnAppRegistered: + if (!(msg[strings::params].keyExists(strings::app_id))) { + LOG4CXX_ERROR(logger_, "Message doesn't contain parameter app_id"); + return; + } CheckApplication( std::make_pair(msg[strings::params][strings::app_id].asUInt(), true)); return; @@ -273,26 +277,31 @@ void HMILanguageHandler::VerifyWithPersistedLanguages() { sync_primitives::AutoLock lock(apps_lock_); if (0 == apps_.size()) { LOG4CXX_DEBUG(logger_, - "No registered apps found. Unsubscribing from all events."); + "No registered apps found. HMILanguageHandler unsubscribed " + "from all events."); unsubscribe_from_all_events(); } } void HMILanguageHandler::HandleWrongLanguageApp(const Apps::value_type& app) { LOG4CXX_AUTO_TRACE(logger_); - Apps::iterator it = apps_.find(app.first); - if (apps_.end() == it) { - LOG4CXX_DEBUG(logger_, - "Application id " - << app.first - << " is not found within apps with wrong language."); - return; + { + sync_primitives::AutoLock lock(apps_lock_); + Apps::iterator it = apps_.find(app.first); + if (apps_.end() == it) { + LOG4CXX_DEBUG(logger_, + "Application id " + << app.first + << " is not found within apps with wrong language."); + return; + } + apps_.erase(it); + if (0 == apps_.size()) { + LOG4CXX_DEBUG(logger_, + "HMILanguageHandler unsubscribed from all events."); + unsubscribe_from_all_events(); + } } - - LOG4CXX_INFO(logger_, - "Unregistering application with app_id " - << app.first << " because of HMI language(s) mismatch."); - SendOnLanguageChangeToMobile(app.first); application_manager_.ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( @@ -301,26 +310,28 @@ void HMILanguageHandler::HandleWrongLanguageApp(const Apps::value_type& app) { commands::Command::ORIGIN_SDL); application_manager_.UnregisterApplication( app.first, mobile_apis::Result::SUCCESS, false); - apps_.erase(it); - if (0 == apps_.size()) { - LOG4CXX_DEBUG(logger_, - "All apps processed. Unsubscribing from all events."); - unsubscribe_from_all_events(); - } + LOG4CXX_INFO(logger_, + "Unregistering application with app_id " + << app.first << " because of HMI language(s) mismatch."); } void HMILanguageHandler::CheckApplication(const Apps::value_type app) { LOG4CXX_AUTO_TRACE(logger_); - sync_primitives::AutoLock lock(apps_lock_); - Apps::iterator it = apps_.find(app.first); - if (apps_.end() == it) { - LOG4CXX_INFO(logger_, - "Adding application id " - << app.first << " Application registered: " << app.second); - apps_.insert(app); - return; + bool is_need_handle_wrong_language = false; + { + sync_primitives::AutoLock lock(apps_lock_); + Apps::iterator it = apps_.find(app.first); + if (apps_.end() == it) { + LOG4CXX_INFO(logger_, + "Adding application id " + << app.first + << " Application registered: " << app.second); + apps_.insert(app); + return; + } + is_need_handle_wrong_language = apps_[app.first]; } - if (apps_[app.first]) { + if (is_need_handle_wrong_language) { HandleWrongLanguageApp(app); } } @@ -332,4 +343,10 @@ void HMILanguageHandler::Init(resumption::LastState* value) { persisted_tts_language_ = get_language_for(INTERFACE_TTS); } +void HMILanguageHandler::OnUnregisterApplication(uint32_t app_id) { + LOG4CXX_AUTO_TRACE(logger_); + sync_primitives::AutoLock lock(apps_lock_); + apps_.erase(app_id); +} + } // namespace application_manager diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc index bad2d8661b..80628f9f33 100644 --- a/src/components/application_manager/src/hmi_state.cc +++ b/src/components/application_manager/src/hmi_state.cc @@ -61,19 +61,16 @@ void HmiState::set_parent(HmiStatePtr parent) { bool HmiState::is_navi_app(const uint32_t app_id) const { const ApplicationSharedPtr app = app_mngr_.application(app_id); - DCHECK_OR_RETURN(app, false); return app ? app->is_navi() : false; } bool HmiState::is_media_app(const uint32_t app_id) const { const ApplicationSharedPtr app = app_mngr_.application(app_id); - DCHECK_OR_RETURN(app, false); return app ? app->is_media_application() : false; } bool HmiState::is_voice_communication_app(const uint32_t app_id) const { const ApplicationSharedPtr app = app_mngr_.application(app_id); - DCHECK_OR_RETURN(app, false); return app ? app->is_voice_communication_supported() : false; } |