b=22194 lfs quota output refinement

[fs/lustre-release.git] / lustre / tests / it_test.c

diff --git a/lustre/tests/it_test.c b/lustre/tests/it_test.c
index 714828a..a2997a7 100644 (file)
--- a/lustre/tests/it_test.c
+++ b/lustre/tests/it_test.c
@@ -45,7 +45,7 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include <libcfs/libcfs.h>
+#include <libcfs/kp30.h>
 #include <../ldlm/interval_tree.c>
 
 #define dprintf(fmt, args...) //printf(fmt, ##args)
@@ -67,7 +67,7 @@ static struct it_node {
         int hit, valid;
 } *it_array;
 static int it_count;
-static CFS_LIST_HEAD(header);
+CFS_LIST_HEAD(header);
 static unsigned long max_count = ULONG_MAX & ALIGN_MASK;
 static int have_wide_lock = 0;
 
@@ -84,13 +84,11 @@ static enum interval_iter cb(struct interval_node *n, void *args)
         static int count = 1;
 
         if (node->hit == 1) {
-                dprintf("NODE "__S" has ever been accessed\n",
-                        __F(&n->in_extent));
+                error("A duplicate node "__S" access found\n",
+                       __F(&n->in_extent));
                 return INTERVAL_ITER_CONT;
-                error("duplicate node accessing found\n");
-                return INTERVAL_ITER_STOP;
         }
-
+        
         if (node->valid == 0) {
                 error("A deleted node "__S" being accessed\n",
                        __F(&n->in_extent));
@@ -128,23 +126,23 @@ static int it_test_search(struct interval_node *root)
                 interval_search(root, &ext, cb, NULL);
 
                 dprintf("\nverifing ...");
-
+        
                 /* verify */
                 for (i = 0; i < it_count; i++) {
                         n = &it_array[i];
                         if (n->valid == 0)
                                 continue;
 
-                        if (extent_overlapped(&ext, &n->node.in_extent) &&
+                        if (extent_overlapped(&ext, &n->node.in_extent) && 
                             n->hit == 0)
                                 error("node "__S" overlaps" __S","
-                                      "but never to be hit.\n",
+                                      "but never to be hit.\n", 
                                       __F(&n->node.in_extent),
                                       __F(&ext));
 
-                        if (!extent_overlapped(&ext, &n->node.in_extent) &&
+                        if (!extent_overlapped(&ext, &n->node.in_extent) && 
                             n->hit)
-                                error("node "__S" overlaps" __S", but hit.\n",
+                                error("node "__S" overlaps" __S", but hit.\n", 
                                       __F(&n->node.in_extent),
                                       __F(&ext));
                 }
@@ -245,9 +243,8 @@ static enum interval_iter sanity_cb(struct interval_node *node, void *args)
         }
 
         if (!has) {
-                int count;
+                int count = 1;
 err:
-                count = 1;
                 dprintf("node"__S":%llu Child list:\n",
                         node->in_extent.start,
                         node->in_extent.end,
@@ -285,7 +282,7 @@ err:
         }
         if (nr)
                 error("wrong tree, unbalanced!\n");
-
+        
         return 0;
 }
 
@@ -341,7 +338,7 @@ static int it_test_search_hole(struct interval_node *root)
         return 0;
 }
 
-static int contended_count = 0;
+static int contended_count = 0; 
 #define LOOP_COUNT 1000
 static enum interval_iter perf_cb(struct interval_node *n, void *args)
 {
@@ -356,7 +353,7 @@ static inline long tv_delta(struct timeval *s, struct timeval *e)
         long c = e->tv_sec - s->tv_sec;
         c *= 1000;
         c += (long int)(e->tv_usec - s->tv_usec) / 1000;
-        dprintf("\tStart: %lu:%lu -> End: %lu:%lu\n",
+        dprintf("\tStart: %lu:%lu -> End: %lu:%lu\n", 
                 s->tv_sec, s->tv_usec, e->tv_sec, e->tv_usec);
         return c;
 }
@@ -368,7 +365,7 @@ static int it_test_performance(struct interval_node *root, unsigned long len)
         struct it_node *n;
         struct timeval start, end;
         unsigned long count;
-
+        
         ext.start = (random() % (max_count - len)) & ALIGN_MASK;
         ext.end = (ext.start + len) & ALIGN_MASK;
         if (have_wide_lock) {
@@ -422,7 +419,7 @@ static struct interval_node *it_test_helper(struct interval_node *root)
                 if (n->valid) {
                         if (!interval_find(root, &n->node.in_extent))
                                 error("Cannot find an existent node\n");
-                        dprintf("Erasing a node "__S"\n",
+                        dprintf("Erasing a node "__S"\n", 
                                 __F(&n->node.in_extent));
                         interval_erase(&n->node, &root);
                         n->valid = 0;
@@ -436,7 +433,7 @@ static struct interval_node *it_test_helper(struct interval_node *root)
                         interval_set(&n->node, low, high);
                         while (interval_insert(&n->node, &root))
                                 interval_set(&n->node, low, ++high);
-                        dprintf("Adding a node "__S"\n",
+                        dprintf("Adding a node "__S"\n", 
                                 __F(&n->node.in_extent));
                         n->valid = 1;
                         list_add(&n->list, &header);