[ovs-dev] [lacp_bugs 6/7] lacp: Sort slaves in appctl output.
Ethan Jackson
ethan at nicira.com
Wed Nov 30 03:53:23 UTC 2011
This will simplify unit tests added in a future patch.
---
lib/lacp.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/lib/lacp.c b/lib/lacp.c
index 2e16385..ddfa4b2 100644
--- a/lib/lacp.c
+++ b/lib/lacp.c
@@ -25,6 +25,7 @@
#include "ofpbuf.h"
#include "packets.h"
#include "poll-loop.h"
+#include "shash.h"
#include "timer.h"
#include "timeval.h"
#include "unixctl.h"
@@ -760,7 +761,11 @@ ds_put_lacp_state(struct ds *ds, uint8_t state)
static void
lacp_print_details(struct ds *ds, struct lacp *lacp)
{
+ struct shash slave_shash = SHASH_INITIALIZER(&slave_shash);
+ const struct shash_node **sorted_slaves = NULL;
+
struct slave *slave;
+ int i;
ds_put_format(ds, "---- %s ----\n", lacp->name);
ds_put_format(ds, "\tstatus: %s", lacp->active ? "active" : "passive");
@@ -798,9 +803,15 @@ lacp_print_details(struct ds *ds, struct lacp *lacp)
}
HMAP_FOR_EACH (slave, node, &lacp->slaves) {
+ shash_add(&slave_shash, slave->name, slave);
+ }
+ sorted_slaves = shash_sort(&slave_shash);
+
+ for (i = 0; i < shash_count(&slave_shash); i++) {
char *status;
struct lacp_info actor;
+ slave = sorted_slaves[i]->data;
slave_get_actor(slave, &actor);
switch (slave->status) {
case LACP_CURRENT:
@@ -849,6 +860,9 @@ lacp_print_details(struct ds *ds, struct lacp *lacp)
ds_put_lacp_state(ds, slave->partner.state);
ds_put_cstr(ds, "\n");
}
+
+ shash_destroy(&slave_shash);
+ free(sorted_slaves);
}
static void
--
1.7.7
More information about the dev
mailing list