summaryrefslogtreecommitdiff
path: root/src/components/application_manager/src/state_controller_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/application_manager/src/state_controller_impl.cc')
-rw-r--r--src/components/application_manager/src/state_controller_impl.cc225
1 files changed, 100 insertions, 125 deletions
diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc
index ffff294664..3cebc74a4a 100644
--- a/src/components/application_manager/src/state_controller_impl.cc
+++ b/src/components/application_manager/src/state_controller_impl.cc
@@ -40,7 +40,7 @@
namespace application_manager {
-CREATE_LOGGERPTR_GLOBAL(logger_, "StateControllerImpl")
+SDL_CREATE_LOG_VARIABLE("StateControllerImpl")
namespace {
bool IsStateChanged(const HmiState& old_state, const HmiState& new_state) {
@@ -70,13 +70,12 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
const WindowID window_id,
HmiStatePtr state,
const bool request_hmi_state_change) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
DCHECK_OR_RETURN_VOID(state);
DCHECK_OR_RETURN_VOID(HmiState::STATE_ID_REGULAR == state->state_id());
- LOG4CXX_DEBUG(logger_,
- "Set window #" << window_id << " regular state " << *state);
+ SDL_LOG_DEBUG("Set window #" << window_id << " regular state " << *state);
if (state->hmi_level() == mobile_apis::HMILevel::INVALID_ENUM ||
state->audio_streaming_state() ==
@@ -84,7 +83,7 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
state->video_streaming_state() ==
mobile_apis::VideoStreamingState::INVALID_ENUM ||
state->system_context() == mobile_apis::SystemContext::INVALID_ENUM) {
- LOG4CXX_ERROR(logger_, "Got invalid state");
+ SDL_LOG_ERROR("Got invalid state");
return;
}
@@ -102,7 +101,7 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
return;
}
- LOG4CXX_DEBUG(logger_, "Resolved state: " << *resolved_state);
+ SDL_LOG_DEBUG("Resolved state: " << *resolved_state);
const hmi_apis::Common_HMILevel::eType hmi_level =
static_cast<hmi_apis::Common_HMILevel::eType>(
resolved_state->hmi_level());
@@ -120,7 +119,7 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
app_mngr_.set_application_id(corr_id, app->hmi_app_id());
return;
}
- LOG4CXX_ERROR(logger_, "Unable to send BC.ActivateApp");
+ SDL_LOG_ERROR("Unable to send BC.ActivateApp");
return;
}
ApplyRegularState(app, window_id, resolved_state);
@@ -133,7 +132,7 @@ void StateControllerImpl::SetRegularState(
const mobile_apis::AudioStreamingState::eType audio_state,
const mobile_apis::VideoStreamingState::eType video_state,
const bool request_hmi_state_change) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_regular = app->RegularHmiState(window_id);
DCHECK_OR_RETURN_VOID(prev_regular);
@@ -154,7 +153,7 @@ void StateControllerImpl::SetRegularState(
const mobile_apis::HMILevel::eType hmi_level,
const bool request_hmi_state_change) {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_regular = app->RegularHmiState(window_id);
@@ -180,7 +179,7 @@ void StateControllerImpl::SetRegularState(
const mobile_apis::VideoStreamingState::eType video_state,
const mobile_apis::SystemContext::eType system_context,
const bool request_hmi_state_change) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_regular = app->RegularHmiState(window_id);
@@ -202,7 +201,7 @@ void StateControllerImpl::SetRegularState(
ApplicationSharedPtr app,
const WindowID window_id,
const mobile_apis::HMILevel::eType hmi_level) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_state = app->RegularHmiState(window_id);
HmiStatePtr hmi_state =
@@ -221,7 +220,7 @@ void StateControllerImpl::SetRegularState(
ApplicationSharedPtr app,
const WindowID window_id,
const mobile_apis::SystemContext::eType system_context) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_regular = app->RegularHmiState(window_id);
DCHECK_OR_RETURN_VOID(prev_regular);
@@ -243,7 +242,7 @@ void StateControllerImpl::SetRegularState(
const WindowID window_id,
const mobile_apis::AudioStreamingState::eType audio_state,
const mobile_apis::VideoStreamingState::eType video_state) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_state = app->RegularHmiState(window_id);
DCHECK_OR_RETURN_VOID(prev_state);
@@ -261,7 +260,7 @@ void StateControllerImpl::SetRegularState(
void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
const WindowID window_id,
HmiStatePtr state) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
DCHECK_OR_RETURN_VOID(state);
@@ -347,16 +346,14 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()(
// - all audio/video applications with the same app type become BACKGROUND
if (!IsStreamableHMILevel(state_->hmi_level())) {
- LOG4CXX_DEBUG(logger_,
- "Applied for app " << applied_->app_id() << " HMI level "
+ SDL_LOG_DEBUG("Applied for app " << applied_->app_id() << " HMI level "
<< state_->hmi_level()
<< " is NOT streamable. Exit.");
return;
}
if (!IsStreamableHMILevel(state_to_resolve->hmi_level())) {
- LOG4CXX_DEBUG(logger_,
- "To resolve app " << app_to_resolve->app_id() << " HMI level "
+ SDL_LOG_DEBUG("To resolve app " << app_to_resolve->app_id() << " HMI level "
<< state_to_resolve->hmi_level()
<< " is NOT streamable. Exit.");
return;
@@ -415,8 +412,7 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()(
state_to_resolve->video_streaming_state()) !=
std::make_tuple(
result_hmi_level, result_audio_state, result_video_state)) {
- LOG4CXX_DEBUG(logger_,
- "Application " << app_to_resolve->app_id() << " window "
+ SDL_LOG_DEBUG("Application " << app_to_resolve->app_id() << " window "
<< window_id_ << " will change state to: "
<< "HMI level " << to_resolve_hmi_level
<< " --> " << result_hmi_level << ", audio "
@@ -430,8 +426,7 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()(
result_audio_state,
result_video_state);
} else {
- LOG4CXX_DEBUG(logger_,
- "Application " << app_to_resolve->app_id() << " window "
+ SDL_LOG_DEBUG("Application " << app_to_resolve->app_id() << " window "
<< window_id_ << " will NOT change HMI level");
}
}
@@ -439,8 +434,8 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()(
HmiStatePtr StateControllerImpl::ResolveHmiState(ApplicationSharedPtr app,
HmiStatePtr state) const {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
- LOG4CXX_DEBUG(logger_, "State to resolve: " << *state);
+ SDL_LOG_AUTO_TRACE();
+ SDL_LOG_DEBUG("State to resolve: " << *state);
HmiStatePtr available_state =
CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -466,18 +461,17 @@ HmiStatePtr StateControllerImpl::ResolveHmiState(ApplicationSharedPtr app,
bool StateControllerImpl::IsResumptionAllowed(ApplicationSharedPtr app,
HmiStatePtr state) const {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
using namespace mobile_apis;
if (!app->is_resuming() || !IsStreamableHMILevel(state->hmi_level())) {
- LOG4CXX_DEBUG(logger_, "Application is not in resuming mode.");
+ SDL_LOG_DEBUG("Application is not in resuming mode.");
return true;
}
if (IsTempStateActive(HmiState::StateID::STATE_ID_AUDIO_SOURCE) &&
app->is_media_application()) {
- LOG4CXX_DEBUG(logger_,
- "Resumption for media app is not allowed. "
- << "AUDIO_SOURCE event is active");
+ SDL_LOG_DEBUG("Resumption for media app is not allowed. "
+ << "AUDIO_SOURCE event is active");
return false;
}
@@ -487,9 +481,8 @@ bool StateControllerImpl::IsResumptionAllowed(ApplicationSharedPtr app,
if (IsTempStateActive(HmiState::StateID::STATE_ID_EMBEDDED_NAVI) &&
(is_navi_app || is_mob_projection_app || is_wep_app)) {
- LOG4CXX_DEBUG(logger_,
- "Resumption for navi and projection apps is not allowed. "
- << "EMBEDDED_NAVI event is active");
+ SDL_LOG_DEBUG("Resumption for navi and projection apps is not allowed. "
+ << "EMBEDDED_NAVI event is active");
return false;
}
@@ -498,10 +491,10 @@ bool StateControllerImpl::IsResumptionAllowed(ApplicationSharedPtr app,
mobile_apis::HMILevel::eType StateControllerImpl::GetAvailableHmiLevel(
ApplicationSharedPtr app, mobile_apis::HMILevel::eType hmi_level) const {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
mobile_apis::HMILevel::eType result = hmi_level;
- LOG4CXX_DEBUG(logger_, "HMI Level: " << hmi_level);
+ SDL_LOG_DEBUG("HMI Level: " << hmi_level);
if (!IsStreamableHMILevel(hmi_level)) {
return result;
@@ -528,15 +521,15 @@ mobile_apis::HMILevel::eType StateControllerImpl::GetAvailableHmiLevel(
result = mobile_apis::HMILevel::HMI_LIMITED;
} else if (app->is_navi() &&
IsTempStateActive(HmiState::StateID::STATE_ID_AUDIO_SOURCE)) {
- LOG4CXX_DEBUG(logger_,
- "Navigation app will be resumed to LIMITED, "
- "because of AUDIO_SOURCE ia active.");
+ SDL_LOG_DEBUG(
+ "Navigation app will be resumed to LIMITED, "
+ "because of AUDIO_SOURCE ia active.");
result = mobile_apis::HMILevel::HMI_LIMITED;
} else if (app->is_media_application() &&
IsTempStateActive(HmiState::StateID::STATE_ID_EMBEDDED_NAVI)) {
- LOG4CXX_DEBUG(logger_,
- "Media app will be resumed to LIMITED, "
- "because of EMBEDDED_NAVI is active.");
+ SDL_LOG_DEBUG(
+ "Media app will be resumed to LIMITED, "
+ "because of EMBEDDED_NAVI is active.");
result = mobile_apis::HMILevel::HMI_LIMITED;
}
} else if (is_active_app_exist) {
@@ -549,8 +542,8 @@ mobile_apis::HMILevel::eType StateControllerImpl::GetAvailableHmiLevel(
bool StateControllerImpl::IsStateAvailable(ApplicationSharedPtr app,
HmiStatePtr state) const {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
- LOG4CXX_DEBUG(logger_, "Checking state: " << *state);
+ SDL_LOG_AUTO_TRACE();
+ SDL_LOG_DEBUG("Checking state: " << *state);
if (app->is_resuming()) {
return IsStateAvailableForResumption(app, state);
@@ -559,51 +552,46 @@ bool StateControllerImpl::IsStateAvailable(ApplicationSharedPtr app,
if (IsTempStateActive(HmiState::StateID::STATE_ID_AUDIO_SOURCE) ||
IsTempStateActive(HmiState::StateID::STATE_ID_EMBEDDED_NAVI)) {
if (HMILevel::HMI_FULL == state->hmi_level()) {
- LOG4CXX_DEBUG(logger_,
- "AUDIO_SOURCE or EMBEDDED_NAVI is active."
- << " Requested state is not available");
+ SDL_LOG_DEBUG("AUDIO_SOURCE or EMBEDDED_NAVI is active."
+ << " Requested state is not available");
return false;
}
}
- LOG4CXX_DEBUG(logger_, "Requested state is available");
+ SDL_LOG_DEBUG("Requested state is available");
return true;
}
bool StateControllerImpl::IsStateAvailableForResumption(
ApplicationSharedPtr app, HmiStatePtr state) const {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
using namespace mobile_apis;
if (!app->is_resuming() || !IsStreamableHMILevel(state->hmi_level())) {
- LOG4CXX_DEBUG(logger_,
- "Application is not in resuming mode."
- << " Requested state is available");
+ SDL_LOG_DEBUG("Application is not in resuming mode."
+ << " Requested state is available");
return true;
}
if (IsTempStateActive(HmiState::StateID::STATE_ID_VR_SESSION) ||
IsTempStateActive(HmiState::StateID::STATE_ID_SAFETY_MODE)) {
- LOG4CXX_DEBUG(logger_,
- "Requested state is not available. "
- << "VR session or emergency event is active");
+ SDL_LOG_DEBUG("Requested state is not available. "
+ << "VR session or emergency event is active");
return false;
}
if (IsTempStateActive(HmiState::StateID::STATE_ID_PHONE_CALL) &&
app->is_media_application()) {
- LOG4CXX_DEBUG(logger_,
- "Requested state for media application "
- << "is not available. Phone call is active");
+ SDL_LOG_DEBUG("Requested state for media application "
+ << "is not available. Phone call is active");
return false;
}
if (IsTempStateActive(HmiState::StateID::STATE_ID_DEACTIVATE_HMI)) {
- LOG4CXX_DEBUG(logger_,
- "Requested state is not available. "
- << "Deactivate HMI event is active");
+ SDL_LOG_DEBUG("Requested state is not available. "
+ << "Deactivate HMI event is active");
return false;
}
- LOG4CXX_DEBUG(logger_, "Requested state is available");
+ SDL_LOG_DEBUG("Requested state is available");
return true;
}
@@ -611,10 +599,9 @@ void StateControllerImpl::SetupRegularHmiState(ApplicationSharedPtr app,
const WindowID window_id,
HmiStatePtr state) {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(state);
- LOG4CXX_DEBUG(logger_,
- "Setup window #" << window_id << " regular state: " << *state);
+ SDL_LOG_DEBUG("Setup window #" << window_id << " regular state: " << *state);
HmiStatePtr curr_state = app->CurrentHmiState(window_id);
HmiStatePtr old_state =
CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -628,9 +615,8 @@ void StateControllerImpl::SetupRegularHmiState(ApplicationSharedPtr app,
if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW == window_id &&
HMILevel::HMI_LIMITED == state->hmi_level() && app->is_resuming()) {
- LOG4CXX_DEBUG(logger_,
- "Resuming to LIMITED level. "
- << "Send OnResumeAudioSource notification");
+ SDL_LOG_DEBUG("Resuming to LIMITED level. "
+ << "Send OnResumeAudioSource notification");
MessageHelper::SendOnResumeAudioSourceToHMI(app->app_id(), app_mngr_);
}
@@ -644,7 +630,7 @@ void StateControllerImpl::SetupRegularHmiState(
const mobile_apis::HMILevel::eType hmi_level,
const mobile_apis::AudioStreamingState::eType audio_state,
const mobile_apis::VideoStreamingState::eType video_state) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
HmiStatePtr prev_state = app->RegularHmiState(window_id);
DCHECK_OR_RETURN_VOID(prev_state);
@@ -662,39 +648,36 @@ void StateControllerImpl::SetupRegularHmiState(
void StateControllerImpl::ApplyRegularState(ApplicationSharedPtr app,
const WindowID window_id,
HmiStatePtr state) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
DCHECK_OR_RETURN_VOID(state);
DCHECK_OR_RETURN_VOID(state->state_id() == HmiState::STATE_ID_REGULAR);
- LOG4CXX_DEBUG(logger_,
- "Applying to app " << app->app_id() << " window #" << window_id
+ SDL_LOG_DEBUG("Applying to app " << app->app_id() << " window #" << window_id
<< " state " << *state);
SetupRegularHmiState(app, window_id, state);
if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW != window_id) {
- LOG4CXX_DEBUG(logger_, "No need to resolve conflicts for a widget");
+ SDL_LOG_DEBUG("No need to resolve conflicts for a widget");
return;
}
- LOG4CXX_DEBUG(logger_,
- "Resolving HMI level conflicts for app " << app->app_id());
+ SDL_LOG_DEBUG("Resolving HMI level conflicts for app " << app->app_id());
ForEachApplication(HmiLevelConflictResolver(app, window_id, state, this));
}
void StateControllerImpl::UpdateAppWindowsStreamingState(
ApplicationSharedPtr app, HmiStatePtr state) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
const auto window_ids = app->GetWindowIds();
for (auto window_id : window_ids) {
HmiStatePtr window_hmi_state = app->RegularHmiState(window_id);
- LOG4CXX_DEBUG(
- logger_, "State: " << *state << " window state: " << *window_hmi_state);
+ SDL_LOG_DEBUG("State: " << *state
+ << " window state: " << *window_hmi_state);
if (window_hmi_state->audio_streaming_state() !=
state->audio_streaming_state() ||
window_hmi_state->video_streaming_state() !=
state->video_streaming_state()) {
- LOG4CXX_DEBUG(logger_,
- "Updating streaming state for window #" << window_id);
+ SDL_LOG_DEBUG("Updating streaming state for window #" << window_id);
HmiStatePtr new_window_state =
CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -721,7 +704,7 @@ void StateControllerImpl::on_event(const event_engine::Event& event) {
using namespace hmi_apis;
namespace FunctionID = hmi_apis::FunctionID;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
const SmartObject& message = event.smart_object();
const FunctionID::eType id = static_cast<FunctionID::eType>(event.id());
switch (id) {
@@ -806,8 +789,7 @@ void StateControllerImpl::on_event(const event_engine::Event& event) {
}
}
- LOG4CXX_WARN(logger_,
- "Couldn't recognize state id (val='" << state_id << "')");
+ SDL_LOG_WARN("Couldn't recognize state id (val='" << state_id << "')");
break;
}
default:
@@ -816,7 +798,7 @@ void StateControllerImpl::on_event(const event_engine::Event& event) {
}
void StateControllerImpl::ActivateDefaultWindow(ApplicationSharedPtr app) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
using namespace mobile_apis;
const WindowID window_id = PredefinedWindows::DEFAULT_WINDOW;
@@ -838,7 +820,7 @@ void StateControllerImpl::ActivateDefaultWindow(ApplicationSharedPtr app) {
}
void StateControllerImpl::ExitDefaultWindow(ApplicationSharedPtr app) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
using namespace mobile_apis;
const WindowID window_id = PredefinedWindows::DEFAULT_WINDOW;
@@ -861,26 +843,24 @@ void StateControllerImpl::OnStateChanged(ApplicationSharedPtr app,
const WindowID window_id,
HmiStatePtr old_state,
HmiStatePtr new_state) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
DCHECK_OR_RETURN_VOID(old_state);
DCHECK_OR_RETURN_VOID(new_state);
- LOG4CXX_DEBUG(logger_,
- "Window #" << window_id << " old state: " << *old_state);
- LOG4CXX_DEBUG(logger_,
- "Window #" << window_id << " new state: " << *new_state);
+ SDL_LOG_DEBUG("Window #" << window_id << " old state: " << *old_state);
+ SDL_LOG_DEBUG("Window #" << window_id << " new state: " << *new_state);
if (!IsStateChanged(*old_state, *new_state)) {
- LOG4CXX_DEBUG(logger_, "State has NOT been changed.");
+ SDL_LOG_DEBUG("State has NOT been changed.");
return;
}
MessageHelper::SendHMIStatusNotification(app, window_id, app_mngr_);
if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW != window_id) {
- LOG4CXX_DEBUG(logger_,
- "State was changed not for a main application window. No "
- "additional actions required");
+ SDL_LOG_DEBUG(
+ "State was changed not for a main application window. No "
+ "additional actions required");
return;
}
@@ -900,7 +880,7 @@ bool StateControllerImpl::IsTempStateActive(HmiState::StateID id) const {
void StateControllerImpl::OnApplicationRegistered(
ApplicationSharedPtr app,
const mobile_apis::HMILevel::eType default_level) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
// After app registration HMI level should be set for DEFAULT_WINDOW only
OnAppWindowAdded(app,
@@ -917,7 +897,7 @@ void StateControllerImpl::OnAppWindowAdded(
namespace HMILevel = mobile_apis::HMILevel;
namespace AudioStreamingState = mobile_apis::AudioStreamingState;
namespace SystemContext = mobile_apis::SystemContext;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
{
@@ -956,7 +936,7 @@ int64_t StateControllerImpl::RequestHMIStateChange(
ApplicationConstSharedPtr app,
hmi_apis::Common_HMILevel::eType level,
bool send_policy_priority) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
smart_objects::SmartObjectSPtr request = NULL;
if (hmi_apis::Common_HMILevel::NONE == level) {
request = MessageHelper::GetBCCloseApplicationRequestToHMI(app, app_mngr_);
@@ -969,11 +949,11 @@ int64_t StateControllerImpl::RequestHMIStateChange(
app_mngr_);
}
if (!request) {
- LOG4CXX_ERROR(logger_, "Unable to create request");
+ SDL_LOG_ERROR("Unable to create request");
return -1;
}
if (!app_mngr_.GetRPCService().ManageHMICommand(request)) {
- LOG4CXX_ERROR(logger_, "Unable to send request");
+ SDL_LOG_ERROR("Unable to send request");
return -1;
}
const uint32_t corr_id =
@@ -982,7 +962,7 @@ int64_t StateControllerImpl::RequestHMIStateChange(
}
void StateControllerImpl::ApplyPostponedStateForApp(ApplicationSharedPtr app) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
const WindowIds window_ids = app->GetWindowIds();
@@ -997,7 +977,7 @@ void StateControllerImpl::ApplyPostponedStateForApp(ApplicationSharedPtr app) {
}
void StateControllerImpl::TempStateStarted(HmiState::StateID id) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
{
sync_primitives::AutoLock autolock(active_states_lock_);
@@ -1007,11 +987,11 @@ void StateControllerImpl::TempStateStarted(HmiState::StateID id) {
}
}
- LOG4CXX_ERROR(logger_, "StateID '" << id << "' is already active");
+ SDL_LOG_ERROR("StateID '" << id << "' is already active");
}
void StateControllerImpl::TempStateStopped(HmiState::StateID ID) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
{
sync_primitives::AutoLock autolock(active_states_lock_);
active_states_.remove(ID);
@@ -1023,15 +1003,14 @@ void StateControllerImpl::TempStateStopped(HmiState::StateID ID) {
void StateControllerImpl::DeactivateApp(ApplicationSharedPtr app,
const WindowID window_id) {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK_OR_RETURN_VOID(app);
const HmiStatePtr regular = app->RegularHmiState(window_id);
DCHECK_OR_RETURN_VOID(regular);
HmiStatePtr new_regular = std::make_shared<HmiState>(*regular);
- LOG4CXX_DEBUG(logger_,
- "Window #" << window_id << " current HMI level: '"
+ SDL_LOG_DEBUG("Window #" << window_id << " current HMI level: '"
<< app->hmi_level(window_id) << "'");
const bool is_audio_app = app->IsAudioApplication();
const bool is_video_app = app->IsVideoApplication();
@@ -1083,12 +1062,12 @@ void StateControllerImpl::OnHMIResponse(
void StateControllerImpl::OnAppActivated(
const smart_objects::SmartObject& message) {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
uint32_t app_id = message[strings::msg_params][strings::app_id].asUInt();
ApplicationSharedPtr app = app_mngr_.application(app_id);
if (!app) {
- LOG4CXX_ERROR(logger_, "Application with id " << app_id << " not found");
+ SDL_LOG_ERROR("Application with id " << app_id << " not found");
return;
}
@@ -1099,9 +1078,8 @@ void StateControllerImpl::OnAppActivated(
const auto window_ids = app->GetWindowIds();
if (!helpers::in_range(window_ids, window_id)) {
- LOG4CXX_ERROR(
- logger_,
- "Application " << app_id << " does not contain window #" << window_id);
+ SDL_LOG_ERROR("Application " << app_id << " does not contain window #"
+ << window_id);
return;
}
@@ -1124,12 +1102,12 @@ void StateControllerImpl::OnAppActivated(
void StateControllerImpl::OnAppDeactivated(
const smart_objects::SmartObject& message) {
using namespace mobile_apis;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
uint32_t app_id = message[strings::msg_params][strings::app_id].asUInt();
ApplicationSharedPtr app = app_mngr_.application(app_id);
if (!app) {
- LOG4CXX_ERROR(logger_, "Application with id " << app_id << " not found");
+ SDL_LOG_ERROR("Application with id " << app_id << " not found");
return;
}
@@ -1140,9 +1118,8 @@ void StateControllerImpl::OnAppDeactivated(
const auto window_ids = app->GetWindowIds();
if (!helpers::in_range(window_ids, window_id)) {
- LOG4CXX_ERROR(
- logger_,
- "Application " << app_id << " does not contain window #" << window_id);
+ SDL_LOG_ERROR("Application " << app_id << " does not contain window #"
+ << window_id);
return;
}
@@ -1187,7 +1164,7 @@ void StateControllerImpl::OnVideoStreamingStopped(
}
bool StateControllerImpl::IsStateActive(HmiState::StateID state_id) const {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
switch (state_id) {
case HmiState::STATE_ID_CURRENT:
case HmiState::STATE_ID_REGULAR:
@@ -1201,7 +1178,7 @@ bool StateControllerImpl::IsStateActive(HmiState::StateID state_id) const {
HmiStatePtr StateControllerImpl::CreateHmiState(
std::shared_ptr<Application> app, HmiState::StateID state_id) const {
using namespace utils;
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
HmiStatePtr new_state;
switch (state_id) {
case HmiState::STATE_ID_PHONE_CALL: {
@@ -1249,7 +1226,7 @@ HmiStatePtr StateControllerImpl::CreateHmiState(
break;
}
default:
- LOG4CXX_FATAL(logger_, "Invalid state_id " << state_id);
+ SDL_LOG_FATAL("Invalid state_id " << state_id);
NOTREACHED();
break;
}
@@ -1264,10 +1241,9 @@ mobile_apis::AudioStreamingState::eType StateControllerImpl::CalcAudioState(
state = mobile_apis::AudioStreamingState::AUDIBLE;
}
- LOG4CXX_DEBUG(logger_,
- "Calculated audio state of app "
- << app->app_id() << " for " << hmi_level << " HMI level is "
- << state);
+ SDL_LOG_DEBUG("Calculated audio state of app "
+ << app->app_id() << " for " << hmi_level << " HMI level is "
+ << state);
return state;
}
@@ -1280,10 +1256,9 @@ mobile_apis::VideoStreamingState::eType StateControllerImpl::CalcVideoState(
state = mobile_apis::VideoStreamingState::STREAMABLE;
}
- LOG4CXX_DEBUG(logger_,
- "Calculated video state of app "
- << app->app_id() << " for " << hmi_level << " HMI level is "
- << state);
+ SDL_LOG_DEBUG("Calculated video state of app "
+ << app->app_id() << " for " << hmi_level << " HMI level is "
+ << state);
return state;
}
View Lorry Controller Status