#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);
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;
}
}
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 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 dpif_port_dump dump;
struct dpif_port dpif_port;
- struct odp_stats stats;
+ struct ovs_dp_stats stats;
printf("%s:\n", dpif_name(dpif));
if (!dpif_get_dp_stats(dpif, &stats)) {
(unsigned long long int) stats.n_hit,
(unsigned long long int) stats.n_missed,
(unsigned long long int) stats.n_lost);
+ printf("\tflows: %llu\n", (unsigned long long int)stats.n_flows);
}
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")) {
- struct netdev_options netdev_options;
struct netdev *netdev;
int error;
printf (" (%s", dpif_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);
+ error = netdev_open(dpif_port.name, dpif_port.type, &netdev);
if (!error) {
- const struct shash_node **nodes;
- const struct shash *config;
- size_t i;
-
- config = netdev_get_config(netdev);
- 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);
+ 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));
}
- free(nodes);
+ shash_destroy_free_data(&config);
netdev_close(netdev);
} else {
putchar(')');
}
putchar('\n');
+
+ if (print_statistics) {
+ const struct netdev_stats *s = &dpif_port.stats;
+
+ 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");
+ }
}
dpif_close(dpif);
}
}
}
} else {
- struct svec types;
+ struct sset types;
const char *type;
- size_t i;
- svec_init(&types);
+ sset_init(&types);
dp_enumerate_types(&types);
- SVEC_FOR_EACH (i, type, &types) {
- struct svec names;
+ SSET_FOR_EACH (type, &types) {
+ struct sset names;
const char *name;
- size_t j;
- svec_init(&names);
+ sset_init(&names);
if (dp_enumerate_names(type, &names)) {
failure = true;
continue;
}
- SVEC_FOR_EACH (j, name, &names) {
+ SSET_FOR_EACH (name, &names) {
struct dpif *dpif;
int error;
failure = true;
}
}
- svec_destroy(&names);
+ sset_destroy(&names);
}
- svec_destroy(&types);
+ 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);
}