Skip to content

RDKBWIFI-364 : Generalizing bus abstraction functions for retrieving and setting bus data property types. #1103

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
hp490 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKBWIFI-364 : Generalizing bus abstraction functions for retrieving and setting bus data property types. #1103

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
2 changes: 1 addition & 1 deletion source/apps/csi/wifi_csi_analytics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ void run_csi_enable_timer(wifi_app_t *p_app, bool status)
}
}

static void do_nothing_handler(char *event_name, raw_data_t *p_data, void *userData)
static void do_nothing_handler(char *event_name, bus_data_prop_t *p_data, void *userData)
{
UNREFERENCED_PARAMETER(event_name);
UNREFERENCED_PARAMETER(p_data);
Expand Down
8 changes: 4 additions & 4 deletions source/apps/sm/wifi_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,20 +822,20 @@ int sm_event(wifi_app_t *app, wifi_event_t *event)
return RETURN_OK;
}

static void sm_app_enable_handler(char *event_name, raw_data_t *p_data)
static void sm_app_enable_handler(char *event_name, bus_data_prop_t *p_data)
{
bool sm_app_enable;

wifi_util_dbg_print(WIFI_SM, "%s:%d recvd event\n", __func__, __LINE__);

if ((strcmp(event_name, BUS_SM_APP_ENABLE) != 0) ||
(p_data->data_type != bus_data_type_boolean)) {
(p_data->value.data_type != bus_data_type_boolean)) {
wifi_util_error_print(WIFI_SM, "%s:%d invalid event received,%s:%x\n", __func__, __LINE__,
event_name, p_data->data_type);
event_name, p_data->value.data_type);
return;
}

sm_app_enable = p_data->raw_data.b;
sm_app_enable = p_data->value.raw_data.b;

push_event_to_ctrl_queue(&sm_app_enable, sizeof(sm_app_enable), wifi_event_type_command,
wifi_event_type_sm_app_enable, NULL);
Expand Down
165 changes: 86 additions & 79 deletions source/core/wifi_ctrl_rbus_handlers.c
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source/db/wifi_db_apis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9704,7 +9704,7 @@ int wifi_db_update_psm_values()
}

//static void bus_subscription_handler(bus_handle_t handle, bus_event_t *event,
static void bus_subscription_handler(char *event_name, raw_data_t *p_data, void *userData)
static void bus_subscription_handler(char *event_name, bus_data_prop_t *p_data, void *userData)
{
(void)p_data;
(void)userData;
Expand Down
8 changes: 4 additions & 4 deletions source/dml/dml_webconfig/dml_onewifi_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,16 @@ void dml_cache_update(webconfig_subdoc_data_t *data)
}
}

void set_webconfig_dml_data(char *eventName, raw_data_t *p_data, void *userData)
void set_webconfig_dml_data(char *eventName, bus_data_prop_t *p_data, void *userData)
{
(void)userData;
char *pTmp = NULL;
webconfig_subdoc_data_t *data = NULL;

wifi_util_dbg_print(WIFI_DMCLI,"bus event callback Event is %s\r\n",eventName);
pTmp = p_data->raw_data.bytes;
if ((p_data->data_type != bus_data_type_string) || (pTmp == NULL)) {
wifi_util_error_print(WIFI_CTRL, "%s:%d:[%s]wrong bus object data:%02x\r\n", __func__, __LINE__, eventName, p_data->data_type);
pTmp = p_data->value.raw_data.bytes;
if ((p_data->value.data_type != bus_data_type_string) || (pTmp == NULL)) {
wifi_util_error_print(WIFI_CTRL, "%s:%d:[%s]wrong bus object data:%02x\r\n", __func__, __LINE__, eventName, p_data->value.data_type);
return;
}

Expand Down
16 changes: 13 additions & 3 deletions source/platform/common/bus_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,11 +832,17 @@ void bus_release_data_prop(bus_data_prop_t *p_data_prop, uint32_t *num_prop)
{
bus_data_prop_t *next, *prev, *cur;

if (p_data_prop == NULL) {
return;
}

if (p_data_prop->ref_count == 1) {
free_bus_raw_data(&p_data_prop->value);
p_data_prop->is_data_set = false;
p_data_prop->ref_count = 0;
(*num_prop)--;
if (num_prop && (*num_prop > 0)) {
(*num_prop)--;
}
} else if (p_data_prop->ref_count > 1) {
wifi_util_info_print(WIFI_BUS,"%s:%d memory:%p still have some references:%d\r\n",
__func__, __LINE__, p_data_prop, p_data_prop->ref_count);
Expand All @@ -853,7 +859,9 @@ void bus_release_data_prop(bus_data_prop_t *p_data_prop, uint32_t *num_prop)
if (cur->ref_count == 1) {
free_bus_raw_data(&cur->value);
free(cur);
(*num_prop)--;
if (num_prop && (*num_prop > 0)) {
(*num_prop)--;
}
prev->next_data = next;
} else if (cur->ref_count > 1) {
wifi_util_info_print(WIFI_BUS,"%s:%d memory:%p still have some references:%d\r\n",
Expand All @@ -868,7 +876,9 @@ void bus_release_data_prop(bus_data_prop_t *p_data_prop, uint32_t *num_prop)
cur = next;
}

wifi_util_info_print(WIFI_BUS,"%s:%d remaining num_prop:%d\r\n", __func__, __LINE__, *num_prop);
if (num_prop) {
wifi_util_info_print(WIFI_BUS,"%s:%d remaining num_prop:%d\r\n", __func__, __LINE__, *num_prop);
}
}

void bus_release_data_obj(bus_data_obj_t *p_bus_obj)
Expand Down
4 changes: 2 additions & 2 deletions source/platform/common/bus_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ typedef bus_error_t (*bus_table_add_row_handler_t)(char const* tableName, char c
typedef bus_error_t (*bus_table_remove_row_handler_t)(char const* rowName);
//typedef bus_error_t (*bus_method_handler_t)(char const* method_name, bus_data_prop_t const *in_params,
//bus_data_prop_t *out_params, void *async_handle);//we need to do it later
typedef bus_error_t (*bus_method_handler_t)(char const* methodName, raw_data_t *inParams, raw_data_t *outParams, void *asyncHandle);
typedef bus_error_t (*bus_method_handler_t)(char const* methodName, bus_data_prop_t *inParams, bus_data_prop_t *outParams, void *asyncHandle);
typedef bus_error_t (*bus_name_sub_handler_t)(char *eventName, bus_event_sub_action_t action, int32_t interval, bool* autoPublish);

typedef bus_error_t (*bus_event_sub_handler_t)(char *event_name, raw_data_t *p_data, void *userData);
typedef bus_error_t (*bus_event_sub_handler_t)(char *event_name, bus_data_prop_t *p_data, void *userData);
typedef bus_error_t (*bus_event_sub_ex_async_handler_t)(char *event_name, bus_error_t ret, void *userData);

typedef void (* wifi_bus_method_async_resp_handler_t) (char const* method_name, bus_error_t error, bus_data_prop_t *params, void *user_data);
Expand Down
8 changes: 4 additions & 4 deletions source/platform/common/data_model/wfa/wfa_data_model.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ static void de_sync_rows(char const* tableName, uint32_t old_cnt, uint32_t new_c
free(rowPath);
}

bus_error_t de_apmld_sync_handler(char const* tableName, raw_data_t *inParams, raw_data_t *outParams, void *asyncHandle)
bus_error_t de_apmld_sync_handler(char const* tableName, bus_data_prop_t *inParams, bus_data_prop_t *outParams, void *asyncHandle)
{
(void)inParams;
(void)outParams;
Expand All @@ -220,7 +220,7 @@ bus_error_t de_apmld_sync_handler(char const* tableName, raw_data_t *inParams, r
return bus_error_success;
}

bus_error_t de_affap_sync_handler(char const* tableName, raw_data_t *inParams, raw_data_t *outParams, void *asyncHandle)
bus_error_t de_affap_sync_handler(char const* tableName, bus_data_prop_t *inParams, bus_data_prop_t *outParams, void *asyncHandle)
{
(void)inParams;
(void)outParams;
Expand Down Expand Up @@ -269,7 +269,7 @@ static bus_error_t de_stamld_get(char *event_name, raw_data_t *p_data, struct bu
return status;
}

bus_error_t de_stamld_sync_handler(char const* tableName, raw_data_t *inParams, raw_data_t *outParams, void *asyncHandle)
bus_error_t de_stamld_sync_handler(char const* tableName, bus_data_prop_t *inParams, bus_data_prop_t *outParams, void *asyncHandle)
{
(void)inParams;
(void)outParams;
Expand Down Expand Up @@ -335,7 +335,7 @@ static bus_error_t de_affsta_get(char *event_name, raw_data_t *p_data, struct bu
return status;
}

bus_error_t de_affsta_sync_handler(char const* tableName, raw_data_t *inParams, raw_data_t *outParams, void *asyncHandle)
bus_error_t de_affsta_sync_handler(char const* tableName, bus_data_prop_t *inParams, bus_data_prop_t *outParams, void *asyncHandle)
{
(void)inParams;
(void)outParams;
Expand Down
2 changes: 1 addition & 1 deletion source/platform/linux/he_bus/inc/he_bus_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ typedef he_bus_error_t (*he_bus_event_sub_handler_t)(char *eventName,
he_bus_event_sub_action_t action, int32_t interval, bool *autoPublish);

typedef he_bus_error_t (
*he_bus_event_consumer_sub_handler_t)(char *event_name, he_bus_raw_data_t *p_data, void *userData);
*he_bus_event_consumer_sub_handler_t)(char *event_name, he_bus_data_object_t *p_data, void *userData);
typedef he_bus_error_t (*he_bus_event_sub_ex_async_handler_t)(char *event_name, he_bus_error_t ret, void *userData);

typedef void (*he_bus_method_async_resp_handler_t) (char const* methodName, he_bus_error_t ret,
Expand Down
6 changes: 2 additions & 4 deletions source/platform/linux/he_bus/src/he_bus_data_conversion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,9 +835,8 @@ he_bus_error_t process_bus_sub_ex_async_res_event(hash_map_t *p_sub_map, char *c
if (p_sub_data->sub_cb_table.sub_ex_async_handler != NULL) {
he_bus_core_dbg_print("%s:%d Async subscribe callback is triggered\r\n", __func__,
__LINE__);
void *userData = NULL;
p_sub_data->sub_cb_table.sub_ex_async_handler(p_obj_data->name,
(he_bus_error_t)p_obj_data->data.raw_data.u32, userData);
(he_bus_error_t)p_obj_data->data.raw_data.u32, NULL);
}
if (p_obj_data->data.data_type == he_bus_data_type_uint32 &&
p_obj_data->data.raw_data.u32 != he_bus_error_success) {
Expand Down Expand Up @@ -894,14 +893,13 @@ he_bus_error_t process_bus_publish_event(hash_map_t *p_sub_map, he_bus_data_obje
return he_bus_error_invalid_input;
}

void *userData = NULL;
own_sub_element_t *p_sub_data = get_bus_user_cb(p_sub_map, p_obj_data->name);
if (p_sub_data != NULL) {
he_bus_core_info_print("%s:%d subscribe callback is found for [%s]\r\n", __func__, __LINE__,
p_obj_data->name);
if (p_sub_data->sub_cb_table.sub_handler != NULL) {
he_bus_core_dbg_print("%s:%d subscribe callback is triggered\r\n", __func__, __LINE__);
p_sub_data->sub_cb_table.sub_handler(p_obj_data->name, &p_obj_data->data, userData);
p_sub_data->sub_cb_table.sub_handler(p_obj_data->name, p_obj_data, NULL);
}
} else {
he_bus_core_error_print("%s:%d subscribe callback not found for [%s]\r\n", __func__,
Expand Down
Loading
Loading