Config load functions updated to support 100G rates
for subport and pipes.
Signed-off-by: Megha Ajmera <megha.ajm...@intel.com>
---
examples/qos_sched/cfg_file.c | 294 ++++++++++++++++++++++++++--------
1 file changed, 230 insertions(+), 64 deletions(-)
diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index ca871d3287..9fcdf5eeb6 100644
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -60,71 +60,154 @@ cfg_load_pipe(struct rte_cfgfile *cfg, struct
rte_sched_pipe_params *pipe_params
for (j = 0; j < profiles; j++) {
char pipe_name[32];
+ /* Convert to decimal */
+ int base = 10;
+
snprintf(pipe_name, sizeof(pipe_name), "pipe profile %d", j);
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tb rate");
- if (entry)
- pipe_params[j].tb_rate = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tb_rate = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tb size");
- if (entry)
- pipe_params[j].tb_size = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tb_size = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc period");
- if (entry)
- pipe_params[j].tc_period = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_period = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 0 rate");
- if (entry)
- pipe_params[j].tc_rate[0] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[0] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 1 rate");
- if (entry)
- pipe_params[j].tc_rate[1] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[1] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 2 rate");
- if (entry)
- pipe_params[j].tc_rate[2] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[2] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3 rate");
- if (entry)
- pipe_params[j].tc_rate[3] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[3] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 4 rate");
- if (entry)
- pipe_params[j].tc_rate[4] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[4] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 5 rate");
- if (entry)
- pipe_params[j].tc_rate[5] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[5] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 6 rate");
- if (entry)
- pipe_params[j].tc_rate[6] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[6] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 7 rate");
- if (entry)
- pipe_params[j].tc_rate[7] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[7] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 8 rate");
- if (entry)
- pipe_params[j].tc_rate[8] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[8] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 9 rate");
- if (entry)
- pipe_params[j].tc_rate[9] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[9] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 10 rate");
- if (entry)
- pipe_params[j].tc_rate[10] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[10] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 11 rate");
- if (entry)
- pipe_params[j].tc_rate[11] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[11] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 12 rate");
- if (entry)
- pipe_params[j].tc_rate[12] = (uint64_t)atoi(entry);
+ if (entry) {
+ pipe_params[j].tc_rate[12] = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 12
oversubscription weight");
if (entry)
@@ -161,71 +244,154 @@ cfg_load_subport_profile(struct rte_cfgfile *cfg,
for (i = 0; i < profiles; i++) {
char sec_name[32];
+ /* convert to decimal */
+ int base = 10;
+
snprintf(sec_name, sizeof(sec_name), "subport profile %d", i);
entry = rte_cfgfile_get_entry(cfg, sec_name, "tb rate");
- if (entry)
- subport_profile[i].tb_rate = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tb_rate = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tb size");
- if (entry)
- subport_profile[i].tb_size = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tb_size = (uint64_t)strtoull(entry,
NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc period");
- if (entry)
- subport_profile[i].tc_period = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_period =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 0 rate");
- if (entry)
- subport_profile[i].tc_rate[0] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[0] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 1 rate");
- if (entry)
- subport_profile[i].tc_rate[1] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[1] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 2 rate");
- if (entry)
- subport_profile[i].tc_rate[2] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[2] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 3 rate");
- if (entry)
- subport_profile[i].tc_rate[3] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[3] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 4 rate");
- if (entry)
- subport_profile[i].tc_rate[4] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[4] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 5 rate");
- if (entry)
- subport_profile[i].tc_rate[5] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[5] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 6 rate");
- if (entry)
- subport_profile[i].tc_rate[6] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[6] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 7 rate");
- if (entry)
- subport_profile[i].tc_rate[7] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[7] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 8 rate");
- if (entry)
- subport_profile[i].tc_rate[8] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[8] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 9 rate");
- if (entry)
- subport_profile[i].tc_rate[9] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[9] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 10 rate");
- if (entry)
- subport_profile[i].tc_rate[10] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[10] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 11 rate");
- if (entry)
- subport_profile[i].tc_rate[11] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[11] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 12 rate");
- if (entry)
- subport_profile[i].tc_rate[12] = (uint64_t)atoi(entry);
+ if (entry) {
+ subport_profile[i].tc_rate[12] =
(uint64_t)strtoull(entry, NULL, base);
+ if (errno == EINVAL || errno == ERANGE) {
+ /* cannot convert string to unsigned long long
*/
+ return -1;
+ }
+ }
}
return 0;
--
2.25.1
