/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
shash_init(&args);
- while ((option = strtok_r(NULL, "", &save_ptr)) != NULL) {
+ while ((option = strtok_r(NULL, ",", &save_ptr)) != NULL) {
char *save_ptr_2 = NULL;
char *key, *value;
static bool
get_port_number(struct dpif *dpif, const char *name, uint16_t *port)
{
- struct odp_port odp_port;
+ struct dpif_port dpif_port;
- if (!dpif_port_query_by_name(dpif, name, &odp_port)) {
- *port = odp_port.port;
+ if (!dpif_port_query_by_name(dpif, name, &dpif_port)) {
+ *port = dpif_port.port_no;
+ dpif_port_destroy(&dpif_port);
return true;
} else {
ovs_error(0, "no port named %s", name);
show_dpif(struct dpif *dpif)
{
struct dpif_port_dump dump;
- struct odp_port odp_port;
+ struct dpif_port dpif_port;
struct odp_stats stats;
printf("%s:\n", dpif_name(dpif));
if (!dpif_get_dp_stats(dpif, &stats)) {
- printf("\tflows: cur:%"PRIu32", soft-max:%"PRIu32", "
- "hard-max:%"PRIu32"\n",
- stats.n_flows, stats.cur_capacity, stats.max_capacity);
- printf("\tports: cur:%"PRIu32", max:%"PRIu32"\n",
- stats.n_ports, stats.max_ports);
printf("\tlookups: frags:%llu, hit:%llu, missed:%llu, lost:%llu\n",
(unsigned long long int) stats.n_frags,
(unsigned long long int) stats.n_hit,
(unsigned long long int) stats.n_missed,
(unsigned long long int) stats.n_lost);
- printf("\tqueues: max-miss:%"PRIu16", max-action:%"PRIu16"\n",
- stats.max_miss_queue, stats.max_action_queue);
}
- DPIF_PORT_FOR_EACH (&odp_port, &dump, dpif) {
- printf("\tport %u: %s", odp_port.port, odp_port.devname);
+ DPIF_PORT_FOR_EACH (&dpif_port, &dump, dpif) {
+ printf("\tport %u: %s", dpif_port.port_no, dpif_port.name);
- if (strcmp(odp_port.type, "system")) {
+ if (strcmp(dpif_port.type, "system")) {
struct netdev_options netdev_options;
struct netdev *netdev;
int error;
- printf (" (%s", odp_port.type);
+ printf (" (%s", dpif_port.type);
- netdev_options.name = odp_port.devname;
- netdev_options.type = odp_port.type;
+ netdev_options.name = dpif_port.name;
+ netdev_options.type = dpif_port.type;
netdev_options.args = NULL;
netdev_options.ethertype = NETDEV_ETH_TYPE_NONE;
error = netdev_open(&netdev_options, &netdev);
static void
do_dump_flows(int argc OVS_UNUSED, char *argv[])
{
+ const struct dpif_flow_stats *stats;
+ const struct nlattr *actions;
struct dpif_flow_dump dump;
+ const struct nlattr *key;
+ size_t actions_len;
struct dpif *dpif;
+ size_t key_len;
struct ds ds;
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");
ds_init(&ds);
dpif_flow_dump_start(&dump, dpif);
- for (;;) {
- enum { MAX_ACTIONS = 4096 }; /* An arbitrary but large number. */
- uint32_t actions[MAX_ACTIONS * sizeof(struct nlattr) / 4];
- uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
- struct odp_flow f;
-
- memset(&f, 0, sizeof f);
- f.actions = (struct nlattr *) actions;
- f.actions_len = sizeof actions;
- f.key = (struct nlattr *) keybuf;
- f.key_len = sizeof keybuf;
-
- if (!dpif_flow_dump_next(&dump, &f)) {
- break;
- }
-
+ while (dpif_flow_dump_next(&dump, &key, &key_len,
+ &actions, &actions_len, &stats)) {
ds_clear(&ds);
- format_odp_flow(&ds, &f);
+ odp_flow_key_format(key, key_len, &ds);
+ ds_put_cstr(&ds, ", ");
+ dpif_flow_stats_format(stats, &ds);
+ ds_put_cstr(&ds, ", actions:");
+ format_odp_actions(&ds, actions, actions_len);
printf("%s\n", ds_cstr(&ds));
}
dpif_flow_dump_done(&dump);