Skip to content

DELIA-70047 #187

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
kiruba115 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

DELIA-70047 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5382728
Debug DELIA-70047
Mar 28, 2026
e286909
Update ctrlm_main.cpp
kiruba115 Mar 28, 2026
56fbc59
Update ctrlm_thunder_plugin.cpp
kiruba115 Mar 28, 2026
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
1 change: 1 addition & 0 deletions src/ctrlm_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2713,6 +2713,7 @@ gpointer ctrlm_main_thread(gpointer param) {
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");
}
XLOGD_ERROR("DELIA-70047 NSM is <%s>", (ctrlm_main_get_networked_standby_mode())?"ENABLED":"DISABLED");
Comment on lines 2714 to +2716
Copy link

Copilot AI Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a temporary ticket-specific debug log and it uses XLOGD_ERROR unconditionally. It also duplicates the earlier NSM log (and calls ctrlm_main_get_networked_standby_mode again), which can add noise. Please remove this line or downgrade it to DEBUG and gate it the same way as the existing NSM log.

Suggested change
XLOGD_INFO("NSM is <%s>", (ctrlm_main_get_networked_standby_mode())?"ENABLED":"DISABLED");
}
XLOGD_ERROR("DELIA-70047 NSM is <%s>", (ctrlm_main_get_networked_standby_mode())?"ENABLED":"DISABLED");
bool nsm_enabled = ctrlm_main_get_networked_standby_mode();
XLOGD_INFO("NSM is <%s>", nsm_enabled ? "ENABLED" : "DISABLED");
XLOGD_DEBUG("DELIA-70047 NSM is <%s>", nsm_enabled ? "ENABLED" : "DISABLED");
}

Copilot uses AI. Check for mistakes.

if(dqm->new_state != CTRLM_POWER_STATE_STANDBY) {
// Set VSDK power state
Expand Down
24 changes: 24 additions & 0 deletions src/thunder/ctrlm_thunder_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,30 @@ bool ctrlm_thunder_plugin_t::call_plugin(std::string method, void *params, void
return(ret);
}

bool ctrlm_thunder_plugin_t::call_plugin_boolean(std::string method, void *params, bool *response) {
bool ret = false;
auto clientObject = (JSONRPC::LinkType<Core::JSON::IElement>*)this->plugin_client;
JsonObject *jsonParams = (JsonObject *)params;
if(clientObject) {
if(!method.empty() && jsonParams && response) {
Core::JSON::Boolean jsonResponse;
uint32_t thunderRet = clientObject->Invoke<JsonObject, Core::JSON::Boolean>(CALL_TIMEOUT, _T(method), *jsonParams, jsonResponse);
if(thunderRet == Core::ERROR_NONE) {
*response = jsonResponse.Value();
ret = true;
XLOGD_ERROR("%s: Thunder call success <%s> <%u> response:%d \n", __FUNCTION__, method.c_str(), thunderRet, *response);
Copy link

Copilot AI Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call_plugin_boolean logs a successful Thunder invoke using XLOGD_ERROR. This will incorrectly surface normal calls as errors; consider removing the success log entirely (to match call_plugin) or logging it at DEBUG/INFO instead.

Suggested change
XLOGD_ERROR("%s: Thunder call success <%s> <%u> response:%d \n", __FUNCTION__, method.c_str(), thunderRet, *response);

Copilot uses AI. Check for mistakes.
} else {
XLOGD_ERROR("%s: Thunder call failed <%s> <%u>\n", __FUNCTION__, method.c_str(), thunderRet);
Comment on lines +271 to +277
Copy link

Copilot AI Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This introduces a new Thunder call helper but it doesn’t support retries on Core::ERROR_TIMEDOUT like call_plugin/property_get do. To keep behavior consistent and avoid transient timeouts becoming hard failures, consider adding a retries parameter (default 0) and wrapping Invoke in the same timed-out retry loop used by call_plugin.

Suggested change
uint32_t thunderRet = clientObject->Invoke<JsonObject, Core::JSON::Boolean>(CALL_TIMEOUT, _T(method), *jsonParams, jsonResponse);
if(thunderRet == Core::ERROR_NONE) {
*response = jsonResponse.Value();
ret = true;
XLOGD_ERROR("%s: Thunder call success <%s> <%u> response:%d \n", __FUNCTION__, method.c_str(), thunderRet, *response);
} else {
XLOGD_ERROR("%s: Thunder call failed <%s> <%u>\n", __FUNCTION__, method.c_str(), thunderRet);
unsigned int attempts = 0;
unsigned int retries = 0; // keep current behavior: no retries beyond the initial attempt
uint32_t thunderRet = Core::ERROR_TIMEDOUT;
while(thunderRet == Core::ERROR_TIMEDOUT && attempts <= retries) { // Only retry on TIMEDOUT
thunderRet = clientObject->Invoke<JsonObject, Core::JSON::Boolean>(CALL_TIMEOUT, _T(method), *jsonParams, jsonResponse);
if(thunderRet == Core::ERROR_NONE) {
*response = jsonResponse.Value();
ret = true;
XLOGD_ERROR("%s: Thunder call success <%s> <%u> response:%d \n", __FUNCTION__, method.c_str(), thunderRet, *response);
} else {
attempts += 1;
XLOGD_ERROR("%s: Thunder call failed <%s> <%u>, attempt %u of %u\n",
__FUNCTION__,
method.c_str(),
thunderRet,
attempts,
(thunderRet == Core::ERROR_TIMEDOUT ? retries : 0) + 1); // retries + initial attempt
}

Copilot uses AI. Check for mistakes.
}
} else {
XLOGD_ERROR("%s: Invalid parameters\n", __FUNCTION__);
}
} else {
XLOGD_ERROR("%s: Client is NULL\n", __FUNCTION__);
}
return(ret);
}

bool ctrlm_thunder_plugin_t::call_controller(std::string method, void *params, void *response) {
bool ret = false;
if(this->controller) {
Expand Down
2 changes: 2 additions & 0 deletions src/thunder/ctrlm_thunder_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ class ctrlm_thunder_plugin_t {
*/
bool call_plugin(std::string method, void *params, void *response, unsigned int retries = 0);

Copy link

Copilot AI Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call_plugin_boolean is added without any header documentation, while the surrounding helper methods have Doxygen-style comments describing params/return values. Please add a matching comment block (and if you add a retries parameter for timeout handling, document that as well) to keep the header self-describing.

Suggested change
/**
* This function is used to call a Thunder Plugin method that returns a boolean result.
* @param method The method in which the user wants to call.
* @param params The WPEFramework JsonObject containing the parameters for the call. (We can't include WPEFramework headers in controlMgr .h files as their logging macros clash)
* @param response Pointer to a boolean that will contain the result from the call.
* @return True if the call succeeded, otherwise False.
*/

Copilot uses AI. Check for mistakes.
bool call_plugin_boolean(std::string method, void *params, bool *response);

/**
* This functions is used to call a Thunder Controller method.
* @param method The method in which the user wants to call.
Expand Down
11 changes: 5 additions & 6 deletions src/thunder/ctrlm_thunder_plugin_powermanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,15 @@ ctrlm_power_state_t ctrlm_thunder_plugin_powermanager_t::get_power_state() {
/* root@pioneer-uhd:~# curl --request POST --url http://127.0.0.1:9998/jsonrpc --header 'Content-Type: application/json' --data '{ "jsonrpc": "2.0", "id": 1234567890, "method": "org.rdk.PowerManager.1.getNetworkStandbyMode", "params": {} }'
{"jsonrpc":"2.0","id":1234567890,"result":true} */
bool ctrlm_thunder_plugin_powermanager_t::get_networked_standby_mode() {
JsonObject params, response;
JsonObject params;
params = {};
bool networked_standby_mode = false;

sem_wait(&this->semaphore);
if(this->call_plugin("getNetworkStandbyMode", (void *)&params, (void *)&response)) {
networked_standby_mode = response["result"].Boolean();
XLOGD_DEBUG("networked_standby_mode is %s", networked_standby_mode?"TRUE":"FALSE");
sem_wait(&this->semaphore);
if(this->call_plugin_boolean("getNetworkStandbyMode", (void *)&params, &networked_standby_mode)) {
XLOGD_ERROR("networked_standby_mode is %s", networked_standby_mode ? "TRUE" : "FALSE");
Copy link

Copilot AI Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The success path logs the NSM value with XLOGD_ERROR, which will mark normal behavior as an error and can create noisy/alerting logs. This file uses DEBUG for successful state/value logs (e.g., power state and wakeup reason) and ERROR for failures; consider changing this to XLOGD_DEBUG/INFO and reserving XLOGD_ERROR for the failure branch.

Suggested change
XLOGD_ERROR("networked_standby_mode is %s", networked_standby_mode ? "TRUE" : "FALSE");
XLOGD_DEBUG("networked_standby_mode is %s", networked_standby_mode ? "TRUE" : "FALSE");

Copilot uses AI. Check for mistakes.
} else {
XLOGD_ERROR("getNetworkedStandbyMode call failed");
XLOGD_ERROR("getNetworkStandbyMode call failed");
}
sem_post(&this->semaphore);

Expand Down
Loading