From: Ben Pfaff <blp@nicira.com>
Date: Tue, 28 Dec 2010 00:20:11 +0000 (-0800)
Subject: datapath: Clean up use of TBL_* constants.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=406e37ecf554529e9380ef06863d85ccc94009d1;p=openvswitch

datapath: Clean up use of TBL_* constants.

A lot of the TBL_* constants were being used in conceptually wrong ways,
even though the code was correct because the actual values were correct.
(This is because TBL_L1_BITS, TBL_L2_BITS, and TBL_L1_SHIFT are all 10
and TBL_L1_SIZE and TBL_L2_SIZE are both 1024.)

Signed-off-by: Ben Pfaff <blp@nicira.com>
Reported-by: Jesse Gross <jesse@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/table.c b/datapath/table.c
index 8a105324..d2432e89 100644
--- a/datapath/table.c
+++ b/datapath/table.c
@@ -45,11 +45,11 @@ static void free_buckets(struct tbl_bucket ***l1, unsigned int n_buckets,
 {
 	unsigned int i;
 
-	for (i = 0; i < n_buckets >> TBL_L1_BITS; i++) {
+	for (i = 0; i < n_buckets >> TBL_L1_SHIFT; i++) {
 		struct tbl_bucket **l2 = l1[i];
 		unsigned int j;
 
-		for (j = 0; j < TBL_L1_SIZE; j++) {
+		for (j = 0; j < TBL_L2_SIZE; j++) {
 			struct tbl_bucket *bucket = l2[j];
 			if (!bucket)
 				continue;
@@ -71,14 +71,14 @@ static struct tbl_bucket ***alloc_buckets(unsigned int n_buckets)
 	struct tbl_bucket ***l1;
 	unsigned int i;
 
-	l1 = kmalloc((n_buckets >> TBL_L1_BITS) * sizeof(struct tbl_bucket **),
+	l1 = kmalloc((n_buckets >> TBL_L1_SHIFT) * sizeof(struct tbl_bucket **),
 		     GFP_KERNEL);
 	if (!l1)
 		return NULL;
-	for (i = 0; i < n_buckets >> TBL_L1_BITS; i++) {
+	for (i = 0; i < n_buckets >> TBL_L1_SHIFT; i++) {
 		l1[i] = (struct tbl_bucket **)get_zeroed_page(GFP_KERNEL);
 		if (!l1[i]) {
-			free_buckets(l1, i << TBL_L1_BITS, NULL);
+			free_buckets(l1, i << TBL_L1_SHIFT, NULL);
 			return NULL;
 		}
 	}
@@ -225,16 +225,23 @@ struct tbl_node *tbl_lookup(struct tbl *table, void *target, u32 hash,
 int tbl_foreach(struct tbl *table,
 		int (*callback)(struct tbl_node *, void *aux), void *aux)
 {
-	unsigned int i, j, k;
-	for (i = 0; i < table->n_buckets >> TBL_L1_BITS; i++) {
-		struct tbl_bucket __rcu **l2 = table->buckets[i];
-		for (j = 0; j < TBL_L1_SIZE; j++) {
-			struct tbl_bucket *bucket = rcu_dereference(l2[j]);
+	unsigned int n_l1 = table->n_buckets >> TBL_L1_SHIFT;
+	unsigned int l1_idx;
+
+	for (l1_idx = 0; l1_idx < n_l1; l1_idx++) {
+		struct tbl_bucket __rcu **l2 = table->buckets[l1_idx];
+		unsigned int l2_idx;
+
+		for (l2_idx = 0; l2_idx < TBL_L2_SIZE; l2_idx++) {
+			struct tbl_bucket *bucket;
+			unsigned int i;
+
+			bucket = rcu_dereference(l2[l2_idx]);
 			if (!bucket)
 				continue;
 
-			for (k = 0; k < bucket->n_objs; k++) {
-				int error = (*callback)(bucket->objs[k], aux);
+			for (i = 0; i < bucket->n_objs; i++) {
+				int error = (*callback)(bucket->objs[i], aux);
 				if (error)
 					return error;
 			}