Skip to content

RDKEMW-10425: Automation Logging #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKEMW-10425: Automation Logging #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ble/ctrlm_ble_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,13 +615,13 @@ void ctrlm_obj_controller_ble_t::print_status() {
XLOGD_INFO("Model : %s", model_->to_string().c_str());
XLOGD_INFO("MAC Address : %s", ieee_address_->to_string().c_str());
XLOGD_INFO("Device Minor ID : %d", device_minor_id_);
XLOGD_INFO("Battery Level : %u%%", get_battery_percent());
XLOGD_AUTOMATION_INFO("Battery Level : %u%%", get_battery_percent());
XLOGD_INFO("HW Revision : %s", hw_revision_->to_string().c_str());
XLOGD_INFO("FW Revision : %s", fw_revision_->to_string().c_str());
XLOGD_INFO("SW Revision : %s", sw_revision_->to_string().c_str());
XLOGD_AUTOMATION_INFO("SW Revision : %s", sw_revision_->to_string().c_str());
XLOGD_INFO("Serial Number : %s", serial_number_->to_string().c_str());
XLOGD_INFO("");
XLOGD_INFO("Connected : %s", (connected_==true) ? "true" : "false");
XLOGD_AUTOMATION_INFO("Connected : %s", (connected_==true) ? "true" : "false");
XLOGD_INFO("Last Activity Time : %s", ctrlm_utils_time_as_string(this->last_activity_time_get()).c_str());
XLOGD_INFO("Bound Time : %s", ctrlm_utils_time_as_string(this->time_binding_get()).c_str());
XLOGD_INFO("");
Expand Down
22 changes: 11 additions & 11 deletions src/ble/ctrlm_ble_network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ void ctrlm_obj_network_ble_t::req_process_voice_session_begin(void *data, int si
XLOGD_ERROR("Voice streaming pipe invalid (fd = <%d>), aborting voice session", fd);
success = false;
} else {
XLOGD_INFO("Acquired voice streaming pipe fd = <%d>, sending to voice engine", fd);
XLOGD_AUTOMATION_INFO("Acquired voice streaming pipe fd = <%d>, sending to voice engine", fd);
//Send the fd acquired from bluez to the voice engine
success = ctrlm_get_voice_obj()->voice_session_data(network_id_get(), controller_id, fd);
}
Expand Down Expand Up @@ -1825,7 +1825,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
print_status = false;
break;
case CTRLM_HAL_BLE_PROPERTY_IS_UPGRADING:
XLOGD_INFO("Controller <%s> firmware upgrading = %s", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.is_upgrading ? "TRUE" : "FALSE");
XLOGD_AUTOMATION_INFO("Controller <%s> firmware upgrading = %s", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.is_upgrading ? "TRUE" : "FALSE");
upgrade_in_progress_ = dqm->rcu_data.is_upgrading;
if (!dqm->rcu_data.is_upgrading) {
// If we get FALSE here, make sure the controller upgrade progress flag is cleared. But we don't want to set the controller progress
Expand All @@ -1836,7 +1836,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
print_status = false;
break;
case CTRLM_HAL_BLE_PROPERTY_UPGRADE_PROGRESS:
XLOGD_INFO("Controller <%s> firmware upgrade %d%% complete...", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_progress);
XLOGD_AUTOMATION_INFO("Controller <%s> firmware upgrade %d%% complete...", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_progress);
// From a controller perspective, we cannot use the CTRLM_HAL_BLE_PROPERTY_IS_UPGRADING flag above to determine if its actively upgrading.
// Instead, its more accurate to use the progress percentage to determine if the remote is actively receiving firmware packets.
controller->setUpgradeInProgress(dqm->rcu_data.upgrade_progress > 0 && dqm->rcu_data.upgrade_progress < 100);
Expand All @@ -1849,7 +1849,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
print_status = false;
break;
case CTRLM_HAL_BLE_PROPERTY_UPGRADE_ERROR:
XLOGD_ERROR("Controller <%s> firmware upgrade FAILED with error <%s>.", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_error);
XLOGD_AUTOMATION_ERROR("Controller <%s> firmware upgrade FAILED with error <%s>.", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_error);
report_status = false;
print_status = false;
controller->set_upgrade_error(dqm->rcu_data.upgrade_error);
Expand Down Expand Up @@ -1882,7 +1882,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
controller->ota_failure_cnt_incr();
break;
case CTRLM_HAL_BLE_PROPERTY_UNPAIR_REASON:
XLOGD_INFO("Controller <%s> notified reason for unpairing = <%s>", controller->ieee_address_get().to_string().c_str(), ctrlm_ble_unpair_reason_str(dqm->rcu_data.unpair_reason));
XLOGD_AUTOMATION_INFO("Controller <%s> notified reason for unpairing = <%s>", controller->ieee_address_get().to_string().c_str(), ctrlm_ble_unpair_reason_str(dqm->rcu_data.unpair_reason));
last_rcu_unpair_metrics_.write_rcu_unpair_event(controller->ieee_address_get().get_value(), string(ctrlm_ble_unpair_reason_str(dqm->rcu_data.unpair_reason)));
report_status = false;
print_status = false;
Expand All @@ -1897,7 +1897,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
}
break;
case CTRLM_HAL_BLE_PROPERTY_REBOOT_REASON:
XLOGD_TELEMETRY("Controller <%s> notified reason for rebooting = <%s%s%s%s>",
XLOGD_AUTOMATION_TELEMETRY("Controller <%s> notified reason for rebooting = <%s%s%s%s>",
controller->ieee_address_get().to_string().c_str(),
ctrlm_ble_reboot_reason_str(dqm->rcu_data.reboot_reason),
dqm->rcu_data.reboot_reason == CTRLM_BLE_RCU_REBOOT_REASON_ASSERT ? " - \"" : "",
Expand Down Expand Up @@ -2205,7 +2205,7 @@ void ctrlm_obj_network_ble_t::ind_process_keypress(void *data, int size) {
controller->setVoiceStartTime(keyDownTime);

XLOGD_INFO("------------------------------------------------------------------------");
XLOGD_INFO("CODE_VOICE_KEY button PRESSED event for device: %s", controller->ieee_address_get().to_string().c_str());
XLOGD_AUTOMATION_INFO("CODE_VOICE_KEY button PRESSED event for device: %s", controller->ieee_address_get().to_string().c_str());
XLOGD_INFO("------------------------------------------------------------------------");

ctrlm_voice_iarm_call_voice_session_t v_params;
Expand Down Expand Up @@ -2255,7 +2255,7 @@ void ctrlm_obj_network_ble_t::ind_process_keypress(void *data, int size) {
if (controller->isVoiceKey(dqm->event.code)) {
if(!controller->getPressAndHoldSupport()) { // if the voice session is "Press and Release" then don't end session on voice key up event
XLOGD_INFO("------------------------------------------------------------------------");
XLOGD_INFO("CODE_VOICE_KEY button RELEASED event for device: %s (ignored for PAR session)", controller->ieee_address_get().to_string().c_str());
XLOGD_AUTOMATION_INFO("CODE_VOICE_KEY button RELEASED event for device: %s (ignored for PAR session)", controller->ieee_address_get().to_string().c_str());
XLOGD_INFO("------------------------------------------------------------------------");
} else {
rdkx_timestamp_t keyUpTime, keyUpTimeLocal, voiceStartTimeLocal, firstAudioDataTime;
Expand Down Expand Up @@ -2290,11 +2290,11 @@ void ctrlm_obj_network_ble_t::ind_process_keypress(void *data, int size) {
}

XLOGD_INFO("------------------------------------------------------------------------");
XLOGD_INFO("CODE_VOICE_KEY button RELEASED event for device: %s duration <%lld ms> start lag <%lld ms>", controller->ieee_address_get().to_string().c_str(), audioDurationKeys, startAudioLag);
XLOGD_AUTOMATION_INFO("CODE_VOICE_KEY button RELEASED event for device: %s duration <%lld ms> start lag <%lld ms>", controller->ieee_address_get().to_string().c_str(), audioDurationKeys, startAudioLag);
XLOGD_INFO("------------------------------------------------------------------------");
} else {
XLOGD_INFO("------------------------------------------------------------------------");
XLOGD_INFO("CODE_VOICE_KEY button RELEASED event for device: %s duration <%lld ms>", controller->ieee_address_get().to_string().c_str(), audioDurationKeys);
XLOGD_AUTOMATION_INFO("CODE_VOICE_KEY button RELEASED event for device: %s duration <%lld ms>", controller->ieee_address_get().to_string().c_str(), audioDurationKeys);
XLOGD_INFO("------------------------------------------------------------------------");
}

Expand Down Expand Up @@ -2497,7 +2497,7 @@ void ctrlm_obj_network_ble_t::printStatus() {
it->second->print_status();
}
XLOGD_INFO("BLE Network Status: <%s>", ctrlm_rf_pair_state_str(state_));
XLOGD_TELEMETRY("IR Programming Status: <%s>", ctrlm_ir_state_str(ir_state_));
XLOGD_AUTOMATION_TELEMETRY("IR Programming Status: <%s>", ctrlm_ir_state_str(ir_state_));
XLOGD_WARN("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
}

Expand Down
12 changes: 6 additions & 6 deletions src/ble/hal/blercu/blercupairingstatemachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,19 +517,19 @@ void BleRcuPairingStateMachine::onStateTransition(int oldState, int newState)
{
if (newState == FinishedState) {
if (oldState == UnpairingState) {
XLOGD_WARN("timed-out in un-pairing phase (failed rcu may be left paired)");
XLOGD_AUTOMATION_WARN("timed-out in un-pairing phase (failed rcu may be left paired)");
} else if (oldState == StartingDiscoveryState) {
XLOGD_ERROR("timed-out waiting for discovery started signal");
XLOGD_AUTOMATION_ERROR("timed-out waiting for discovery started signal");
} else if (oldState == DiscoveringState) {
XLOGD_ERROR("timed-out in discovery phase (didn't find target rcu device to pair to)");
XLOGD_AUTOMATION_ERROR("timed-out in discovery phase (didn't find target rcu device to pair to)");
} else if (oldState == StoppingDiscoveryState) {
XLOGD_ERROR("timed-out waiting for discovery to stop (suggesting something has gone wrong inside bluez)");
XLOGD_AUTOMATION_ERROR("timed-out waiting for discovery to stop (suggesting something has gone wrong inside bluez)");
}
} else if (newState == UnpairingState) {
if (oldState == EnablePairableState || oldState == PairingState) {
XLOGD_WARN("timed-out in pairing phase (rcu device didn't pair within %dms)", m_pairingTimeout);
XLOGD_AUTOMATION_WARN("timed-out in pairing phase (rcu device didn't pair within %dms)", m_pairingTimeout);
} else if (oldState == SetupState) {
XLOGD_WARN("timed-out in setup phase (rcu didn't response to all requests within %dms)", m_setupTimeout);
XLOGD_AUTOMATION_WARN("timed-out in setup phase (rcu didn't response to all requests within %dms)", m_setupTimeout);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/ble/hal/blercu/bluez/blercuadapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,7 @@ void BleRcuAdapterBluez::onDevicePairedChanged(const BleAddress &address,
void BleRcuAdapterBluez::onDeviceReadyChanged(const BleAddress &address,
bool ready)
{
XLOGD_INFO("device with address %s is %sREADY", address.toString().c_str(), ready ? "" : "NOT ");
XLOGD_AUTOMATION_INFO("device with address %s is %sREADY", address.toString().c_str(), ready ? "" : "NOT ");

map<BleAddress, shared_ptr<BleRcuDeviceBluez>>::const_iterator it = m_devices.find(address);

Expand Down Expand Up @@ -1768,7 +1768,7 @@ bool BleRcuAdapterBluez::setConnectionParams(BleAddress address, double minInter

if (address == deviceInfo.address) {

XLOGD_INFO("HCI connection handle: %u, device: %s requesting an update of connection parameters to "
XLOGD_AUTOMATION_INFO("HCI connection handle: %u, device: %s requesting an update of connection parameters to "
"minInterval=%f, maxInterval=%f, latency=%d, supervisionTimeout=%d",
deviceInfo.handle, deviceInfo.address.toString().c_str(),
minInterval, maxInterval, latency, supervisionTimeout);
Expand Down
2 changes: 1 addition & 1 deletion src/ble/hal/blercu/bluez/blercudevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ void BleRcuDeviceBluez::onEnteredRecoveryDisconnectingState()
m_recoveryAttempts++;

// log the attempt
XLOGD_ERROR("entered recovery state after device %s failed to resolve services (attempt #%d)",
XLOGD_AUTOMATION_ERROR("entered recovery state after device %s failed to resolve services (attempt #%d)",
m_address.toString().c_str(), m_recoveryAttempts);


Expand Down
10 changes: 5 additions & 5 deletions src/ctrlm_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ void ctrlm_obj_controller_t::process_event_key(ctrlm_key_status_t key_status, ui
last_key_code_->set_value((uint64_t)key_code);
last_key_time_update();

XLOGD_TELEMETRY("ind_process_keypress: %s - MAC Address <%s>, code = <%d> (%s key), status = <%s>", controller_type_str_get().c_str(),
ieee_address_get().to_string().c_str(),
mask ? -1 : key_code,
ctrlm_linux_key_code_str(key_code, mask),
ctrlm_key_status_str(key_status));
XLOGD_AUTOMATION_TELEMETRY("ind_process_keypress: %s - MAC Address <%s>, code = <%d> (%s key), status = <%s>", controller_type_str_get().c_str(),
ieee_address_get().to_string().c_str(),
mask ? -1 : key_code,
ctrlm_linux_key_code_str(key_code, mask),
ctrlm_key_status_str(key_status));
}

ctrlm_controller_capabilities_t ctrlm_obj_controller_t::get_capabilities() const {
Expand Down
2 changes: 1 addition & 1 deletion src/ctrlm_ir_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ void* ctrlm_ir_key_monitor_thread(void *data) {
case 2: { key_status = CTRLM_KEY_STATUS_REPEAT; break; }
default: break;
}
XLOGD_TELEMETRY("%s - code = <%d> (%s key), status = <%s>", ir_controller->name_get().c_str(),
XLOGD_AUTOMATION_TELEMETRY("%s - code = <%d> (%s key), status = <%s>", ir_controller->name_get().c_str(),
ir_controller->mask_key_codes_get() ? -1 : event.code,
ctrlm_linux_key_code_str(event.code, ir_controller->mask_key_codes_get()), ctrlm_key_status_str(key_status));

Expand Down
8 changes: 4 additions & 4 deletions src/ctrlm_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ int main(int argc, char *argv[]) {

ctrlm_trigger_startup_actions();

XLOGD_INFO("Enter main loop");
XLOGD_AUTOMATION_INFO("Enter main loop");
g_main_loop_run(g_ctrlm.main_loop);

//Save the shutdown time if it is valid
Expand Down Expand Up @@ -988,7 +988,7 @@ gboolean ctrlm_thread_monitor(gpointer user_data) {
XLOGD_DEBUG("Checking %s", it->name);

if(it->response != CTRLM_THREAD_MONITOR_RESPONSE_ALIVE) {
XLOGD_TELEMETRY("Thread %s is unresponsive", it->name);
XLOGD_AUTOMATION_TELEMETRY("Thread %s is unresponsive", it->name);
#ifdef BREAKPAD_SUPPORT
if(g_ctrlm.thread_monitor_minidump) {
XLOGD_FATAL("Thread Monitor Minidump is enabled");
Expand Down Expand Up @@ -2329,7 +2329,7 @@ gpointer ctrlm_main_thread(gpointer param) {
// Unblock the caller that launched this thread
sem_post(&g_ctrlm.semaphore);

XLOGD_INFO("Enter main loop");
XLOGD_AUTOMATION_INFO("Enter main loop");
do {
gpointer msg = g_async_queue_pop(g_ctrlm.queue);

Expand Down Expand Up @@ -2675,7 +2675,7 @@ gpointer ctrlm_main_thread(gpointer param) {
//If execution reaches here, then change power state and inform VSDK of on or deep sleep states
g_ctrlm.power_state = dqm->new_state;

XLOGD_INFO("Enter power state <%s>", ctrlm_power_state_str(g_ctrlm.power_state));
XLOGD_AUTOMATION_INFO("Enter power state <%s>", ctrlm_power_state_str(g_ctrlm.power_state));
if(g_ctrlm.networked_standby_supported && (g_ctrlm.power_state == CTRLM_POWER_STATE_DEEP_SLEEP)) {
XLOGD_INFO("NSM is <%s>", (ctrlm_main_get_networked_standby_mode())?"ENABLED":"DISABLED");
}
Expand Down
2 changes: 1 addition & 1 deletion src/ctrlm_main_iarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ IARM_Result_t ctrlm_main_iarm_call_start_pair_with_code(void *arg) {
return(IARM_RESULT_INVALID_PARAM);
}

XLOGD_INFO("params->network_id = <%d>, params->pair_code = 0x%X", params->network_id, params->pair_code);
XLOGD_AUTOMATION_INFO("params->network_id = <%d>, params->pair_code = 0x%X", params->network_id, params->pair_code);

// Signal completion of the operation
sem_t semaphore;
Expand Down
2 changes: 1 addition & 1 deletion src/ipc/ctrlm_ipc_iarm_powermanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ bool ctrlm_ipc_iarm_powermanager_t::get_wakeup_reason_voice() {
return false;
}

XLOGD_INFO("wakeup_reason <%s>", ctrlm_wakeup_reason_str(wakeup_reason));
XLOGD_AUTOMATION_INFO("wakeup_reason <%s>", ctrlm_wakeup_reason_str(wakeup_reason));

wakeup_reason_voice = (wakeup_reason == DEEPSLEEP_WAKEUPREASON_VOICE) ? true: false;

Expand Down
Loading
Loading