Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-797 tests: improve test_23b of ost-pools.sh
[fs/lustre-release.git]
/
lustre
/
tests
/
it_test.c
diff --git
a/lustre/tests/it_test.c
b/lustre/tests/it_test.c
index
0b394a0
..
7b6906a
100644
(file)
--- a/
lustre/tests/it_test.c
+++ b/
lustre/tests/it_test.c
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,7
+24,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-63,7
+61,7
@@
static struct it_node {
struct interval_node node;
static struct it_node {
struct interval_node node;
-
struct list_head
list;
+
cfs_list_t
list;
int hit, valid;
} *it_array;
static int it_count;
int hit, valid;
} *it_array;
static int it_count;
@@
-84,13
+82,11
@@
static enum interval_iter cb(struct interval_node *n, void *args)
static int count = 1;
if (node->hit == 1) {
static int count = 1;
if (node->hit == 1) {
-
dprintf("NODE "__S" has ever been accesse
d\n",
-
__F(&n->in_extent));
+
error("A duplicate node "__S" access foun
d\n",
+ __F(&n->in_extent));
return INTERVAL_ITER_CONT;
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));
if (node->valid == 0) {
error("A deleted node "__S" being accessed\n",
__F(&n->in_extent));
@@
-128,23
+124,23
@@
static int it_test_search(struct interval_node *root)
interval_search(root, &ext, cb, NULL);
dprintf("\nverifing ...");
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;
/* 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","
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));
__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)
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));
}
__F(&n->node.in_extent),
__F(&ext));
}
@@
-285,7
+281,7
@@
err:
}
if (nr)
error("wrong tree, unbalanced!\n");
}
if (nr)
error("wrong tree, unbalanced!\n");
-
+
return 0;
}
return 0;
}
@@
-341,7
+337,7
@@
static int it_test_search_hole(struct interval_node *root)
return 0;
}
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)
{
#define LOOP_COUNT 1000
static enum interval_iter perf_cb(struct interval_node *n, void *args)
{
@@
-356,7
+352,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;
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;
}
s->tv_sec, s->tv_usec, e->tv_sec, e->tv_usec);
return c;
}
@@
-368,7
+364,7
@@
static int it_test_performance(struct interval_node *root, unsigned long len)
struct it_node *n;
struct timeval start, end;
unsigned long count;
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) {
ext.start = (random() % (max_count - len)) & ALIGN_MASK;
ext.end = (ext.start + len) & ALIGN_MASK;
if (have_wide_lock) {
@@
-381,7
+377,7
@@
static int it_test_performance(struct interval_node *root, unsigned long len)
/* list */
contended_count = 0;
gettimeofday(&start, NULL);
/* list */
contended_count = 0;
gettimeofday(&start, NULL);
- list_for_each_entry(n, &header, list) {
+
cfs_
list_for_each_entry(n, &header, list) {
if (extent_overlapped(&ext, &n->node.in_extent)) {
count = LOOP_COUNT;
while (count--);
if (extent_overlapped(&ext, &n->node.in_extent)) {
count = LOOP_COUNT;
while (count--);
@@
-422,11
+418,11
@@
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");
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;
__F(&n->node.in_extent));
interval_erase(&n->node, &root);
n->valid = 0;
- list_del_init(&n->list);
+
cfs_
list_del_init(&n->list);
} else {
__u64 low, high;
low = (random() % max_count) & ALIGN_MASK;
} else {
__u64 low, high;
low = (random() % max_count) & ALIGN_MASK;
@@
-436,10
+432,10
@@
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);
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;
__F(&n->node.in_extent));
n->valid = 1;
- list_add(&n->list, &header);
+
cfs_
list_add(&n->list, &header);
}
}
}
}
@@
-476,9
+472,9
@@
static struct interval_node *it_test_init(int count)
n->hit = 0;
n->valid = 1;
if (i == 0)
n->hit = 0;
n->valid = 1;
if (i == 0)
- list_add_tail(&n->list, &header);
+
cfs_
list_add_tail(&n->list, &header);
else
else
- list_add_tail(&n->list, &it_array[rand()%i].list);
+
cfs_
list_add_tail(&n->list, &it_array[rand()%i].list);
}
return root;
}
return root;