[PVFS2-CVS] commit by bradles in pvfs2/test/io/description: debug1.c debug10.c debug11.c debug12.c debug2.c debug3.c debug4.c debug5.c debug6.c debug7.c debug8.c debug9.c test-encode-complex-in.c test-encode-complex-out.c test-encode-twice-in.c test-encode-twice-out.c test-many-datafiles-import.c test-romio-noncontig-pattern.c test-romio-noncontig-pattern2.c test-romio-noncontig-pattern3.c test-truncate.c

CVS commit program cvs at parl.clemson.edu
Thu May 13 11:50:26 EDT 2004


Update of /projects/cvsroot/pvfs2/test/io/description
In directory styx.parl.clemson.edu:/tmp/cvs-serv6421/io/description

Modified Files:
	debug1.c debug10.c debug11.c debug12.c debug2.c debug3.c 
	debug4.c debug5.c debug6.c debug7.c debug8.c debug9.c 
	test-encode-complex-in.c test-encode-complex-out.c 
	test-encode-twice-in.c test-encode-twice-out.c 
	test-many-datafiles-import.c test-romio-noncontig-pattern.c 
	test-romio-noncontig-pattern2.c 
	test-romio-noncontig-pattern3.c test-truncate.c 
Log Message:
Updating tests to conform to new distribution mechanism.


Index: debug1.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug1.c,v
diff -p -u -r1.8 -r1.9
--- debug1.c	4 Nov 2003 15:29:24 -0000	1.8
+++ debug1.c	13 May 2004 14:50:26 -0000	1.9
@@ -10,11 +10,11 @@
 #include <gossip.h>
 #include <pvfs2-debug.h>
 
-#include <pvfs-distribution.h>
-#include <pvfs2-request.h>
-#include <pint-request.h>
-
-#include <simple-stripe.h>
+#include "pvfs-distribution.h"
+#include "pint-distribution.h"
+#include "pvfs2-request.h"
+#include "pint-request.h"
+#include "pvfs2-dist-simple-stripe.h"
 
 #define SEGMAX 16
 #define BYTEMAX (4*1024*1024)
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 1;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 	rf2.server_nr = 0;
 	rf2.server_ct = 1;
 	rf2.fsize = 10*1024*1024;
-	rf2.dist = PVFS_Dist_create("simple_stripe");
+	rf2.dist = PVFS_dist_create("simple_stripe");
 	rf2.extend_flag = 1;
 	PINT_Dist_lookup(rf2.dist);
 

Index: debug10.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug10.c,v
diff -p -u -r1.5 -r1.6
--- debug10.c	30 Jan 2004 20:12:15 -0000	1.5
+++ debug10.c	13 May 2004 14:50:26 -0000	1.6
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug11.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug11.c,v
diff -p -u -r1.4 -r1.5
--- debug11.c	30 Jan 2004 20:12:15 -0000	1.4
+++ debug11.c	13 May 2004 14:50:26 -0000	1.5
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 6000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 0;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug12.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug12.c,v
diff -p -u -r1.4 -r1.5
--- debug12.c	30 Jan 2004 20:12:15 -0000	1.4
+++ debug12.c	13 May 2004 14:50:26 -0000	1.5
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 6000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 0;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug2.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug2.c,v
diff -p -u -r1.11 -r1.12
--- debug2.c	4 Nov 2003 15:29:24 -0000	1.11
+++ debug2.c	13 May 2004 14:50:26 -0000	1.12
@@ -92,28 +92,28 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 
 	rf2.server_nr = 1;
 	rf2.server_ct = 4;
 	rf2.fsize = 0;
-	rf2.dist = PVFS_Dist_create("simple_stripe");
+	rf2.dist = PVFS_dist_create("simple_stripe");
 	rf2.extend_flag = 1;
 	PINT_Dist_lookup(rf2.dist);
 
 	rf3.server_nr = 2;
 	rf3.server_ct = 4;
 	rf3.fsize = 0;
-	rf3.dist = PVFS_Dist_create("simple_stripe");
+	rf3.dist = PVFS_dist_create("simple_stripe");
 	rf3.extend_flag = 1;
 	PINT_Dist_lookup(rf3.dist);
 
 	rf4.server_nr = 3;
 	rf4.server_ct = 4;
 	rf4.fsize = 0;
-	rf4.dist = PVFS_Dist_create("simple_stripe");
+	rf4.dist = PVFS_dist_create("simple_stripe");
 	rf4.extend_flag = 1;
 	PINT_Dist_lookup(rf4.dist);
 

Index: debug3.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug3.c,v
diff -p -u -r1.11 -r1.12
--- debug3.c	4 Nov 2003 15:29:24 -0000	1.11
+++ debug3.c	13 May 2004 14:50:26 -0000	1.12
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 2;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug4.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug4.c,v
diff -p -u -r1.10 -r1.11
--- debug4.c	4 Nov 2003 15:29:24 -0000	1.10
+++ debug4.c	13 May 2004 14:50:26 -0000	1.11
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 3;
 	rf1.fsize = 8454144;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 0;
 	PINT_Dist_lookup(rf1.dist);
 
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
 	rf2.server_nr = 0;
 	rf2.server_ct = 3;
 	rf2.fsize = 8454144;
-	rf2.dist = PVFS_Dist_create("simple_stripe");
+	rf2.dist = PVFS_dist_create("simple_stripe");
 	rf2.extend_flag = 0;
 	PINT_Dist_lookup(rf2.dist);
 

Index: debug5.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug5.c,v
diff -p -u -r1.10 -r1.11
--- debug5.c	4 Nov 2003 15:29:24 -0000	1.10
+++ debug5.c	13 May 2004 14:50:26 -0000	1.11
@@ -44,14 +44,14 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 3;
 	rf1.fsize = 8454144;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 0;
 	PINT_Dist_lookup(rf1.dist);
 
 	rf2.server_nr = 1;
 	rf2.server_ct = 3;
 	rf2.fsize = 8454144;
-	rf2.dist = PVFS_Dist_create("simple_stripe");
+	rf2.dist = PVFS_dist_create("simple_stripe");
 	rf2.extend_flag = 0;
 	PINT_Dist_lookup(rf2.dist);
 

Index: debug6.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug6.c,v
diff -p -u -r1.9 -r1.10
--- debug6.c	4 Nov 2003 15:29:24 -0000	1.9
+++ debug6.c	13 May 2004 14:50:26 -0000	1.10
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 1;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug7.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug7.c,v
diff -p -u -r1.11 -r1.12
--- debug7.c	4 Nov 2003 15:29:24 -0000	1.11
+++ debug7.c	13 May 2004 14:50:26 -0000	1.12
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 8;
 	rf1.fsize = 10000000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug8.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug8.c,v
diff -p -u -r1.5 -r1.6
--- debug8.c	4 Nov 2003 15:29:24 -0000	1.5
+++ debug8.c	13 May 2004 14:50:26 -0000	1.6
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 8;
 	rf1.fsize = 10000000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: debug9.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/debug9.c,v
diff -p -u -r1.5 -r1.6
--- debug9.c	4 Nov 2003 15:29:24 -0000	1.5
+++ debug9.c	13 May 2004 14:50:26 -0000	1.6
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 10000000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-encode-complex-in.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-encode-complex-in.c,v
diff -p -u -r1.3 -r1.4
--- test-encode-complex-in.c	4 Nov 2003 15:29:24 -0000	1.3
+++ test-encode-complex-in.c	13 May 2004 14:50:26 -0000	1.4
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 6000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 0;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-encode-complex-out.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-encode-complex-out.c,v
diff -p -u -r1.4 -r1.5
--- test-encode-complex-out.c	4 Nov 2003 15:29:24 -0000	1.4
+++ test-encode-complex-out.c	13 May 2004 14:50:26 -0000	1.5
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 4;
 	rf1.fsize = 6000;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 0;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-encode-twice-in.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-encode-twice-in.c,v
diff -p -u -r1.3 -r1.4
--- test-encode-twice-in.c	4 Nov 2003 15:29:24 -0000	1.3
+++ test-encode-twice-in.c	13 May 2004 14:50:26 -0000	1.4
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 1;
 	rf1.fsize = 508;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 1;
 	rf1.fsize = 508;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-encode-twice-out.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-encode-twice-out.c,v
diff -p -u -r1.4 -r1.5
--- test-encode-twice-out.c	4 Nov 2003 15:29:24 -0000	1.4
+++ test-encode-twice-out.c	13 May 2004 14:50:26 -0000	1.5
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 2;
 	rf1.fsize = 508;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 
@@ -170,7 +170,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 2;
 	rf1.fsize = 508;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-many-datafiles-import.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-many-datafiles-import.c,v
diff -p -u -r1.3 -r1.4
--- test-many-datafiles-import.c	4 Nov 2003 15:29:24 -0000	1.3
+++ test-many-datafiles-import.c	13 May 2004 14:50:26 -0000	1.4
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
 	    rf1.server_nr = j;
 	    rf1.server_ct = 67;
 	    rf1.fsize = 41943040;
-	    rf1.dist = PVFS_Dist_create("simple_stripe");
+	    rf1.dist = PVFS_dist_create("simple_stripe");
 	    rf1.extend_flag = 1;
 	    PINT_Dist_lookup(rf1.dist);
 

Index: test-romio-noncontig-pattern.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-romio-noncontig-pattern.c,v
diff -p -u -r1.4 -r1.5
--- test-romio-noncontig-pattern.c	4 Nov 2003 15:29:24 -0000	1.4
+++ test-romio-noncontig-pattern.c	13 May 2004 14:50:26 -0000	1.5
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 1;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-romio-noncontig-pattern2.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-romio-noncontig-pattern2.c,v
diff -p -u -r1.3 -r1.4
--- test-romio-noncontig-pattern2.c	4 Nov 2003 15:29:24 -0000	1.3
+++ test-romio-noncontig-pattern2.c	13 May 2004 14:50:26 -0000	1.4
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 	rf1.server_nr = 0;
 	rf1.server_ct = 1;
 	rf1.fsize = 0;
-	rf1.dist = PVFS_Dist_create("simple_stripe");
+	rf1.dist = PVFS_dist_create("simple_stripe");
 	rf1.extend_flag = 1;
 	PINT_Dist_lookup(rf1.dist);
 

Index: test-romio-noncontig-pattern3.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-romio-noncontig-pattern3.c,v
diff -p -u -r1.1 -r1.2
--- test-romio-noncontig-pattern3.c	24 Mar 2004 17:42:30 -0000	1.1
+++ test-romio-noncontig-pattern3.c	13 May 2004 14:50:26 -0000	1.2
@@ -67,7 +67,7 @@ int main(
     rf1.server_nr = 0;
     rf1.server_ct = 4;
     rf1.fsize = 0;
-    rf1.dist = PVFS_Dist_create("simple_stripe");
+    rf1.dist = PVFS_dist_create("simple_stripe");
     rf1.extend_flag = 1;
     PINT_Dist_lookup(rf1.dist);
 
@@ -109,7 +109,7 @@ int main(
     if (!PINT_REQUEST_DONE(file_state))
     {
 	fprintf(stderr,
-		"ERROR: request processing not done when it should be; calling again!\n");
+		"NEXT call to PINT_REQUEST_DONE should return 0.\n");
 
 	seg1.bytemax = BYTEMAX;
 	seg1.segmax = SEGMAX;

Index: test-truncate.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/description/test-truncate.c,v
diff -p -u -r1.1 -r1.2
--- test-truncate.c	29 Aug 2003 11:48:50 -0000	1.1
+++ test-truncate.c	13 May 2004 14:50:26 -0000	1.2
@@ -15,16 +15,16 @@
 #include "simple-stripe.h"
 #include "pint-distribution.h"
 
-void PINT_Dist_dump(PVFS_Dist *dist);
+void PINT_Dist_dump(PINT_dist *dist);
 
 int main(int argc, char **argv)
 {
-    struct PVFS_Dist *d;
+    PINT_dist *d;
     int ret = -1;
     PVFS_offset tmp_off = 0;
 
     /* grab a distribution */
-    d = PVFS_Dist_create("simple_stripe");
+    d = PVFS_dist_create("simple_stripe");
     assert(d);
 
     ret = PINT_Dist_lookup(d);
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 
 
     /* free dist */
-    PVFS_Dist_free(d);
+    PVFS_dist_free(d);
 
     return (0);
 }



More information about the PVFS2-CVS mailing list