[Pvfs2-cvs] commit by slang in pvfs2/test/io/trove: test-listio.c
test-listio2.c test-listio3.c test-listio4.c test-listio5.c
test-trove-cancel.c trove-bstream.c trove-create-stress.c
trove-export.c trove-import.c trove-key-iterate.c trove-ls.c
trove-mkdir.c trove-mkfs.c trove-rm.c trove-rmdir.c
trove-test.h trove-touch.c
CVS commit program
cvs at parl.clemson.edu
Thu Oct 19 18:17:25 EDT 2006
Update of /projects/cvsroot/pvfs2/test/io/trove
In directory parlweb1:/tmp/cvs-serv5758/test/io/trove
Modified Files:
Tag: WALT3
test-listio.c test-listio2.c test-listio3.c test-listio4.c
test-listio5.c test-trove-cancel.c trove-bstream.c
trove-create-stress.c trove-export.c trove-import.c
trove-key-iterate.c trove-ls.c trove-mkdir.c trove-mkfs.c
trove-rm.c trove-rmdir.c trove-test.h trove-touch.c
Log Message:
reverse merge of HEAD to WALT3 branch.
Index: test-listio.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio.c,v
diff -p -u -r1.13 -r1.13.2.1
--- test-listio.c 14 Jun 2006 18:41:29 -0000 1.13
+++ test-listio.c 19 Oct 2006 22:17:24 -0000 1.13.2.1
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
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;
TROVE_context_id trove_context = -1;
@@ -74,14 +74,16 @@ int main(int argc, char **argv)
/*************************************************************/
/* initialization stuff */
- 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;
@@ -185,7 +187,7 @@ int main(int argc, char **argv)
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
@@ -200,11 +202,9 @@ int path_lookup(TROVE_coll_id coll_id,
TROVE_op_id op_id;
TROVE_handle handle;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* 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);
Index: test-listio2.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio2.c,v
diff -p -u -r1.6 -r1.6.2.1
--- test-listio2.c 14 Jun 2006 18:41:29 -0000 1.6
+++ test-listio2.c 19 Oct 2006 22:17:25 -0000 1.6.2.1
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
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;
TROVE_context_id trove_context = -1;
@@ -78,14 +78,16 @@ int main(int argc, char **argv)
/*************************************************************/
/* initialization stuff */
- 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;
@@ -255,7 +257,7 @@ int main(int argc, char **argv)
(test_failed ? "failed miserably" : "passed"));
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
@@ -270,11 +272,9 @@ int path_lookup(TROVE_coll_id coll_id,
TROVE_op_id op_id;
TROVE_handle handle;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* 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);
Index: test-listio3.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio3.c,v
diff -p -u -r1.4 -r1.4.2.1
--- test-listio3.c 14 Jun 2006 18:41:29 -0000 1.4
+++ test-listio3.c 19 Oct 2006 22:17:25 -0000 1.4.2.1
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
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;
TROVE_context_id trove_context = -1;
@@ -77,14 +77,16 @@ int main(int argc, char **argv)
/*************************************************************/
/* initialization stuff */
- 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;
@@ -246,7 +248,7 @@ int main(int argc, char **argv)
(test_failed ? "failed miserably" : "passed"));
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
@@ -261,11 +263,9 @@ int path_lookup(TROVE_coll_id coll_id,
TROVE_op_id op_id;
TROVE_handle handle;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* 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);
Index: test-listio4.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio4.c,v
diff -p -u -r1.4 -r1.4.2.1
--- test-listio4.c 14 Jun 2006 18:41:29 -0000 1.4
+++ test-listio4.c 19 Oct 2006 22:17:25 -0000 1.4.2.1
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
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;
TROVE_context_id trove_context = -1;
@@ -77,14 +77,16 @@ int main(int argc, char **argv)
/*************************************************************/
/* initialization stuff */
- 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;
@@ -254,7 +256,7 @@ int main(int argc, char **argv)
(test_failed ? "failed miserably" : "passed"));
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
@@ -269,11 +271,9 @@ int path_lookup(TROVE_coll_id coll_id,
TROVE_op_id op_id;
TROVE_handle handle;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* 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);
Index: test-listio5.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio5.c,v
diff -p -u -r1.5 -r1.5.2.1
--- test-listio5.c 14 Jun 2006 18:41:29 -0000 1.5
+++ test-listio5.c 19 Oct 2006 22:17:25 -0000 1.5.2.1
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
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;
TROVE_context_id trove_context = -1;
@@ -82,14 +82,16 @@ int main(int argc, char **argv)
/*************************************************************/
/* initialization stuff */
- 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;
@@ -271,7 +273,7 @@ int main(int argc, char **argv)
(test_failed ? "failed miserably" : "passed"));
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
gossip_disable();
@@ -289,11 +291,9 @@ int path_lookup(TROVE_coll_id coll_id,
TROVE_op_id op_id;
TROVE_handle handle;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* 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);
Index: test-trove-cancel.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-trove-cancel.c,v
diff -p -u -r1.6 -r1.6.2.1
--- test-trove-cancel.c 14 Jun 2006 18:41:29 -0000 1.6
+++ test-trove-cancel.c 19 Oct 2006 22:17:25 -0000 1.6.2.1
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
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;
TROVE_context_id trove_context = -1;
@@ -77,13 +77,15 @@ int main(int argc, char **argv)
gossip_enable_stderr();
gossip_set_debug_mask(1, GOSSIP_TROVE_DEBUG);
- 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;
}
- 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;
@@ -312,7 +314,7 @@ int main(int argc, char **argv)
(test_failed ? "failed miserably" : "passed"));
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
@@ -327,10 +329,8 @@ int path_lookup(TROVE_coll_id coll_id,
TROVE_op_id op_id;
TROVE_handle handle;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
- 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);
Index: trove-bstream.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-bstream.c,v
diff -p -u -r1.11 -r1.11.36.1
--- trove-bstream.c 28 Jul 2004 14:33:07 -0000 1.11
+++ trove-bstream.c 19 Oct 2006 22:17:25 -0000 1.11.36.1
@@ -32,7 +32,6 @@ int main(int argc, char ** argv )
TROVE_coll_id coll_id;
TROVE_ds_state state;
TROVE_handle file_handle, parent_handle;
- char *method_name;
TROVE_extent cur_extent;
TROVE_handle_extent_array extent_array;
TROVE_context_id trove_context = -1;
@@ -43,13 +42,15 @@ int main(int argc, char ** argv )
foo.string = strdup("monkey");
foo.size = strlen(foo.string);
- 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\n");
return -1;
}
- 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");
return -1;
@@ -141,7 +142,7 @@ int main(int argc, char ** argv )
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-create-stress.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-create-stress.c,v
diff -p -u -r1.9 -r1.9.36.1
--- trove-create-stress.c 28 Jul 2004 14:33:07 -0000 1.9
+++ trove-create-stress.c 19 Oct 2006 22:17:25 -0000 1.9.36.1
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
TROVE_ds_state state;
TROVE_keyval_s key, val;
TROVE_ds_attributes_s s_attr;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
time_t mytime;
TROVE_extent cur_extent;
@@ -45,14 +45,16 @@ int main(int argc, char **argv)
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.\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;
@@ -153,7 +155,7 @@ int main(int argc, char **argv)
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-export.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-export.c,v
diff -p -u -r1.6 -r1.6.36.1
--- trove-export.c 28 Jul 2004 14:33:07 -0000 1.6
+++ trove-export.c 19 Oct 2006 22:17:25 -0000 1.6.36.1
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
TROVE_keyval_s key, val;
TROVE_ds_attributes_s s_attr;
TROVE_size f_size;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
char *buf;
TROVE_context_id trove_context = -1;
@@ -51,14 +51,16 @@ int main(int argc, char **argv)
strcpy(path_to_file, argv[optind]);
strcpy(path_to_unix, argv[optind+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.\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;
@@ -157,7 +159,7 @@ int main(int argc, char **argv)
close(fd);
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
#if 0
printf("created file %s (handle = %d)\n", file_name, (int) file_handle);
#endif
Index: trove-import.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-import.c,v
diff -p -u -r1.9 -r1.9.36.1
--- trove-import.c 28 Jul 2004 14:33:07 -0000 1.9
+++ trove-import.c 19 Oct 2006 22:17:25 -0000 1.9.36.1
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
TROVE_keyval_s key, val;
TROVE_ds_attributes_s s_attr;
TROVE_size f_size;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
char *buf;
TROVE_extent cur_extent;
@@ -56,14 +56,16 @@ int main(int argc, char **argv)
strcpy(path_from_unix, argv[optind]);
strcpy(path_to_file, argv[optind+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.\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;
@@ -188,7 +190,7 @@ int main(int argc, char **argv)
return -1;
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
#if 0
printf("created file %s (handle = %d)\n", file_name, (int) file_handle);
Index: trove-key-iterate.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-key-iterate.c,v
diff -p -u -r1.2 -r1.2.6.1
--- trove-key-iterate.c 14 Jun 2006 18:41:29 -0000 1.2
+++ trove-key-iterate.c 19 Oct 2006 22:17:25 -0000 1.2.6.1
@@ -42,11 +42,9 @@ static inline int file_lookup(
char dir[PATH_SIZE];
TROVE_context_id context_id = 0; /* FIXME: Hacked for now */
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* get root handle */
- 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);
ret = trove_collection_geteattr(
@@ -113,7 +111,6 @@ int main(int argc, char **argv)
TROVE_op_id op_id;
TROVE_coll_id coll_id;
TROVE_handle file_handle;
- char *method_name;
char path_name[PATH_SIZE];
TROVE_context_id trove_context = -1;
TROVE_ds_state state;
@@ -127,14 +124,16 @@ int main(int argc, char **argv)
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.\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;
@@ -186,7 +185,7 @@ int main(int argc, char **argv)
}
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-ls.c,v
diff -p -u -r1.22 -r1.22.4.1
--- trove-ls.c 25 May 2006 22:17:21 -0000 1.22
+++ trove-ls.c 19 Oct 2006 22:17:25 -0000 1.22.4.1
@@ -32,7 +32,6 @@ int main(int argc, char **argv)
TROVE_ds_state state;
TROVE_keyval_s key[KEYVAL_ARRAY_LEN], val[KEYVAL_ARRAY_LEN];
TROVE_ds_position pos = TROVE_ITERATE_START;
- char *method_name;
char path_name[PATH_SIZE];
TROVE_ds_attributes_s s_attr;
TROVE_context_id trove_context = -1;
@@ -46,14 +45,16 @@ int main(int argc, char **argv)
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.\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;
@@ -162,7 +163,7 @@ int main(int argc, char **argv)
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-mkdir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-mkdir.c,v
diff -p -u -r1.16 -r1.16.36.1
--- trove-mkdir.c 28 Jul 2004 14:33:07 -0000 1.16
+++ trove-mkdir.c 19 Oct 2006 22:17:25 -0000 1.16.36.1
@@ -23,7 +23,7 @@ int path_lookup(TROVE_coll_id coll_id, c
int main(int argc, char ** argv)
{
int ret, count, i;
- char *method_name, *dir_name;
+ char *dir_name;
char path_name[PATH_SIZE];
TROVE_op_id op_id;
@@ -43,13 +43,15 @@ int main(int argc, char ** argv)
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.\n");
return -1;
}
- 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;
@@ -136,7 +138,7 @@ int main(int argc, char ** argv)
return -1;
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
printf("created directory %s (handle = %d)\n", dir_name, (int) file_handle);
Index: trove-mkfs.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-mkfs.c,v
diff -p -u -r1.16 -r1.16.2.1
--- trove-mkfs.c 14 Jun 2006 18:41:29 -0000 1.16
+++ trove-mkfs.c 19 Oct 2006 22:17:25 -0000 1.16.2.1
@@ -26,7 +26,6 @@ int main(int argc, char **argv)
TROVE_ds_state state;
TROVE_keyval_s key, val;
char *method_name;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
TROVE_extent cur_extent;
TROVE_handle_extent_array extent_array;
TROVE_context_id trove_context = -1;
@@ -121,8 +120,8 @@ int main(int argc, char **argv)
/* add attribute to collection for root handle */
/* NOTE: should be using the data_sz field, but it doesn't exist yet. */
/* NOTE: put ROOT_HANDLE_STRING in trove-test.h; not sure where it should be. */
- 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 = &root_handle;
val.buffer_sz = sizeof(root_handle);
ret = trove_collection_seteattr(coll_id, &key, &val,
@@ -140,7 +139,7 @@ int main(int argc, char **argv)
printf("fs created (root handle = %d, coll id = %d, root string = %s)\n",
(int) root_handle,
(int) coll_id,
- root_handle_string);
+ ROOT_HANDLE_KEYSTR);
trove_close_context(coll_id, trove_context);
trove_finalize();
Index: trove-rm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-rm.c,v
diff -p -u -r1.11 -r1.11.2.1
--- trove-rm.c 14 Jun 2006 18:41:29 -0000 1.11
+++ trove-rm.c 19 Oct 2006 22:17:25 -0000 1.11.2.1
@@ -23,7 +23,7 @@ int parse_args(int argc, char **argv);
int main(int argc, char **argv)
{
int ret, count, i;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
TROVE_op_id op_id;
@@ -40,14 +40,16 @@ int main(int argc, char **argv)
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.\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;
@@ -150,7 +152,7 @@ int main(int argc, char **argv)
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
printf("file %s removed (file handle = %d, parent handle = %d).\n",
file_name,
(int) file_handle,
Index: trove-rmdir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-rmdir.c,v
diff -p -u -r1.2 -r1.2.6.1
--- trove-rmdir.c 14 Jun 2006 18:41:29 -0000 1.2
+++ trove-rmdir.c 19 Oct 2006 22:17:25 -0000 1.2.6.1
@@ -23,7 +23,7 @@ int parse_args(int argc, char **argv);
int main(int argc, char **argv)
{
int ret, count, i;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
TROVE_op_id op_id;
@@ -40,14 +40,16 @@ int main(int argc, char **argv)
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.\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;
@@ -145,7 +147,7 @@ int main(int argc, char **argv)
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
printf("file %s removed (file handle = %d, parent handle = %d).\n",
file_name,
(int) file_handle,
Index: trove-test.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-test.h,v
diff -p -u -r1.9 -r1.9.2.1
--- trove-test.h 14 Jun 2006 18:41:29 -0000 1.9
+++ trove-test.h 19 Oct 2006 22:17:25 -0000 1.9.2.1
@@ -32,11 +32,9 @@ static inline int path_lookup(
char dir[PATH_SIZE];
TROVE_context_id context_id = 0; /* FIXME: Hacked for now */
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
/* get root handle */
- 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);
ret = trove_collection_geteattr(
Index: trove-touch.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-touch.c,v
diff -p -u -r1.16 -r1.16.36.1
--- trove-touch.c 28 Jul 2004 14:33:07 -0000 1.16
+++ trove-touch.c 19 Oct 2006 22:17:25 -0000 1.16.36.1
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
TROVE_ds_state state;
TROVE_keyval_s key, val;
TROVE_ds_attributes_s s_attr;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
TROVE_extent cur_extent;
TROVE_handle_extent_array extent_array;
@@ -42,14 +42,16 @@ int main(int argc, char **argv)
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.\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;
@@ -139,7 +141,7 @@ int main(int argc, char **argv)
return -1;
}
trove_close_context(coll_id, trove_context);
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
printf("created file %s (handle = %d)\n", file_name, (int) file_handle);
More information about the Pvfs2-cvs
mailing list