[PVFS2-CVS]
commit by pcarns in pvfs2/test/client/sysint: io-test.c lookup.c
ls.c mkdir.c readdir.c remove.c rename.c set-info.c symlink.c
truncate.c
CVS commit program
cvs at parl.clemson.edu
Tue Mar 9 17:22:35 EST 2004
Update of /projects/cvsroot/pvfs2/test/client/sysint
In directory parlweb:/tmp/cvs-serv27936/test/client/sysint
Modified Files:
io-test.c lookup.c ls.c mkdir.c readdir.c remove.c rename.c
set-info.c symlink.c truncate.c
Log Message:
converted remaining sysint test programs to use new initialization steps
where applicable
Index: io-test.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/io-test.c,v
diff -p -u -r1.43 -r1.44
--- io-test.c 9 Mar 2004 04:19:02 -0000 1.43
+++ io-test.c 9 Mar 2004 22:22:35 -0000 1.44
@@ -18,14 +18,12 @@
int main(int argc,char **argv)
{
- PVFS_sysresp_init resp_init;
PVFS_sysresp_lookup resp_lk;
PVFS_sysresp_create resp_cr;
PVFS_sysresp_io resp_io;
char *filename;
int name_sz;
int ret = -1;
- const PVFS_util_tab* tab;
int io_size = DEFAULT_IO_SIZE;
int* io_buffer = NULL;
int i;
@@ -81,19 +79,17 @@ int main(int argc,char **argv)
memcpy(&(filename[1]), argv[1], (name_sz-1));
- /* parse pvfstab */
- tab = PVFS_util_parse_pvfstab(NULL);
- if (!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- fprintf(stderr, "Error: parse_pvfstab() failure.\n");
- return(-1);
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
- /* init the system interface */
- ret = PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init);
- if(ret < 0)
+ ret = PVFS_util_get_default_fsid(&fs_id);
+ if (ret < 0)
{
- fprintf(stderr, "Error: PVFS_sys_initialize() failure. = %d\n", ret);
- return(ret);
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
/*************************************************************
@@ -101,7 +97,6 @@ int main(int argc,char **argv)
*/
name = filename;
- fs_id = resp_init.fsid_list[0];
credentials.uid = getuid();
credentials.gid = getgid();
@@ -116,7 +111,6 @@ int main(int argc,char **argv)
/* get root handle */
name = "/";
- fs_id = resp_init.fsid_list[0];
credentials.uid = getuid();
credentials.gid = getgid();
Index: lookup.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/lookup.c,v
diff -p -u -r1.24 -r1.25
--- lookup.c 9 Mar 2004 04:19:02 -0000 1.24
+++ lookup.c 9 Mar 2004 22:22:35 -0000 1.25
@@ -21,10 +21,8 @@ int main(int argc,char **argv)
{
int ret = -1;
int follow_link = PVFS2_LOOKUP_LINK_NO_FOLLOW;
- PVFS_sysresp_init resp_init;
PVFS_sysresp_lookup resp_look;
PVFS_sysresp_lookup resp_lk;
- const PVFS_util_tab* tab;
PVFS_fs_id fs_id;
PVFS_credentials credentials;
char *filename = NULL;
@@ -49,28 +47,17 @@ int main(int argc,char **argv)
credentials.uid = getuid();
credentials.gid = getgid();
- tab = PVFS_util_parse_pvfstab(NULL);
- if (!tab)
- {
- printf("Parsing error\n");
- return(-1);
- }
-
- ret = PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init);
- if(ret < 0)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("PVFS_sys_initialize() failure. = %d\n", ret);
- return(ret);
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- fs_id = resp_init.fsid_list[0];
- ret = PVFS_sys_lookup(fs_id, "/", credentials,
- &resp_look, PVFS2_LOOKUP_LINK_NO_FOLLOW);
+ ret = PVFS_util_get_default_fsid(&fs_id);
if (ret < 0)
{
- printf("Lookup failed with errcode = %d\n", ret);
- PVFS_perror("PVFS_perror says", ret);
- return(-1);
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
printf("--lookup--\n");
Index: ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/ls.c,v
diff -p -u -r1.25 -r1.26
--- ls.c 9 Mar 2004 04:19:02 -0000 1.25
+++ ls.c 9 Mar 2004 22:22:35 -0000 1.26
@@ -100,7 +100,7 @@ void print_entry(
}
int do_list(
- PVFS_sysresp_init *init_response,
+ PVFS_fs_id fs_id,
char *start_dir)
{
int i = 0;
@@ -110,7 +110,6 @@ int do_list(
PVFS_sysresp_lookup lk_response;
PVFS_sysresp_readdir rd_response;
PVFS_sysresp_getattr getattr_response;
- PVFS_fs_id fs_id;
PVFS_credentials credentials;
PVFS_pinode_reference pinode_refn;
PVFS_ds_position token;
@@ -119,7 +118,6 @@ int do_list(
memset(&getattr_response,0,sizeof(PVFS_sysresp_getattr));
name = start_dir;
- fs_id = init_response->fsid_list[0];
credentials.uid = 0;
credentials.gid = 0;
@@ -127,12 +125,12 @@ int do_list(
&lk_response, PVFS2_LOOKUP_LINK_NO_FOLLOW))
{
fprintf(stderr,"Failed to lookup %s on fs_id %d!\n",
- start_dir,init_response->fsid_list[0]);
+ start_dir,fs_id);
return 1;
}
pinode_refn.handle = lk_response.pinode_refn.handle;
- pinode_refn.fs_id = init_response->fsid_list[0];
+ pinode_refn.fs_id = fs_id;
pvfs_dirent_incount = MAX_NUM_DIRENTS;
credentials.uid = 0;
credentials.gid = 0;
@@ -167,7 +165,7 @@ int do_list(
cur_file = rd_response.dirent_array[i].d_name;
cur_handle = rd_response.dirent_array[i].handle;
- print_entry(cur_file, cur_handle, init_response->fsid_list[0]);
+ print_entry(cur_file, cur_handle, fs_id);
}
token += rd_response.pvfs_dirent_outcount;
@@ -181,8 +179,8 @@ int do_list(
int main(int argc, char **argv)
{
- const PVFS_util_tab* tab;
- PVFS_sysresp_init init_response;
+ int ret = -1;
+ PVFS_fs_id fs_id;
if (argc > 2)
{
@@ -191,21 +189,20 @@ int main(int argc, char **argv)
return 1;
}
- tab = PVFS_util_parse_pvfstab(NULL);
- if(!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- fprintf(stderr,"Error parsing pvfstab!\n");
- return 1;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- memset(&init_response,0,sizeof(PVFS_sysresp_init));
- if (PVFS_sys_initialize(*tab, 0, &init_response))
+ ret = PVFS_util_get_default_fsid(&fs_id);
+ if (ret < 0)
{
- fprintf(stderr,"Cannot initialize system interface\n");
- return 1;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
- if (do_list(&init_response,((argc == 2) ? argv[1] : "/")))
+ if (do_list(fs_id,((argc == 2) ? argv[1] : "/")))
{
return 1;
}
Index: mkdir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/mkdir.c,v
diff -p -u -r1.28 -r1.29
--- mkdir.c 9 Mar 2004 04:19:02 -0000 1.28
+++ mkdir.c 9 Mar 2004 22:22:35 -0000 1.29
@@ -20,8 +20,6 @@ int main(int argc,char **argv)
char *dirname = (char *)0;
char str_buf[256] = {0};
PVFS_fs_id cur_fs;
- const PVFS_util_tab* tab;
- PVFS_sysresp_init resp_init;
PVFS_sysresp_mkdir resp_mkdir;
char* entry_name;
PVFS_pinode_reference parent_refn;
@@ -35,18 +33,17 @@ int main(int argc,char **argv)
}
dirname = argv[1];
- tab = PVFS_util_parse_pvfstab(NULL);
- if(!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("Failed to parse pvfstab\n");
- return ret;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- memset(&resp_init, 0, sizeof(resp_init));
- if (PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init))
+ ret = PVFS_util_get_default_fsid(&cur_fs);
+ if (ret < 0)
{
- printf("Failed to initialize system interface\n");
- return ret;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
if (PVFS_util_remove_base_dir(dirname,str_buf,256))
@@ -62,8 +59,6 @@ int main(int argc,char **argv)
printf("Directory to be created is %s\n",str_buf);
memset(&resp_mkdir, 0, sizeof(PVFS_sysresp_mkdir));
-
- cur_fs = resp_init.fsid_list[0];
entry_name = str_buf;
ret = PVFS_util_lookup_parent(dirname, cur_fs, credentials,
Index: readdir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/readdir.c,v
diff -p -u -r1.29 -r1.30
--- readdir.c 9 Mar 2004 04:19:02 -0000 1.29
+++ readdir.c 9 Mar 2004 22:22:35 -0000 1.30
@@ -15,11 +15,9 @@
int main(int argc,char **argv)
{
- PVFS_sysresp_init resp_init;
PVFS_sysresp_lookup resp_look;
PVFS_sysresp_readdir resp_readdir;
int ret = -1, i = 0;
- const PVFS_util_tab* tab;
int max_dirents_returned = 25;
char starting_point[256] = "/";
PVFS_fs_id fs_id;
@@ -40,25 +38,23 @@ int main(int argc,char **argv)
printf("no more than %d dirents should be returned per "
"iteration\n", max_dirents_returned);
- tab = PVFS_util_parse_pvfstab(NULL);
- if (!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("Parsing error\n");
- return(-1);
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- ret = PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init);
- if(ret < 0)
+ ret = PVFS_util_get_default_fsid(&fs_id);
+ if (ret < 0)
{
- printf("PVFS_sys_initialize() failure. = %d\n", ret);
- return(ret);
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
credentials.uid = getuid();
credentials.gid = getgid();
name = starting_point;
- fs_id = resp_init.fsid_list[0];
ret = PVFS_sys_lookup(fs_id, name, credentials,
&resp_look, PVFS2_LOOKUP_LINK_FOLLOW);
if (ret < 0)
Index: remove.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/remove.c,v
diff -p -u -r1.21 -r1.22
--- remove.c 9 Mar 2004 04:19:02 -0000 1.21
+++ remove.c 9 Mar 2004 22:22:35 -0000 1.22
@@ -18,8 +18,6 @@ int main(int argc,char **argv)
char str_buf[256] = {0};
char *filename = (char *)0;
PVFS_fs_id cur_fs;
- const PVFS_util_tab* tab;
- PVFS_sysresp_init resp_init;
char* entry_name;
PVFS_pinode_reference parent_refn;
PVFS_credentials credentials;
@@ -31,18 +29,17 @@ int main(int argc,char **argv)
}
filename = argv[1];
- tab = PVFS_util_parse_pvfstab(NULL);
- if(!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("Failed to parse pvfstab\n");
- return ret;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- memset(&resp_init, 0, sizeof(resp_init));
- if (PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init))
+ ret = PVFS_util_get_default_fsid(&cur_fs);
+ if (ret < 0)
{
- printf("Failed to initialize system interface\n");
- return ret;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
if (PVFS_util_remove_base_dir(filename,str_buf,256))
@@ -56,8 +53,6 @@ int main(int argc,char **argv)
return(-1);
}
printf("File to be removed is %s\n",str_buf);
-
- cur_fs = resp_init.fsid_list[0];
entry_name = str_buf;
ret = PVFS_util_lookup_parent(filename, cur_fs, credentials,
Index: rename.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/rename.c,v
diff -p -u -r1.19 -r1.20
--- rename.c 9 Mar 2004 04:19:02 -0000 1.19
+++ rename.c 9 Mar 2004 22:22:35 -0000 1.20
@@ -20,8 +20,6 @@ int main(int argc,char **argv)
char *old_filename = (char *)0;
char *new_filename = (char *)0;
PVFS_fs_id cur_fs;
- const PVFS_util_tab* tab;
- PVFS_sysresp_init resp_init;
char* old_entry;
PVFS_pinode_reference old_parent_refn;
char* new_entry;
@@ -36,18 +34,17 @@ int main(int argc,char **argv)
old_filename = argv[1];
new_filename = argv[2];
- tab = PVFS_util_parse_pvfstab(NULL);
- if(!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("Failed to parse pvfstab\n");
- return ret;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- memset(&resp_init, 0, sizeof(resp_init));
- if (PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init))
+ ret = PVFS_util_get_default_fsid(&cur_fs);
+ if (ret < 0)
{
- printf("Failed to initialize system interface\n");
- return ret;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
if (PVFS_util_remove_base_dir(old_filename, old_buf, PVFS_SEGMENT_MAX))
@@ -73,9 +70,6 @@ int main(int argc,char **argv)
return(-1);
}
printf("New filename is %s\n",new_buf);
-
-
- cur_fs = resp_init.fsid_list[0];
credentials.uid = getuid();
credentials.gid = getgid();
Index: set-info.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/set-info.c,v
diff -p -u -r1.18 -r1.19
--- set-info.c 9 Mar 2004 04:19:02 -0000 1.18
+++ set-info.c 9 Mar 2004 22:22:35 -0000 1.19
@@ -18,9 +18,7 @@ int main(int argc, char **argv)
int ret = -1;
char *filename = NULL;
PVFS_fs_id fs_id;
- const PVFS_util_tab* tab;
PVFS_credentials credentials;
- PVFS_sysresp_init resp_init;
PVFS_sysresp_lookup resp_look;
PVFS_sysresp_getattr resp_getattr;
PVFS_pinode_reference pinode_refn;
@@ -36,24 +34,21 @@ int main(int argc, char **argv)
return ret;
}
- tab = PVFS_util_parse_pvfstab(NULL);
- if (!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- fprintf(stderr, "Failed to parse pvfstab!\n");
- return ret;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- ret = PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init);
- if(ret < 0)
+ ret = PVFS_util_get_default_fsid(&fs_id);
+ if (ret < 0)
{
- fprintf(stderr, "PVFS_sys_initialize() failure. = %d\n", ret);
- return ret;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
credentials.uid = getuid();
credentials.gid = getgid();
-
- fs_id = resp_init.fsid_list[0];
printf("about to lookup %s\n", filename);
Index: symlink.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/symlink.c,v
diff -p -u -r1.9 -r1.10
--- symlink.c 9 Mar 2004 04:19:02 -0000 1.9
+++ symlink.c 9 Mar 2004 22:22:35 -0000 1.10
@@ -19,8 +19,6 @@ int main(int argc, char **argv)
char str_buf[256] = {0};
char *filename = (char *)0;
PVFS_fs_id cur_fs;
- const PVFS_util_tab* tab;
- PVFS_sysresp_init resp_init;
PVFS_sysresp_symlink resp_sym;
char* entry_name = NULL;
char *target = NULL;
@@ -36,18 +34,17 @@ int main(int argc, char **argv)
filename = argv[1];
target = argv[2];
- tab = PVFS_util_parse_pvfstab(NULL);
- if(!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("Failed to parse pvfstab\n");
- return ret;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- memset(&resp_init, 0, sizeof(resp_init));
- if (PVFS_sys_initialize(*tab, GOSSIP_NO_DEBUG, &resp_init))
+ ret = PVFS_util_get_default_fsid(&cur_fs);
+ if (ret < 0)
{
- printf("Failed to initialize system interface\n");
- return ret;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
if (PVFS_util_remove_base_dir(filename,str_buf,256))
@@ -63,8 +60,6 @@ int main(int argc, char **argv)
printf("Link to be created is %s\n",str_buf);
memset(&resp_sym, 0, sizeof(PVFS_sysresp_symlink));
-
- cur_fs = resp_init.fsid_list[0];
entry_name = str_buf;
attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
Index: truncate.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/client/sysint/truncate.c,v
diff -p -u -r1.18 -r1.19
--- truncate.c 9 Mar 2004 04:19:02 -0000 1.18
+++ truncate.c 9 Mar 2004 22:22:35 -0000 1.19
@@ -14,8 +14,6 @@ int main(int argc,char **argv)
{
int ret = -1;
char *filename = (char *)0;
- const PVFS_util_tab *tab;
- PVFS_sysresp_init resp_init;
PVFS_sysresp_lookup resp_look;
PVFS_sysresp_lookup resp_lk;
PVFS_size trunc_size;
@@ -39,25 +37,23 @@ int main(int argc,char **argv)
trunc_size = ull;
}
- tab = PVFS_util_parse_pvfstab(NULL);
- if(!tab)
+ ret = PVFS_util_init_defaults();
+ if (ret < 0)
{
- printf("Failed to parse pvfstab\n");
- return ret;
+ PVFS_perror("PVFS_util_init_defaults", ret);
+ return (-1);
}
-
- memset(&resp_init, 0, sizeof(resp_init));
- if (PVFS_sys_initialize(*tab, GOSSIP_CLIENT_DEBUG, &resp_init))
+ ret = PVFS_util_get_default_fsid(&fs_id);
+ if (ret < 0)
{
- printf("Failed to initialize system interface\n");
- return ret;
+ PVFS_perror("PVFS_util_get_default_fsid", ret);
+ return (-1);
}
/* lookup the root handle */
name = malloc(2);/*null terminator included*/
name[0] = '/';
name[1] = '\0';
- fs_id = resp_init.fsid_list[0];
printf("looking up the root handle for fsid = %d\n", fs_id);
ret = PVFS_sys_lookup(fs_id, name, credentials,
&resp_look, PVFS2_LOOKUP_LINK_NO_FOLLOW);
More information about the PVFS2-CVS
mailing list