git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/mem: remove dependency on EAL internals
[dpdk.git]
/
app
/
test-pmd
/
cmdline_mtr.c
diff --git
a/app/test-pmd/cmdline_mtr.c
b/app/test-pmd/cmdline_mtr.c
index
c506d87
..
ab5c864
100644
(file)
--- a/
app/test-pmd/cmdline_mtr.c
+++ b/
app/test-pmd/cmdline_mtr.c
@@
-74,7
+74,7
@@
parse_uint(uint64_t *value, const char *str)
}
static int
}
static int
-parse_dscp_table_entries(char *str, enum rte_
mtr_
color **dscp_table)
+parse_dscp_table_entries(char *str, enum rte_color **dscp_table)
{
char *token;
int i = 0;
{
char *token;
int i = 0;
@@
-84,21
+84,21
@@
parse_dscp_table_entries(char *str, enum rte_mtr_color **dscp_table)
return 0;
/* Allocate memory for dscp table */
return 0;
/* Allocate memory for dscp table */
- *dscp_table = (enum rte_
mtr_
color *)malloc(MAX_DSCP_TABLE_ENTRIES *
- sizeof(enum rte_
mtr_
color));
+ *dscp_table = (enum rte_color *)malloc(MAX_DSCP_TABLE_ENTRIES *
+ sizeof(enum rte_color));
if (*dscp_table == NULL)
return -1;
while (1) {
if (strcmp(token, "G") == 0 ||
strcmp(token, "g") == 0)
if (*dscp_table == NULL)
return -1;
while (1) {
if (strcmp(token, "G") == 0 ||
strcmp(token, "g") == 0)
- *dscp_table[i++] = RTE_
MT
R_GREEN;
+ *dscp_table[i++] = RTE_
COLO
R_GREEN;
else if (strcmp(token, "Y") == 0 ||
strcmp(token, "y") == 0)
else if (strcmp(token, "Y") == 0 ||
strcmp(token, "y") == 0)
- *dscp_table[i++] = RTE_
MT
R_YELLOW;
+ *dscp_table[i++] = RTE_
COLO
R_YELLOW;
else if (strcmp(token, "R") == 0 ||
strcmp(token, "r") == 0)
else if (strcmp(token, "R") == 0 ||
strcmp(token, "r") == 0)
- *dscp_table[i++] = RTE_
MT
R_RED;
+ *dscp_table[i++] = RTE_
COLO
R_RED;
else {
free(*dscp_table);
return -1;
else {
free(*dscp_table);
return -1;
@@
-117,7
+117,7
@@
parse_dscp_table_entries(char *str, enum rte_mtr_color **dscp_table)
static int
parse_meter_color_str(char *c_str, uint32_t *use_prev_meter_color,
static int
parse_meter_color_str(char *c_str, uint32_t *use_prev_meter_color,
- enum rte_
mtr_
color **dscp_table)
+ enum rte_color **dscp_table)
{
char *token;
uint64_t previous_mtr_color = 0;
{
char *token;
uint64_t previous_mtr_color = 0;
@@
-182,20
+182,20
@@
parse_policer_action_string(char *p_str, uint32_t action_mask,
return -1;
if (g_color == 0 && (action_mask & 0x1)) {
return -1;
if (g_color == 0 && (action_mask & 0x1)) {
- actions[RTE_
MT
R_GREEN] = action;
+ actions[RTE_
COLO
R_GREEN] = action;
g_color = 1;
} else if (y_color == 0 && (action_mask & 0x2)) {
g_color = 1;
} else if (y_color == 0 && (action_mask & 0x2)) {
- actions[RTE_
MT
R_YELLOW] = action;
+ actions[RTE_
COLO
R_YELLOW] = action;
y_color = 1;
} else
y_color = 1;
} else
- actions[RTE_
MT
R_RED] = action;
+ actions[RTE_
COLO
R_RED] = action;
}
return 0;
}
static int
parse_multi_token_string(char *t_str, uint16_t *port_id,
}
return 0;
}
static int
parse_multi_token_string(char *t_str, uint16_t *port_id,
- uint32_t *mtr_id, enum rte_
mtr_
color **dscp_table)
+ uint32_t *mtr_id, enum rte_color **dscp_table)
{
char *token;
uint64_t val;
{
char *token;
uint64_t val;
@@
-782,7
+782,7
@@
static void cmd_create_port_meter_parsed(void *parsed_result,
uint32_t shared = res->shared;
uint32_t use_prev_meter_color = 0;
uint16_t port_id = res->port_id;
uint32_t shared = res->shared;
uint32_t use_prev_meter_color = 0;
uint16_t port_id = res->port_id;
- enum rte_
mtr_
color *dscp_table = NULL;
+ enum rte_color *dscp_table = NULL;
char *c_str = res->meter_input_color;
int ret;
char *c_str = res->meter_input_color;
int ret;
@@
-808,11
+808,11
@@
static void cmd_create_port_meter_parsed(void *parsed_result,
else
params.meter_enable = 0;
else
params.meter_enable = 0;
- params.action[RTE_
MT
R_GREEN] =
+ params.action[RTE_
COLO
R_GREEN] =
string_to_policer_action(res->g_action);
string_to_policer_action(res->g_action);
- params.action[RTE_
MT
R_YELLOW] =
+ params.action[RTE_
COLO
R_YELLOW] =
string_to_policer_action(res->y_action);
string_to_policer_action(res->y_action);
- params.action[RTE_
MT
R_RED] =
+ params.action[RTE_
COLO
R_RED] =
string_to_policer_action(res->r_action);
params.stats_mask = res->statistics_mask;
string_to_policer_action(res->r_action);
params.stats_mask = res->statistics_mask;
@@
-1134,7
+1134,7
@@
static void cmd_set_port_meter_dscp_table_parsed(void *parsed_result,
{
struct cmd_set_port_meter_dscp_table_result *res = parsed_result;
struct rte_mtr_error error;
{
struct cmd_set_port_meter_dscp_table_result *res = parsed_result;
struct rte_mtr_error error;
- enum rte_
mtr_
color *dscp_table = NULL;
+ enum rte_color *dscp_table = NULL;
char *t_str = res->token_string;
uint32_t mtr_id = 0;
uint16_t port_id;
char *t_str = res->token_string;
uint32_t mtr_id = 0;
uint16_t port_id;
@@
-1245,7
+1245,7
@@
static void cmd_set_port_meter_policer_action_parsed(void *parsed_result,
}
/* Allocate memory for policer actions */
}
/* Allocate memory for policer actions */
- actions = (enum rte_mtr_policer_action *)malloc(RTE_
MTR_
COLORS *
+ actions = (enum rte_mtr_policer_action *)malloc(RTE_COLORS *
sizeof(enum rte_mtr_policer_action));
if (actions == NULL) {
printf("Memory for policer actions not allocated (error)\n");
sizeof(enum rte_mtr_policer_action));
if (actions == NULL) {
printf("Memory for policer actions not allocated (error)\n");
@@
-1426,22
+1426,22
@@
static void cmd_show_port_meter_stats_parsed(void *parsed_result,
/* Display stats */
if (stats_mask & RTE_MTR_STATS_N_PKTS_GREEN)
printf("\tPkts G: %" PRIu64 "\n",
/* Display stats */
if (stats_mask & RTE_MTR_STATS_N_PKTS_GREEN)
printf("\tPkts G: %" PRIu64 "\n",
- stats.n_pkts[RTE_
MT
R_GREEN]);
+ stats.n_pkts[RTE_
COLO
R_GREEN]);
if (stats_mask & RTE_MTR_STATS_N_BYTES_GREEN)
printf("\tBytes G: %" PRIu64 "\n",
if (stats_mask & RTE_MTR_STATS_N_BYTES_GREEN)
printf("\tBytes G: %" PRIu64 "\n",
- stats.n_bytes[RTE_
MT
R_GREEN]);
+ stats.n_bytes[RTE_
COLO
R_GREEN]);
if (stats_mask & RTE_MTR_STATS_N_PKTS_YELLOW)
printf("\tPkts Y: %" PRIu64 "\n",
if (stats_mask & RTE_MTR_STATS_N_PKTS_YELLOW)
printf("\tPkts Y: %" PRIu64 "\n",
- stats.n_pkts[RTE_
MT
R_YELLOW]);
+ stats.n_pkts[RTE_
COLO
R_YELLOW]);
if (stats_mask & RTE_MTR_STATS_N_BYTES_YELLOW)
printf("\tBytes Y: %" PRIu64 "\n",
if (stats_mask & RTE_MTR_STATS_N_BYTES_YELLOW)
printf("\tBytes Y: %" PRIu64 "\n",
- stats.n_bytes[RTE_
MT
R_YELLOW]);
+ stats.n_bytes[RTE_
COLO
R_YELLOW]);
if (stats_mask & RTE_MTR_STATS_N_PKTS_RED)
printf("\tPkts R: %" PRIu64 "\n",
if (stats_mask & RTE_MTR_STATS_N_PKTS_RED)
printf("\tPkts R: %" PRIu64 "\n",
- stats.n_pkts[RTE_
MT
R_RED]);
+ stats.n_pkts[RTE_
COLO
R_RED]);
if (stats_mask & RTE_MTR_STATS_N_BYTES_RED)
printf("\tBytes R: %" PRIu64 "\n",
if (stats_mask & RTE_MTR_STATS_N_BYTES_RED)
printf("\tBytes R: %" PRIu64 "\n",
- stats.n_bytes[RTE_
MT
R_RED]);
+ stats.n_bytes[RTE_
COLO
R_RED]);
if (stats_mask & RTE_MTR_STATS_N_PKTS_DROPPED)
printf("\tPkts DROPPED: %" PRIu64 "\n",
stats.n_pkts_dropped);
if (stats_mask & RTE_MTR_STATS_N_PKTS_DROPPED)
printf("\tPkts DROPPED: %" PRIu64 "\n",
stats.n_pkts_dropped);