mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

lib/cmap: Simplify iteration with C99 loop declaration.

Browse Source 
This further eases porting existing hmap code to use cmap instead.

The iterator variants taking an explicit cursor are retained (renamed)
as they are needed when iteration is to be continued from the last
iterated node.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
This commit is contained in:
Jarno Rajahalme
2014-06-11 11:07:43 -07:00
parent 52054c1515
commit a532e683cf
3 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/dpif-netdev.c
View File

@@ -537,7 +537,6 @@ dp_netdev_free(struct dp_netdev *dp)
{
struct dp_netdev_port *port;
struct dp_netdev_stats *bucket;
struct cmap_cursor cursor;
int i;
shash_find_and_delete(&dp_netdevs, dp->name);
@@ -547,7 +546,7 @@ dp_netdev_free(struct dp_netdev *dp)
dp_netdev_flow_flush(dp);
ovs_mutex_lock(&dp->port_mutex);
CMAP_FOR_EACH (port, node, &cursor, &dp->ports) {
CMAP_FOR_EACH (port, node, &dp->ports) {
do_del_port(dp, port);
}
ovs_mutex_unlock(&dp->port_mutex);
@@ -848,9 +847,8 @@ get_port_by_name(struct dp_netdev *dp,
OVS_REQUIRES(dp->port_mutex)
{
struct dp_netdev_port *port;
struct cmap_cursor cursor;
CMAP_FOR_EACH (port, node, &cursor, &dp->ports) {
CMAP_FOR_EACH (port, node, &dp->ports) {
if (!strcmp(netdev_get_name(port->netdev), devname)) {
*portp = port;
return 0;
@@ -1772,9 +1770,8 @@ dpif_netdev_run(struct dpif *dpif)
{
struct dp_netdev_port *port;
struct dp_netdev *dp = get_dp_netdev(dpif);
struct cmap_cursor cursor;
CMAP_FOR_EACH (port, node, &cursor, &dp->ports) {
CMAP_FOR_EACH (port, node, &dp->ports) {
if (!netdev_is_pmd(port->netdev)) {
int i;
@@ -1790,10 +1787,9 @@ dpif_netdev_wait(struct dpif *dpif)
{
struct dp_netdev_port *port;
struct dp_netdev *dp = get_dp_netdev(dpif);
struct cmap_cursor cursor;
ovs_mutex_lock(&dp_netdev_mutex);
CMAP_FOR_EACH (port, node, &cursor, &dp->ports) {
CMAP_FOR_EACH (port, node, &dp->ports) {
if (!netdev_is_pmd(port->netdev)) {
int i;
@@ -1817,7 +1813,6 @@ pmd_load_queues(struct pmd_thread *f,
struct dp_netdev *dp = f->dp;
struct rxq_poll *poll_list = *ppoll_list;
struct dp_netdev_port *port;
struct cmap_cursor cursor;
int id = f->id;
int index;
int i;
@@ -1830,7 +1825,7 @@ pmd_load_queues(struct pmd_thread *f,
poll_cnt = 0;
index = 0;
CMAP_FOR_EACH (port, node, &cursor, &f->dp->ports) {
CMAP_FOR_EACH (port, node, &f->dp->ports) {
if (netdev_is_pmd(port->netdev)) {
int i;