matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dcb: Add dcb_set_u32(), dcb_set_u64() 

The DCB buffer object has a settable array of 32-bit quantities, and the
maxrate object of 64-bit ones. Adjust dcb_parse_mapping() and related
helpers to support 64-bit values in mappings, and add appropriate helpers.

Signed-off-by: Petr Machata <me@pmachata.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Petr Machata 2020-12-11 00:02:19 +01:00 committed by David Ahern
parent 7e94711c71
commit 11a72186a0
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dcb/dcb.c
View File

@ -229,8 +229,8 @@ void dcb_print_named_array(const char *json_name, const char *fp_name,
} }
int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key, int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key,
const char *what_value, __u32 value, __u32 max_value, const char *what_value, __u64 value, __u64 max_value,
void (*set_array)(__u32 index, __u32 value, void *data), void (*set_array)(__u32 index, __u64 value, void *data),
void *set_array_data) void *set_array_data)
{ {
bool is_all = key == (__u32) -1; bool is_all = key == (__u32) -1;
@ -242,7 +242,7 @@ int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key,
} }
if (value > max_value) { if (value > max_value) {
fprintf(stderr, "In %s:%s mapping, %s is expected to be 0..%d\n", fprintf(stderr, "In %s:%s mapping, %s is expected to be 0..%llu\n",
what_key, what_value, what_value, max_value); what_key, what_value, what_value, max_value);
return -EINVAL; return -EINVAL;
} }
@ -257,13 +257,27 @@ int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key,
return 0; return 0;
} }
void dcb_set_u8(__u32 key, __u32 value, void *data) void dcb_set_u8(__u32 key, __u64 value, void *data)
{ {
__u8 *array = data; __u8 *array = data;
array[key] = value; array[key] = value;
} }
void dcb_set_u32(__u32 key, __u64 value, void *data)
{
__u32 *array = data;
array[key] = value;
}
void dcb_set_u64(__u32 key, __u64 value, void *data)
{
__u64 *array = data;
array[key] = value;
}
int dcb_cmd_parse_dev(struct dcb *dcb, int argc, char **argv, int dcb_cmd_parse_dev(struct dcb *dcb, int argc, char **argv,
int (*and_then)(struct dcb *dcb, const char *dev, int (*and_then)(struct dcb *dcb, const char *dev,
int argc, char **argv), int argc, char **argv),

8
dcb/dcb.h
View File

@ -14,15 +14,17 @@ struct dcb {
}; };
int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key, int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key,
const char *what_value, __u32 value, __u32 max_value, const char *what_value, __u64 value, __u64 max_value,
void (*set_array)(__u32 index, __u32 value, void *data), void (*set_array)(__u32 index, __u64 value, void *data),
void *set_array_data); void *set_array_data);
int dcb_cmd_parse_dev(struct dcb *dcb, int argc, char **argv, int dcb_cmd_parse_dev(struct dcb *dcb, int argc, char **argv,
int (*and_then)(struct dcb *dcb, const char *dev, int (*and_then)(struct dcb *dcb, const char *dev,
int argc, char **argv), int argc, char **argv),
void (*help)(void)); void (*help)(void));
void dcb_set_u8(__u32 key, __u32 value, void *data); void dcb_set_u8(__u32 key, __u64 value, void *data);
void dcb_set_u32(__u32 key, __u64 value, void *data);
void dcb_set_u64(__u32 key, __u64 value, void *data);
int dcb_get_attribute(struct dcb *dcb, const char *dev, int attr, int dcb_get_attribute(struct dcb *dcb, const char *dev, int attr,
void *data, size_t data_len); void *data, size_t data_len);