[Pvfs2-cvs] commit by slang in pvfs2/test/io/buffer: mt_test1.c mt_test2.c mt_test3.c mt_test4.c test1.c trove-init.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/io/buffer
In directory parlweb1:/tmp/cvs-serv5758/test/io/buffer

Modified Files:
      Tag: WALT3
	mt_test1.c mt_test2.c mt_test3.c mt_test4.c test1.c 
	trove-init.c 
Log Message:
reverse merge of HEAD to WALT3 branch.


Index: mt_test1.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/mt_test1.c,v
diff -p -u -r1.4 -r1.4.16.1
--- mt_test1.c	11 Nov 2005 21:31:15 -0000	1.4
+++ mt_test1.c	19 Oct 2006 22:17:21 -0000	1.4.16.1
@@ -66,7 +66,7 @@ int main(int argc, char * argv[])
         perror("pthread_join"),exit(1);
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     //cache_dump_active_list();
     //cache_dump_inactive_list();

Index: mt_test2.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/mt_test2.c,v
diff -p -u -r1.5 -r1.5.16.1
--- mt_test2.c	11 Nov 2005 21:31:15 -0000	1.5
+++ mt_test2.c	19 Oct 2006 22:17:21 -0000	1.5.16.1
@@ -66,7 +66,7 @@ int main(int argc, char * argv[])
         perror("pthread_join"),exit(1);
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     cache_dump_active_list();
     cache_dump_inactive_list();

Index: mt_test3.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/mt_test3.c,v
diff -p -u -r1.2 -r1.2.40.1
--- mt_test3.c	22 Aug 2003 15:48:48 -0000	1.2
+++ mt_test3.c	19 Oct 2006 22:17:21 -0000	1.2.40.1
@@ -185,7 +185,7 @@ for ( i=0; i< loop; i++ ) {
 #endif
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     return 0;
 }

Index: mt_test4.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/mt_test4.c,v
diff -p -u -r1.2 -r1.2.40.1
--- mt_test4.c	22 Aug 2003 15:48:48 -0000	1.2
+++ mt_test4.c	19 Oct 2006 22:17:21 -0000	1.2.40.1
@@ -76,7 +76,7 @@ int main(int argc, char * argv[])
     //cache_dump_inactive_list();
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     return 0;
 }

Index: test1.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/test1.c,v
diff -p -u -r1.1 -r1.1.40.1
--- test1.c	21 Aug 2003 18:57:28 -0000	1.1
+++ test1.c	19 Oct 2006 22:17:21 -0000	1.1.40.1
@@ -77,7 +77,7 @@ int main(int argc, char * argv[])
 #endif
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     return 0;
 }

Index: trove-init.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/trove-init.c,v
diff -p -u -r1.6 -r1.6.2.1
--- trove-init.c	14 Jun 2006 18:41:27 -0000	1.6
+++ trove-init.c	19 Oct 2006 22:17:21 -0000	1.6.2.1
@@ -10,7 +10,6 @@
 #include "trove.h"
 #include "pvfs2-internal.h"
 
-#define ROOT_HANDLE_STRING ROOT_HANDLE_KEYSTR
 #define MB 1024*1024
 enum {
     INIT_TEST_SIZE = 40*MB,
@@ -71,14 +70,16 @@ int trove_init(TROVE_coll_id *coll_id_p,
 	TROVE_ds_state state;
 	TROVE_keyval_s key, val;
 
-    ret = trove_initialize(storage_space, 0, &method_name, 0);
+    ret = trove_initialize(
+	TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed: run trove-mkfs first.\n");
         return -1;
     }
 
     /* try to look up collection used to store file system */
-    ret = trove_collection_lookup(file_system, &coll_id, NULL, &op_id);
+    ret = trove_collection_lookup(
+	TROVE_METHOD_DBPF, file_system, &coll_id, NULL, &op_id);
     if (ret < 0) {
         fprintf(stderr, "collection lookup failed.\n");
         return -1;
@@ -210,11 +211,9 @@ int path_lookup(TROVE_coll_id coll_id,
     TROVE_op_id op_id;
     TROVE_handle handle;
 
-    char root_handle_string[] = ROOT_HANDLE_STRING;
-
     /* get root */
-    key.buffer = root_handle_string;
-    key.buffer_sz = strlen(root_handle_string) + 1;
+    key.buffer = ROOT_HANDLE_KEYSTR;
+    key.buffer_sz = ROOT_HANDLE_KEYLEN;
     val.buffer = &handle;
     val.buffer_sz = sizeof(handle);