[Pvfs2-cvs] commit by kunkel in pvfs2/test/io/flow: test-harness-server-trove.c test-bmi-cache-server.c test1-server.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/io/flow
In directory parlweb1:/tmp/cvs-serv17506/test/io/flow

Modified Files:
      Tag: kunkel-hint-branch
	test-harness-server-trove.c test-bmi-cache-server.c 
	test1-server.c 
Log Message:
Upgrade to current CVS version


Index: test-harness-server-trove.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/flow/test-harness-server-trove.c,v
diff -p -u -r1.32.2.1 -r1.32.2.2
--- test-harness-server-trove.c	25 Sep 2006 12:40:20 -0000	1.32.2.1
+++ test-harness-server-trove.c	2 Dec 2006 11:12:48 -0000	1.32.2.2
@@ -73,7 +73,7 @@ int main(
     TROVE_coll_id coll_id;
     TROVE_handle file_handle, parent_handle;
     TROVE_ds_state state;
-    char *method_name, *file_name;
+    char *file_name;
     TROVE_keyval_s key, val;
     bmi_context_id context;
     TROVE_context_id trove_context;
@@ -106,7 +106,8 @@ int main(
 	return (-1);
     }
 
-    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");
@@ -122,7 +123,8 @@ int main(
     }
 
     /* 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");
@@ -303,7 +305,7 @@ int main(
     BMI_finalize();
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     gossip_disable();
     return (0);

Index: test-bmi-cache-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/flow/test-bmi-cache-server.c,v
diff -p -u -r1.7.2.1 -r1.7.2.2
--- test-bmi-cache-server.c	25 Sep 2006 12:40:20 -0000	1.7.2.1
+++ test-bmi-cache-server.c	2 Dec 2006 11:12:48 -0000	1.7.2.2
@@ -72,7 +72,7 @@ int main(
     TROVE_coll_id coll_id;
     TROVE_handle file_handle, parent_handle;
     TROVE_ds_state state;
-    char *method_name, *file_name;
+    char *file_name;
     TROVE_keyval_s key, val;
     bmi_context_id context;
     TROVE_context_id trove_context;
@@ -101,7 +101,8 @@ int main(
 	return (-1);
     }
 
-    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");
@@ -117,7 +118,8 @@ int main(
     }
 
     /* 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");
@@ -297,7 +299,7 @@ int main(
     BMI_finalize();
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     gossip_disable();
     return (0);

Index: test1-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/flow/test1-server.c,v
diff -p -u -r1.9.2.1 -r1.9.2.2
--- test1-server.c	25 Sep 2006 12:40:20 -0000	1.9.2.1
+++ test1-server.c	2 Dec 2006 11:12:48 -0000	1.9.2.2
@@ -74,7 +74,7 @@ int main(
     TROVE_coll_id coll_id;
     TROVE_handle file_handle, parent_handle;
     TROVE_ds_state state;
-    char *method_name, *file_name;
+    char *file_name;
     TROVE_keyval_s key, val;
     bmi_context_id context;
     TROVE_context_id trove_context;
@@ -103,7 +103,8 @@ int main(
 	return (-1);
     }
 
-    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");
@@ -119,7 +120,8 @@ int main(
     }
 
     /* 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");
@@ -300,7 +302,7 @@ int main(
     BMI_finalize();
 
     trove_close_context(coll_id, trove_context);
-    trove_finalize();
+    trove_finalize(TROVE_METHOD_DBPF);
 
     gossip_disable();
     return (0);