Skip to content

Commit 8f9332a

Browse files
committed
RDKEMW-10425: Automation Logging
1 parent 4705590 commit 8f9332a

16 files changed

+49
-49
lines changed

src/ble/ctrlm_ble_controller.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,13 +615,13 @@ void ctrlm_obj_controller_ble_t::print_status() {
615615
XLOGD_INFO("Model : %s", model_->to_string().c_str());
616616
XLOGD_INFO("MAC Address : %s", ieee_address_->to_string().c_str());
617617
XLOGD_INFO("Device Minor ID : %d", device_minor_id_);
618-
XLOGD_INFO("Battery Level : %u%%", get_battery_percent());
618+
XLOGD_AUTOMATION_INFO("Battery Level : %u%%", get_battery_percent());
619619
XLOGD_INFO("HW Revision : %s", hw_revision_->to_string().c_str());
620620
XLOGD_INFO("FW Revision : %s", fw_revision_->to_string().c_str());
621-
XLOGD_INFO("SW Revision : %s", sw_revision_->to_string().c_str());
621+
XLOGD_AUTOMATION_INFO("SW Revision : %s", sw_revision_->to_string().c_str());
622622
XLOGD_INFO("Serial Number : %s", serial_number_->to_string().c_str());
623623
XLOGD_INFO("");
624-
XLOGD_INFO("Connected : %s", (connected_==true) ? "true" : "false");
624+
XLOGD_AUTOMATION_INFO("Connected : %s", (connected_==true) ? "true" : "false");
625625
XLOGD_INFO("Last Activity Time : %s", ctrlm_utils_time_as_string(this->last_activity_time_get()).c_str());
626626
XLOGD_INFO("Bound Time : %s", ctrlm_utils_time_as_string(this->time_binding_get()).c_str());
627627
XLOGD_INFO("");

src/ble/ctrlm_ble_network.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ void ctrlm_obj_network_ble_t::req_process_voice_session_begin(void *data, int si
575575
XLOGD_ERROR("Voice streaming pipe invalid (fd = <%d>), aborting voice session", fd);
576576
success = false;
577577
} else {
578-
XLOGD_INFO("Acquired voice streaming pipe fd = <%d>, sending to voice engine", fd);
578+
XLOGD_AUTOMATION_INFO("Acquired voice streaming pipe fd = <%d>, sending to voice engine", fd);
579579
//Send the fd acquired from bluez to the voice engine
580580
success = ctrlm_get_voice_obj()->voice_session_data(network_id_get(), controller_id, fd);
581581
}
@@ -1826,7 +1826,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
18261826
print_status = false;
18271827
break;
18281828
case CTRLM_HAL_BLE_PROPERTY_IS_UPGRADING:
1829-
XLOGD_INFO("Controller <%s> firmware upgrading = %s", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.is_upgrading ? "TRUE" : "FALSE");
1829+
XLOGD_AUTOMATION_INFO("Controller <%s> firmware upgrading = %s", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.is_upgrading ? "TRUE" : "FALSE");
18301830
upgrade_in_progress_ = dqm->rcu_data.is_upgrading;
18311831
if (!dqm->rcu_data.is_upgrading) {
18321832
// If we get FALSE here, make sure the controller upgrade progress flag is cleared. But we don't want to set the controller progress
@@ -1837,7 +1837,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
18371837
print_status = false;
18381838
break;
18391839
case CTRLM_HAL_BLE_PROPERTY_UPGRADE_PROGRESS:
1840-
XLOGD_INFO("Controller <%s> firmware upgrade %d%% complete...", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_progress);
1840+
XLOGD_AUTOMATION_INFO("Controller <%s> firmware upgrade %d%% complete...", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_progress);
18411841
// From a controller perspective, we cannot use the CTRLM_HAL_BLE_PROPERTY_IS_UPGRADING flag above to determine if its actively upgrading.
18421842
// Instead, its more accurate to use the progress percentage to determine if the remote is actively receiving firmware packets.
18431843
controller->setUpgradeInProgress(dqm->rcu_data.upgrade_progress > 0 && dqm->rcu_data.upgrade_progress < 100);
@@ -1850,7 +1850,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
18501850
print_status = false;
18511851
break;
18521852
case CTRLM_HAL_BLE_PROPERTY_UPGRADE_ERROR:
1853-
XLOGD_ERROR("Controller <%s> firmware upgrade FAILED with error <%s>.", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_error);
1853+
XLOGD_AUTOMATION_ERROR("Controller <%s> firmware upgrade FAILED with error <%s>.", controller->ieee_address_get().to_string().c_str(), dqm->rcu_data.upgrade_error);
18541854
report_status = false;
18551855
print_status = false;
18561856
controller->set_upgrade_error(dqm->rcu_data.upgrade_error);
@@ -1883,7 +1883,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
18831883
controller->ota_failure_cnt_incr();
18841884
break;
18851885
case CTRLM_HAL_BLE_PROPERTY_UNPAIR_REASON:
1886-
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));
1886+
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));
18871887
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)));
18881888
report_status = false;
18891889
print_status = false;
@@ -1898,7 +1898,7 @@ void ctrlm_obj_network_ble_t::ind_process_rcu_status(void *data, int size) {
18981898
}
18991899
break;
19001900
case CTRLM_HAL_BLE_PROPERTY_REBOOT_REASON:
1901-
XLOGD_TELEMETRY("Controller <%s> notified reason for rebooting = <%s%s%s%s>",
1901+
XLOGD_AUTOMATION_TELEMETRY("Controller <%s> notified reason for rebooting = <%s%s%s%s>",
19021902
controller->ieee_address_get().to_string().c_str(),
19031903
ctrlm_ble_reboot_reason_str(dqm->rcu_data.reboot_reason),
19041904
dqm->rcu_data.reboot_reason == CTRLM_BLE_RCU_REBOOT_REASON_ASSERT ? " - \"" : "",
@@ -2206,7 +2206,7 @@ void ctrlm_obj_network_ble_t::ind_process_keypress(void *data, int size) {
22062206
controller->setVoiceStartTime(keyDownTime);
22072207

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

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

22932293
XLOGD_INFO("------------------------------------------------------------------------");
2294-
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);
2294+
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);
22952295
XLOGD_INFO("------------------------------------------------------------------------");
22962296
} else {
22972297
XLOGD_INFO("------------------------------------------------------------------------");
2298-
XLOGD_INFO("CODE_VOICE_KEY button RELEASED event for device: %s duration <%lld ms>", controller->ieee_address_get().to_string().c_str(), audioDurationKeys);
2298+
XLOGD_AUTOMATION_INFO("CODE_VOICE_KEY button RELEASED event for device: %s duration <%lld ms>", controller->ieee_address_get().to_string().c_str(), audioDurationKeys);
22992299
XLOGD_INFO("------------------------------------------------------------------------");
23002300
}
23012301

@@ -2498,7 +2498,7 @@ void ctrlm_obj_network_ble_t::printStatus() {
24982498
it->second->print_status();
24992499
}
25002500
XLOGD_INFO("BLE Network Status: <%s>", ctrlm_rf_pair_state_str(state_));
2501-
XLOGD_TELEMETRY("IR Programming Status: <%s>", ctrlm_ir_state_str(ir_state_));
2501+
XLOGD_AUTOMATION_TELEMETRY("IR Programming Status: <%s>", ctrlm_ir_state_str(ir_state_));
25022502
XLOGD_WARN("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
25032503
}
25042504

src/ble/hal/blercu/blercupairingstatemachine.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,19 +517,19 @@ void BleRcuPairingStateMachine::onStateTransition(int oldState, int newState)
517517
{
518518
if (newState == FinishedState) {
519519
if (oldState == UnpairingState) {
520-
XLOGD_WARN("timed-out in un-pairing phase (failed rcu may be left paired)");
520+
XLOGD_AUTOMATION_WARN("timed-out in un-pairing phase (failed rcu may be left paired)");
521521
} else if (oldState == StartingDiscoveryState) {
522-
XLOGD_ERROR("timed-out waiting for discovery started signal");
522+
XLOGD_AUTOMATION_ERROR("timed-out waiting for discovery started signal");
523523
} else if (oldState == DiscoveringState) {
524-
XLOGD_ERROR("timed-out in discovery phase (didn't find target rcu device to pair to)");
524+
XLOGD_AUTOMATION_ERROR("timed-out in discovery phase (didn't find target rcu device to pair to)");
525525
} else if (oldState == StoppingDiscoveryState) {
526-
XLOGD_ERROR("timed-out waiting for discovery to stop (suggesting something has gone wrong inside bluez)");
526+
XLOGD_AUTOMATION_ERROR("timed-out waiting for discovery to stop (suggesting something has gone wrong inside bluez)");
527527
}
528528
} else if (newState == UnpairingState) {
529529
if (oldState == EnablePairableState || oldState == PairingState) {
530-
XLOGD_WARN("timed-out in pairing phase (rcu device didn't pair within %dms)", m_pairingTimeout);
530+
XLOGD_AUTOMATION_WARN("timed-out in pairing phase (rcu device didn't pair within %dms)", m_pairingTimeout);
531531
} else if (oldState == SetupState) {
532-
XLOGD_WARN("timed-out in setup phase (rcu didn't response to all requests within %dms)", m_setupTimeout);
532+
XLOGD_AUTOMATION_WARN("timed-out in setup phase (rcu didn't response to all requests within %dms)", m_setupTimeout);
533533
}
534534
}
535535
}

src/ble/hal/blercu/bluez/blercuadapter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,7 @@ void BleRcuAdapterBluez::onDevicePairedChanged(const BleAddress &address,
17211721
void BleRcuAdapterBluez::onDeviceReadyChanged(const BleAddress &address,
17221722
bool ready)
17231723
{
1724-
XLOGD_INFO("device with address %s is %sREADY", address.toString().c_str(), ready ? "" : "NOT ");
1724+
XLOGD_AUTOMATION_INFO("device with address %s is %sREADY", address.toString().c_str(), ready ? "" : "NOT ");
17251725

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

@@ -1768,7 +1768,7 @@ bool BleRcuAdapterBluez::setConnectionParams(BleAddress address, double minInter
17681768

17691769
if (address == deviceInfo.address) {
17701770

1771-
XLOGD_INFO("HCI connection handle: %u, device: %s requesting an update of connection parameters to "
1771+
XLOGD_AUTOMATION_INFO("HCI connection handle: %u, device: %s requesting an update of connection parameters to "
17721772
"minInterval=%f, maxInterval=%f, latency=%d, supervisionTimeout=%d",
17731773
deviceInfo.handle, deviceInfo.address.toString().c_str(),
17741774
minInterval, maxInterval, latency, supervisionTimeout);

src/ble/hal/blercu/bluez/blercudevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ void BleRcuDeviceBluez::onEnteredRecoveryDisconnectingState()
668668
m_recoveryAttempts++;
669669

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

674674

src/ctrlm_controller.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ void ctrlm_obj_controller_t::process_event_key(ctrlm_key_status_t key_status, ui
172172
last_key_code_->set_value((uint64_t)key_code);
173173
last_key_time_update();
174174

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

182182
ctrlm_controller_capabilities_t ctrlm_obj_controller_t::get_capabilities() const {

src/ctrlm_ir_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ void* ctrlm_ir_key_monitor_thread(void *data) {
489489
case 2: { key_status = CTRLM_KEY_STATUS_REPEAT; break; }
490490
default: break;
491491
}
492-
XLOGD_TELEMETRY("%s - code = <%d> (%s key), status = <%s>", ir_controller->name_get().c_str(),
492+
XLOGD_AUTOMATION_TELEMETRY("%s - code = <%d> (%s key), status = <%s>", ir_controller->name_get().c_str(),
493493
ir_controller->mask_key_codes_get() ? -1 : event.code,
494494
ctrlm_linux_key_code_str(event.code, ir_controller->mask_key_codes_get()), ctrlm_key_status_str(key_status));
495495

src/ctrlm_main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ int main(int argc, char *argv[]) {
840840

841841
ctrlm_trigger_startup_actions();
842842

843-
XLOGD_INFO("Enter main loop");
843+
XLOGD_AUTOMATION_INFO("Enter main loop");
844844
g_main_loop_run(g_ctrlm.main_loop);
845845

846846
//Save the shutdown time if it is valid
@@ -1031,7 +1031,7 @@ gboolean ctrlm_thread_monitor(gpointer user_data) {
10311031
XLOGD_DEBUG("Checking %s", it->name);
10321032

10331033
if(it->response != CTRLM_THREAD_MONITOR_RESPONSE_ALIVE) {
1034-
XLOGD_TELEMETRY("Thread %s is unresponsive", it->name);
1034+
XLOGD_AUTOMATION_TELEMETRY("Thread %s is unresponsive", it->name);
10351035
#ifdef BREAKPAD_SUPPORT
10361036
if(g_ctrlm.thread_monitor_minidump) {
10371037
XLOGD_FATAL("Thread Monitor Minidump is enabled");
@@ -2372,7 +2372,7 @@ gpointer ctrlm_main_thread(gpointer param) {
23722372
// Unblock the caller that launched this thread
23732373
sem_post(&g_ctrlm.semaphore);
23742374

2375-
XLOGD_INFO("Enter main loop");
2375+
XLOGD_AUTOMATION_INFO("Enter main loop");
23762376
do {
23772377
gpointer msg = g_async_queue_pop(g_ctrlm.queue);
23782378

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

2723-
XLOGD_INFO("Enter power state <%s>", ctrlm_power_state_str(g_ctrlm.power_state));
2723+
XLOGD_AUTOMATION_INFO("Enter power state <%s>", ctrlm_power_state_str(g_ctrlm.power_state));
27242724
#ifdef NETWORKED_STANDBY_MODE_ENABLED
27252725
if(g_ctrlm.power_state == CTRLM_POWER_STATE_DEEP_SLEEP) {
27262726
XLOGD_INFO("NSM is <%s>", (ctrlm_main_get_networked_standby_mode())?"ENABLED":"DISABLED");

src/ctrlm_main_iarm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ IARM_Result_t ctrlm_main_iarm_call_start_pair_with_code(void *arg) {
758758
return(IARM_RESULT_INVALID_PARAM);
759759
}
760760

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

763763
// Signal completion of the operation
764764
sem_t semaphore;

src/ipc/ctrlm_ipc_iarm_powermanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ bool ctrlm_ipc_iarm_powermanager_t::get_wakeup_reason_voice() {
8383
return false;
8484
}
8585

86-
XLOGD_INFO("wakeup_reason <%s>", ctrlm_wakeup_reason_str(wakeup_reason));
86+
XLOGD_AUTOMATION_INFO("wakeup_reason <%s>", ctrlm_wakeup_reason_str(wakeup_reason));
8787

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

0 commit comments

Comments
 (0)