/*
- * 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.
#include "netdev.h"
#include "odp-util.h"
#include "shash.h"
-#include "svec.h"
+#include "sset.h"
#include "timeval.h"
#include "util.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(dpctl);
+/* -s, --statistics: Print port statistics? */
+static bool print_statistics;
+
static const struct command all_commands[];
static void usage(void) NO_RETURN;
VLOG_OPTION_ENUMS
};
static struct option long_options[] = {
- {"timeout", required_argument, 0, 't'},
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
+ {"statistics", no_argument, NULL, 's'},
+ {"timeout", required_argument, NULL, 't'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
VLOG_LONG_OPTIONS,
- {0, 0, 0, 0},
+ {NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
}
switch (c) {
+ case 's':
+ print_statistics = true;
+ break;
+
case 't':
timeout = strtoul(optarg, NULL, 10);
if (timeout <= 0) {
usage();
case 'V':
- OVS_PRINT_VERSION(0, 0);
+ ovs_print_version(0, 0);
exit(EXIT_SUCCESS);
VLOG_OPTION_HANDLERS
if (retval) {
va_list args;
- fprintf(stderr, "%s: ", program_name);
va_start(args, message);
- vfprintf(stderr, message, args);
- va_end(args);
- if (retval == EOF) {
- fputs(": unexpected end of file\n", stderr);
- } else {
- fprintf(stderr, ": %s\n", strerror(retval));
- }
-
- exit(EXIT_FAILURE);
+ ovs_fatal_valist(retval, message, args);
}
}
\f
struct netdev *netdev;
int retval;
- retval = netdev_open_default(netdev_name, &netdev);
+ retval = netdev_open(netdev_name, "system", &netdev);
if (!retval) {
retval = netdev_turn_flags_on(netdev, NETDEV_UP, true);
netdev_close(netdev);
dpif_close(dpif);
}
-static int
-compare_ports(const void *a_, const void *b_)
-{
- const struct odp_port *a = a_;
- const struct odp_port *b = b_;
- return a->port < b->port ? -1 : a->port > b->port;
-}
-
-static void
-query_ports(struct dpif *dpif, struct odp_port **ports, size_t *n_ports)
-{
- run(dpif_port_list(dpif, ports, n_ports), "listing ports");
- qsort(*ports, *n_ports, sizeof **ports, compare_ports);
-}
-
static void
do_add_if(int argc OVS_UNUSED, char *argv[])
{
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");
for (i = 2; i < argc; i++) {
+ const char *name, *type;
char *save_ptr = NULL;
- struct netdev_options options;
- struct netdev *netdev;
+ struct netdev *netdev = NULL;
struct shash args;
char *option;
int error;
- options.name = strtok_r(argv[i], ",", &save_ptr);
- options.type = "system";
- options.args = &args;
- options.ethertype = NETDEV_ETH_TYPE_NONE;
+ name = strtok_r(argv[i], ",", &save_ptr);
+ type = "system";
- if (!options.name) {
+ if (!name) {
ovs_error(0, "%s is not a valid network device name", argv[i]);
continue;
}
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;
}
if (!strcmp(key, "type")) {
- options.type = value;
+ type = value;
} else if (!shash_add_once(&args, key, value)) {
ovs_error(0, "duplicate \"%s\" option", key);
}
}
- error = netdev_open(&options, &netdev);
+ error = netdev_open(name, type, &netdev);
if (error) {
- ovs_error(error, "%s: failed to open network device",
- options.name);
- } else {
- error = dpif_port_add(dpif, netdev, NULL);
- if (error) {
- ovs_error(error, "adding %s to %s failed",
- options.name, argv[1]);
- } else {
- error = if_up(options.name);
- }
- netdev_close(netdev);
+ ovs_error(error, "%s: failed to open network device", name);
+ goto next;
+ }
+
+ error = netdev_set_config(netdev, &args);
+ if (error) {
+ ovs_error(error, "%s: failed to configure network device", name);
+ goto next;
}
+
+ error = dpif_port_add(dpif, netdev, NULL);
+ if (error) {
+ ovs_error(error, "adding %s to %s failed", name, argv[1]);
+ goto next;
+ }
+
+ error = if_up(name);
+
+next:
+ netdev_close(netdev);
if (error) {
failure = true;
}
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);
}
}
+static void
+print_stat(const char *leader, uint64_t value)
+{
+ fputs(leader, stdout);
+ if (value != UINT64_MAX) {
+ printf("%"PRIu64, value);
+ } else {
+ putchar('?');
+ }
+}
+
+static void
+print_human_size(uint64_t value)
+{
+ if (value == UINT64_MAX) {
+ /* Nothing to do. */
+ } else if (value >= 1024ULL * 1024 * 1024 * 1024) {
+ printf(" (%.1f TiB)", value / (1024.0 * 1024 * 1024 * 1024));
+ } else if (value >= 1024ULL * 1024 * 1024) {
+ printf(" (%.1f GiB)", value / (1024.0 * 1024 * 1024));
+ } else if (value >= 1024ULL * 1024) {
+ printf(" (%.1f MiB)", value / (1024.0 * 1024));
+ } else if (value >= 1024) {
+ printf(" (%.1f KiB)", value / 1024.0);
+ }
+}
+
static void
show_dpif(struct dpif *dpif)
{
- struct odp_port *ports;
- struct odp_stats stats;
- size_t n_ports;
- size_t i;
+ struct dpif_port_dump dump;
+ struct dpif_port dpif_port;
+ struct ovs_dp_stats stats;
+ struct netdev *netdev;
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);
+ printf("\tflows: %llu\n", (unsigned long long int)stats.n_flows);
}
- query_ports(dpif, &ports, &n_ports);
- for (i = 0; i < n_ports; i++) {
- const struct odp_port *p = &ports[i];
- struct ds ds;
+ DPIF_PORT_FOR_EACH (&dpif_port, &dump, dpif) {
+ printf("\tport %u: %s", dpif_port.port_no, dpif_port.name);
+
+ if (strcmp(dpif_port.type, "system")) {
+ int error;
- printf("\tport %u: %s", p->port, p->devname);
+ printf (" (%s", dpif_port.type);
- ds_init(&ds);
- format_odp_port_type(&ds, p);
- printf("%s\n", ds_cstr(&ds));
- ds_destroy(&ds);
+ error = netdev_open(dpif_port.name, dpif_port.type, &netdev);
+ if (!error) {
+ struct shash config;
+
+ shash_init(&config);
+ error = netdev_get_config(netdev, &config);
+ if (!error) {
+ const struct shash_node **nodes;
+ size_t i;
+
+ nodes = shash_sort(&config);
+ for (i = 0; i < shash_count(&config); i++) {
+ const struct shash_node *node = nodes[i];
+ printf("%c %s=%s", i ? ',' : ':',
+ node->name, (char *) node->data);
+ }
+ free(nodes);
+ } else {
+ printf(", could not retrieve configuration (%s)",
+ strerror(error));
+ }
+ shash_destroy_free_data(&config);
+
+ netdev_close(netdev);
+ } else {
+ printf(": open failed (%s)", strerror(error));
+ }
+ putchar(')');
+ }
+ putchar('\n');
+
+ if (print_statistics) {
+ struct netdev_stats s;
+ int error;
+
+ error = netdev_open(dpif_port.name, dpif_port.type, &netdev);
+ if (error) {
+ printf(", open failed (%s)", strerror(error));
+ continue;
+ }
+ error = netdev_get_stats(netdev, &s);
+ if (error) {
+ printf(", could not retrieve stats (%s)", strerror(error));
+ continue;
+ }
+
+ netdev_close(netdev);
+ print_stat("\t\tRX packets:", s.rx_packets);
+ print_stat(" errors:", s.rx_errors);
+ print_stat(" dropped:", s.rx_dropped);
+ print_stat(" overruns:", s.rx_over_errors);
+ print_stat(" frame:", s.rx_frame_errors);
+ printf("\n");
+
+ print_stat("\t\tTX packets:", s.tx_packets);
+ print_stat(" errors:", s.tx_errors);
+ print_stat(" dropped:", s.tx_dropped);
+ print_stat(" aborted:", s.tx_aborted_errors);
+ print_stat(" carrier:", s.tx_carrier_errors);
+ printf("\n");
+
+ print_stat("\t\tcollisions:", s.collisions);
+ printf("\n");
+
+ print_stat("\t\tRX bytes:", s.rx_bytes);
+ print_human_size(s.rx_bytes);
+ print_stat(" TX bytes:", s.tx_bytes);
+ print_human_size(s.tx_bytes);
+ printf("\n");
+ }
}
- free(ports);
dpif_close(dpif);
}
}
}
} else {
- unsigned int i;
- for (i = 0; i < ODP_MAX; i++) {
- char name[128];
- struct dpif *dpif;
- int error;
+ struct sset types;
+ const char *type;
- sprintf(name, "dp%u", i);
- error = parsed_dpif_open(name, false, &dpif);
- if (!error) {
- show_dpif(dpif);
- } else if (error != ENODEV) {
- ovs_error(error, "opening datapath %s failed", name);
+ sset_init(&types);
+ dp_enumerate_types(&types);
+ SSET_FOR_EACH (type, &types) {
+ struct sset names;
+ const char *name;
+
+ sset_init(&names);
+ if (dp_enumerate_names(type, &names)) {
failure = true;
+ continue;
+ }
+ SSET_FOR_EACH (name, &names) {
+ struct dpif *dpif;
+ int error;
+
+ error = dpif_open(name, type, &dpif);
+ if (!error) {
+ show_dpif(dpif);
+ } else {
+ ovs_error(error, "opening datapath %s failed", name);
+ failure = true;
+ }
}
+ sset_destroy(&names);
}
+ sset_destroy(&types);
}
if (failure) {
exit(EXIT_FAILURE);
static void
do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
- struct svec dpif_names, dpif_types;
- unsigned int i;
+ struct sset dpif_names, dpif_types;
+ const char *type;
int error = 0;
- svec_init(&dpif_names);
- svec_init(&dpif_types);
+ sset_init(&dpif_names);
+ sset_init(&dpif_types);
dp_enumerate_types(&dpif_types);
- for (i = 0; i < dpif_types.n; i++) {
- unsigned int j;
+ SSET_FOR_EACH (type, &dpif_types) {
+ const char *name;
int retval;
- retval = dp_enumerate_names(dpif_types.names[i], &dpif_names);
+ retval = dp_enumerate_names(type, &dpif_names);
if (retval) {
error = retval;
}
- for (j = 0; j < dpif_names.n; j++) {
+ SSET_FOR_EACH (name, &dpif_names) {
struct dpif *dpif;
- if (!dpif_open(dpif_names.names[j], dpif_types.names[i], &dpif)) {
+ if (!dpif_open(name, type, &dpif)) {
printf("%s\n", dpif_name(dpif));
dpif_close(dpif);
}
}
}
- svec_destroy(&dpif_names);
- svec_destroy(&dpif_types);
+ sset_destroy(&dpif_names);
+ sset_destroy(&dpif_types);
if (error) {
exit(EXIT_FAILURE);
}
static void
do_dump_flows(int argc OVS_UNUSED, char *argv[])
{
- struct odp_flow *flows;
+ 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 n_flows;
+ size_t key_len;
struct ds ds;
- size_t i;
run(parsed_dpif_open(argv[1], false, &dpif), "opening datapath");
- run(dpif_flow_list_all(dpif, &flows, &n_flows), "listing all flows");
ds_init(&ds);
- for (i = 0; i < n_flows; i++) {
- struct odp_flow *f = &flows[i];
- enum { MAX_ACTIONS = 4096 }; /* An arbitrary but large number. */
- struct nlattr actions[MAX_ACTIONS];
-
- f->actions = actions;
- f->actions_len = sizeof actions;
- if (!dpif_flow_get(dpif, f)) {
- ds_clear(&ds);
- format_odp_flow(&ds, f);
- printf("%s\n", ds_cstr(&ds));
- }
+ dpif_flow_dump_start(&dump, dpif);
+ while (dpif_flow_dump_next(&dump, &key, &key_len,
+ &actions, &actions_len, &stats)) {
+ ds_clear(&ds);
+ 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);
ds_destroy(&ds);
dpif_close(dpif);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff