Skip to content
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

Jump to bottom

SAI library compilation fixes #909

Merged
merged 1 commit into from
Jan 15, 2019
Merged

SAI library compilation fixes #909

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
3 changes: 3 additions & 0 deletions inc/saitypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,9 @@ typedef struct _sai_acl_field_data_t
*/
typedef union _sai_acl_action_parameter_t
{
/** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL */
bool booldata;

/** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8 */
sai_uint8_t u8;

Expand Down
4 changes: 2 additions & 2 deletions meta/test.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ sub CreateApiNameTest

my @objects = @{ $main::SAI_ENUMS{sai_object_type_t}{values} };

WriteTest " sai_object_type_t checked[SAI_OBJECT_TYPE_MAX];";
WriteTest " memset(checked, 0, SAI_OBJECT_TYPE_MAX * sizeof(sai_object_type_t));";
WriteTest " sai_object_type_t checked[SAI_OBJECT_TYPE_EXTENSIONS_MAX];";
WriteTest " memset(checked, 0, SAI_OBJECT_TYPE_EXTENSIONS_MAX * sizeof(sai_object_type_t));";

WriteTest " void *dummy = NULL;";

Expand Down
14 changes: 7 additions & 7 deletions test/saithrift/src/switch_sai_rpc_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {

status = vlan_api->get_vlan_stats((sai_vlan_id_t) vlan_id,
number_of_counters,
counter_ids,
(const sai_stat_id_t *)counter_ids,
counters);

for (uint32_t i = 0; i < thrift_counter_ids.size(); i++) { thrift_counters.push_back(counters[i]); }
Expand Down Expand Up @@ -2880,7 +2880,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {

sai_thrift_alloc_array(counters, number_of_counters);

status = policer_api->get_policer_stats(thrift_policer_id, number_of_counters, counter_ids, counters);
status = policer_api->get_policer_stats(thrift_policer_id, number_of_counters, (const sai_stat_id_t *)counter_ids, counters);

if (status == SAI_STATUS_SUCCESS)
{
Expand Down Expand Up @@ -2908,7 +2908,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {
auto counter_ids = reinterpret_cast<const sai_policer_stat_t*>(thrift_counter_ids.data());
sai_size_t number_of_counters = thrift_counter_ids.size();

status = policer_api->clear_policer_stats(thrift_policer_id, number_of_counters, counter_ids);
status = policer_api->clear_policer_stats(thrift_policer_id, number_of_counters, (const sai_stat_id_t *)counter_ids);

if (status == SAI_STATUS_SUCCESS)
{ SAI_THRIFT_LOG_DBG("Exited."); return status; }
Expand Down Expand Up @@ -2996,7 +2996,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {

status = port_api->get_port_stats((sai_object_id_t) port_id,
number_of_counters,
counter_ids,
(const sai_stat_id_t *)counter_ids,
counters);

for (uint32_t i = 0; i < thrift_counter_ids.size(); i++) {
Expand Down Expand Up @@ -3130,7 +3130,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {
status = queue_api->get_queue_stats(
(sai_object_id_t) queue_id,
number_of_counters,
counter_ids,
(const sai_stat_id_t *)counter_ids,
counters);

for (uint32_t i = 0; i < thrift_counter_ids.size(); i++) {
Expand Down Expand Up @@ -3176,7 +3176,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {
status = queue_api->clear_queue_stats(
(sai_object_id_t) queue_id,
number_of_counters,
counter_ids);
(const sai_stat_id_t *)counter_ids);

free(counter_ids);
return status;
Expand Down Expand Up @@ -3302,7 +3302,7 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {

status = buffer_api->get_ingress_priority_group_stats((sai_object_id_t) pg_id,
number_of_counters,
counter_ids,
(const sai_stat_id_t *)counter_ids,
counters);

for (uint32_t i = 0; i < thrift_counter_ids.size(); i++) {
Expand Down