/*-
* BSD LICENSE
- *
- * Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
* are met:
- *
- * * Redistributions of source code must retain the above copyright
+ *
+ * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
* distribution.
- * * Neither the name of Intel Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
*/
#include <stdio.h>
goto error1;
}
- rte_snprintf(cfg->sections[curr_section]->name,
+ snprintf(cfg->sections[curr_section]->name,
sizeof(cfg->sections[0]->name),
"%s", &buffer[1]);
}
}
struct cfg_entry *entry = sect->entries[curr_entry];
- rte_snprintf(entry->name, sizeof(entry->name), "%s", split[0]);
- rte_snprintf(entry->value, sizeof(entry->value), "%s", split[1]);
+ snprintf(entry->name, sizeof(entry->name), "%s", split[0]);
+ snprintf(entry->value, sizeof(entry->value), "%s", split[1]);
_strip(entry->name, strnlen(entry->name, sizeof(entry->name)));
_strip(entry->value, strnlen(entry->value, sizeof(entry->value)));
}
}
int
-cfg_num_sections(struct cfg_file *cfg, const char *sectionname, size_t length)
-{
- int i;
- int num_sections = 0;
- for (i = 0; i < cfg->num_sections; i++) {
- if (strncmp(cfg->sections[i]->name, sectionname, length) == 0)
- num_sections++;
- }
- return num_sections;
-}
-
-int
-cfg_sections(struct cfg_file *cfg, char *sections[], int max_sections)
-{
- int i;
- for (i = 0; i < cfg->num_sections && i < max_sections; i++) {
- rte_snprintf(sections[i], CFG_NAME_LEN, "%s", cfg->sections[i]->name);
- }
- return i;
-}
-
-static const struct cfg_section *
-_get_section(struct cfg_file *cfg, const char *sectionname)
-{
- int i;
- for (i = 0; i < cfg->num_sections; i++) {
- if (strncmp(cfg->sections[i]->name, sectionname,
- sizeof(cfg->sections[0]->name)) == 0)
- return cfg->sections[i];
- }
- return NULL;
-}
-
-int
-cfg_has_section(struct cfg_file *cfg, const char *sectionname)
-{
- return (_get_section(cfg, sectionname) != NULL);
-}
-
-int
-cfg_section_num_entries(struct cfg_file *cfg, const char *sectionname)
-{
- const struct cfg_section *s = _get_section(cfg, sectionname);
- if (s == NULL)
- return -1;
- return s->num_entries;
-}
-
-
-int
-cfg_section_entries(struct cfg_file *cfg, const char *sectionname,
- struct cfg_entry *entries, int max_entries)
-{
- int i;
- const struct cfg_section *sect = _get_section(cfg, sectionname);
- if (sect == NULL)
- return -1;
- for (i = 0; i < max_entries && i < sect->num_entries; i++)
- entries[i] = *sect->entries[i];
- return i;
-}
-
-const char *
-cfg_get_entry(struct cfg_file *cfg, const char *sectionname,
- const char *entryname)
-{
- int i;
- const struct cfg_section *sect = _get_section(cfg, sectionname);
- if (sect == NULL)
- return NULL;
- for (i = 0; i < sect->num_entries; i++)
- if (strncmp(sect->entries[i]->name, entryname, CFG_NAME_LEN) == 0)
- return sect->entries[i]->value;
- return NULL;
-}
-
-int
-cfg_has_entry(struct cfg_file *cfg, const char *sectionname,
- const char *entryname)
-{
- return (cfg_get_entry(cfg, sectionname, entryname) != NULL);
-}
-
-
-int
-cfg_load_port(struct cfg_file *cfg, struct rte_sched_port_params *port_params)
+cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params)
{
const char *entry;
int j;
if (!cfg || !port_params)
return -1;
- entry = cfg_get_entry(cfg, "port", "frame overhead");
+ entry = rte_cfgfile_get_entry(cfg, "port", "frame overhead");
if (entry)
port_params->frame_overhead = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, "port", "number of subports per port");
+ entry = rte_cfgfile_get_entry(cfg, "port", "number of subports per port");
if (entry)
port_params->n_subports_per_port = (uint32_t)atoi(entry);
-
- entry = cfg_get_entry(cfg, "port", "number of pipes per subport");
+
+ entry = rte_cfgfile_get_entry(cfg, "port", "number of pipes per subport");
if (entry)
port_params->n_pipes_per_subport = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, "port", "queue sizes");
+ entry = rte_cfgfile_get_entry(cfg, "port", "queue sizes");
if (entry) {
char *next;
-
+
for(j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
port_params->qsize[j] = (uint16_t)strtol(entry, &next, 10);
if (next == NULL)
char str[32];
/* Parse WRED min thresholds */
- rte_snprintf(str, sizeof(str), "tc %d wred min", j);
- entry = cfg_get_entry(cfg, "red", str);
+ snprintf(str, sizeof(str), "tc %d wred min", j);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
if (entry) {
char *next;
int k;
}
/* Parse WRED max thresholds */
- rte_snprintf(str, sizeof(str), "tc %d wred max", j);
- entry = cfg_get_entry(cfg, "red", str);
+ snprintf(str, sizeof(str), "tc %d wred max", j);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
if (entry) {
char *next;
int k;
}
/* Parse WRED inverse mark probabilities */
- rte_snprintf(str, sizeof(str), "tc %d wred inv prob", j);
- entry = cfg_get_entry(cfg, "red", str);
+ snprintf(str, sizeof(str), "tc %d wred inv prob", j);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
if (entry) {
char *next;
int k;
}
/* Parse WRED EWMA filter weights */
- rte_snprintf(str, sizeof(str), "tc %d wred weight", j);
- entry = cfg_get_entry(cfg, "red", str);
+ snprintf(str, sizeof(str), "tc %d wred weight", j);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
if (entry) {
char *next;
int k;
}
}
#endif /* RTE_SCHED_RED */
-
+
return 0;
}
int
-cfg_load_pipe(struct cfg_file *cfg, struct rte_sched_pipe_params *pipe_params)
+cfg_load_pipe(struct rte_cfgfile *cfg, struct rte_sched_pipe_params *pipe_params)
{
int i, j;
char *next;
if (!cfg || !pipe_params)
return -1;
- profiles = cfg_num_sections(cfg, "pipe profile", sizeof("pipe profile") - 1);
+ profiles = rte_cfgfile_num_sections(cfg, "pipe profile", sizeof("pipe profile") - 1);
port_params.n_pipe_profiles = profiles;
for (j = 0; j < profiles; j++) {
char pipe_name[32];
- rte_snprintf(pipe_name, sizeof(pipe_name), "pipe profile %d", j);
+ snprintf(pipe_name, sizeof(pipe_name), "pipe profile %d", j);
- entry = cfg_get_entry(cfg, pipe_name, "tb rate");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tb rate");
if (entry)
pipe_params[j].tb_rate = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, pipe_name, "tb size");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tb size");
if (entry)
pipe_params[j].tb_size = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, pipe_name, "tc period");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc period");
if (entry)
pipe_params[j].tc_period = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, pipe_name, "tc 0 rate");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 0 rate");
if (entry)
pipe_params[j].tc_rate[0] = (uint32_t)atoi(entry);
-
- entry = cfg_get_entry(cfg, pipe_name, "tc 1 rate");
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 1 rate");
if (entry)
pipe_params[j].tc_rate[1] = (uint32_t)atoi(entry);
-
- entry = cfg_get_entry(cfg, pipe_name, "tc 2 rate");
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 2 rate");
if (entry)
pipe_params[j].tc_rate[2] = (uint32_t)atoi(entry);
-
- entry = cfg_get_entry(cfg, pipe_name, "tc 3 rate");
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3 rate");
if (entry)
pipe_params[j].tc_rate[3] = (uint32_t)atoi(entry);
#ifdef RTE_SCHED_SUBPORT_TC_OV
- entry = cfg_get_entry(cfg, pipe_name, "tc 3 oversubscription weight");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3 oversubscription weight");
if (entry)
pipe_params[j].tc_ov_weight = (uint8_t)atoi(entry);
#endif
- entry = cfg_get_entry(cfg, pipe_name, "tc 0 wrr weights");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 0 wrr weights");
if (entry) {
for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*0 + i] =
entry = next;
}
}
- entry = cfg_get_entry(cfg, pipe_name, "tc 1 wrr weights");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 1 wrr weights");
if (entry) {
for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*1 + i] =
entry = next;
}
}
- entry = cfg_get_entry(cfg, pipe_name, "tc 2 wrr weights");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 2 wrr weights");
if (entry) {
for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*2 + i] =
entry = next;
}
}
- entry = cfg_get_entry(cfg, pipe_name, "tc 3 wrr weights");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3 wrr weights");
if (entry) {
for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*3 + i] =
}
int
-cfg_load_subport(struct cfg_file *cfg, struct rte_sched_subport_params *subport_params)
+cfg_load_subport(struct rte_cfgfile *cfg, struct rte_sched_subport_params *subport_params)
{
const char *entry;
int i, j, k;
for (i = 0; i < MAX_SCHED_SUBPORTS; i++) {
char sec_name[CFG_NAME_LEN];
- rte_snprintf(sec_name, sizeof(sec_name), "subport %d", i);
+ snprintf(sec_name, sizeof(sec_name), "subport %d", i);
- if (cfg_has_section(cfg, sec_name)) {
- entry = cfg_get_entry(cfg, sec_name, "tb rate");
+ if (rte_cfgfile_has_section(cfg, sec_name)) {
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tb rate");
if (entry)
subport_params[i].tb_rate = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, sec_name, "tb size");
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tb size");
if (entry)
subport_params[i].tb_size = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, sec_name, "tc period");
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc period");
if (entry)
subport_params[i].tc_period = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, sec_name, "tc 0 rate");
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 0 rate");
if (entry)
subport_params[i].tc_rate[0] = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, sec_name, "tc 1 rate");
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 1 rate");
if (entry)
subport_params[i].tc_rate[1] = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, sec_name, "tc 2 rate");
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 2 rate");
if (entry)
subport_params[i].tc_rate[2] = (uint32_t)atoi(entry);
- entry = cfg_get_entry(cfg, sec_name, "tc 3 rate");
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 3 rate");
if (entry)
subport_params[i].tc_rate[3] = (uint32_t)atoi(entry);
- int n_entries = cfg_section_num_entries(cfg, sec_name);
- struct cfg_entry entries[n_entries];
+ int n_entries = rte_cfgfile_section_num_entries(cfg, sec_name);
+ struct rte_cfgfile_entry entries[n_entries];
- cfg_section_entries(cfg, sec_name, entries, n_entries);
+ rte_cfgfile_section_entries(cfg, sec_name, entries, n_entries);
for (j = 0; j < n_entries; j++) {
if (strncmp("pipe", entries[j].name, sizeof("pipe") - 1) == 0) {
for (k = begin; k <= end; k++) {
char profile_name[CFG_NAME_LEN];
- rte_snprintf(profile_name, sizeof(profile_name),
+ snprintf(profile_name, sizeof(profile_name),
"pipe profile %d", profile);
- if (cfg_has_section(cfg, profile_name))
+ if (rte_cfgfile_has_section(cfg, profile_name))
app_pipe_to_profile[i][k] = profile;
else
rte_exit(EXIT_FAILURE, "Wrong pipe profile %s\n",
return 0;
}
-
-
git.droids-corp.org / dpdk.git / blobdiff