[Pvfs2-cvs] commit by slang in pvfs2/test/io/job:
job-client-example.c job-server-example.c
trove-job-create-toy.c trove-job-io.c trove-job-ls.c
trove-job-mkfs.c trove-job-touch.c
CVS commit program
cvs at parl.clemson.edu
Thu Oct 19 18:17:23 EDT 2006
Update of /projects/cvsroot/pvfs2/test/io/job
In directory parlweb1:/tmp/cvs-serv5758/test/io/job
Modified Files:
Tag: WALT3
job-client-example.c job-server-example.c
trove-job-create-toy.c trove-job-io.c trove-job-ls.c
trove-job-mkfs.c trove-job-touch.c
Log Message:
reverse merge of HEAD to WALT3 branch.
Index: job-client-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/job-client-example.c,v
diff -p -u -r1.10 -r1.10.36.1
--- job-client-example.c 25 Aug 2004 13:09:08 -0000 1.10
+++ job-client-example.c 19 Oct 2006 22:17:23 -0000 1.10.36.1
@@ -37,7 +37,6 @@ int main(int argc, char **argv)
job_status_s status1;
job_id_t tmp_id;
job_context_id context;
- char* method_name = NULL;
/* set debugging level */
gossip_enable_stderr();
@@ -51,8 +50,8 @@ int main(int argc, char **argv)
return(-1);
}
- ret = trove_initialize("/tmp/pvfs2-test-space",
- 0, &method_name, 0);
+ ret = trove_initialize(
+ TROVE_METHOD_DBPF, NULL, "/tmp/pvfs2-test-space", 0);
if(ret < 0)
{
fprintf(stderr, "trove_initialize failure.\n");
@@ -164,7 +163,7 @@ int main(int argc, char **argv)
job_close_context(context);
job_finalize();
BMI_finalize();
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return(0);
}
Index: job-server-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/job-server-example.c,v
diff -p -u -r1.15.36.1 -r1.15.36.2
--- job-server-example.c 18 Sep 2006 15:05:41 -0000 1.15.36.1
+++ job-server-example.c 19 Oct 2006 22:17:23 -0000 1.15.36.2
@@ -39,7 +39,6 @@ int main(int argc, char **argv)
struct BMI_unexpected_info req_info;
job_id_t job_id;
int outcount;
- char* method_name = NULL;
job_id_t tmp_id;
job_context_id context;
@@ -56,8 +55,8 @@ int main(int argc, char **argv)
return(-1);
}
- ret = trove_initialize("/tmp/pvfs2-test-space",
- 0, &method_name, 0);
+ ret = trove_initialize(
+ TROVE_METHOD_DBPF, NULL, "/tmp/pvfs2-test-space", 0);
if(ret < 0)
{
fprintf(stderr, "trove_initialize failure.\n");
@@ -181,7 +180,7 @@ int main(int argc, char **argv)
job_finalize();
PINT_flow_finalize();
BMI_finalize();
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return(0);
}
Index: trove-job-create-toy.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-create-toy.c,v
diff -p -u -r1.10 -r1.10.36.1
--- trove-job-create-toy.c 28 Jul 2004 14:33:06 -0000 1.10
+++ trove-job-create-toy.c 19 Oct 2006 22:17:23 -0000 1.10.36.1
@@ -26,7 +26,6 @@ int main(int argc, char **argv)
{
int ret, i;
TROVE_coll_id coll_id;
- char *method_name;
job_id_t foo_id;
job_status_s job_stat;
job_context_id context;
@@ -39,7 +38,8 @@ 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;
Index: trove-job-io.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-io.c,v
diff -p -u -r1.12 -r1.12.2.1
--- trove-job-io.c 14 Jun 2006 18:41:28 -0000 1.12
+++ trove-job-io.c 19 Oct 2006 22:17:23 -0000 1.12.2.1
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
TROVE_coll_id coll_id;
TROVE_handle file_handle, parent_handle;
TROVE_keyval_s key, val;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
job_id_t foo_id;
job_status_s job_stat;
@@ -48,7 +48,8 @@ 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;
@@ -344,7 +345,7 @@ int main(int argc, char **argv)
job_close_context(context);
job_finalize();
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-job-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-ls.c,v
diff -p -u -r1.11 -r1.11.16.1
--- trove-job-ls.c 11 Nov 2005 21:31:17 -0000 1.11
+++ trove-job-ls.c 19 Oct 2006 22:17:23 -0000 1.11.16.1
@@ -31,7 +31,6 @@ int main(int argc, char **argv)
TROVE_handle handle;
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];
job_status_s job_stat;
job_id_t foo_id;
@@ -47,7 +46,8 @@ 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;
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
job_close_context(context);
job_finalize();
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-job-mkfs.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-mkfs.c,v
diff -p -u -r1.12 -r1.12.2.1
--- trove-job-mkfs.c 14 Jun 2006 18:41:28 -0000 1.12
+++ trove-job-mkfs.c 19 Oct 2006 22:17:23 -0000 1.12.2.1
@@ -27,15 +27,12 @@ int main(int argc, char **argv)
TROVE_coll_id coll_id;
TROVE_handle root_handle;
TROVE_keyval_s key, val;
- char *method_name;
job_status_s job_stat;
job_id_t foo_id;
job_context_id context;
TROVE_extent cur_extent;
TROVE_handle_extent_array extent_array;
- char root_handle_string[] = ROOT_HANDLE_KEYSTR;
-
ret = parse_args(argc, argv);
if (ret < 0) {
fprintf(stderr, "argument parsing failed.\n");
@@ -73,20 +70,23 @@ int main(int argc, char **argv)
/* try to initialize; fails if storage space isn't there? */
- ret = trove_initialize(storage_space, 0, &method_name, 0);
+ ret = trove_initialize(
+ TROVE_METHOD_DBPF, NULL, storage_space, 0);
if (ret < 0) {
fprintf(stderr, "warning: initialize failed. trying to create storage space.\n");
/* create the storage space */
/* Q: what good is the op_id here if we have to match on coll_id in test fn? */
- ret = trove_storage_create(storage_space, NULL, &op_id);
+ ret = trove_storage_create(
+ TROVE_METHOD_DBPF, storage_space, NULL, &op_id);
if (ret < 0) {
fprintf(stderr, "storage create failed.\n");
return -1;
}
/* second try at initialize, in case it failed first try. */
- ret = trove_initialize(storage_space, 0, &method_name, 0);
+ ret = trove_initialize(
+ TROVE_METHOD_DBPF, NULL, storage_space, 0);
if (ret < 0) {
fprintf(stderr, "initialized failed second time.\n");
return -1;
@@ -203,8 +203,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);
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
job_close_context(context);
job_finalize();
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
Index: trove-job-touch.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-touch.c,v
diff -p -u -r1.11 -r1.11.36.1
--- trove-job-touch.c 28 Jul 2004 14:33:06 -0000 1.11
+++ trove-job-touch.c 19 Oct 2006 22:17:23 -0000 1.11.36.1
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
TROVE_coll_id coll_id;
TROVE_handle file_handle, parent_handle;
TROVE_keyval_s key, val;
- char *method_name, *file_name;
+ char *file_name;
char path_name[PATH_SIZE];
job_id_t foo_id;
job_status_s job_stat;
@@ -42,7 +42,8 @@ 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;
@@ -190,7 +191,7 @@ int main(int argc, char **argv)
job_close_context(context);
job_finalize();
- trove_finalize();
+ trove_finalize(TROVE_METHOD_DBPF);
return 0;
}
More information about the Pvfs2-cvs
mailing list