[PVFS2-CVS]
commit by rbross in pvfs2/src/client/sysint: client-state-machine.c
client-state-machine.h pint-bucket.c pint-bucket.h pint-servreq.h
pint-sysint-utils.c remove.c server-send-req.c sys-create.sm
sys-readdir.sm
CVS commit program
cvs at parl.clemson.edu
Mon Feb 16 16:35:27 EST 2004
Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv32729/src/client/sysint
Modified Files:
client-state-machine.c client-state-machine.h pint-bucket.c
pint-bucket.h pint-servreq.h pint-sysint-utils.c remove.c
server-send-req.c sys-create.sm sys-readdir.sm
Log Message:
Move from bmi_addr_t to PVFS_BMI_addr_t for consistency.
Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.39 -r1.40
--- client-state-machine.c 30 Jan 2004 20:12:10 -0000 1.39
+++ client-state-machine.c 16 Feb 2004 21:35:27 -0000 1.40
@@ -174,7 +174,7 @@ int PINT_client_state_machine_test(void)
int PINT_serv_decode_resp(void *encoded_resp_p,
struct PINT_decoded_msg *decoded_resp_p,
- bmi_addr_t *svr_addr_p,
+ PVFS_BMI_addr_t *svr_addr_p,
int actual_resp_sz,
struct PVFS_server_resp **resp_out_pp)
{
@@ -197,7 +197,7 @@ int PINT_serv_free_msgpair_resources(
struct PINT_encoded_msg *encoded_req_p,
void *encoded_resp_p,
struct PINT_decoded_msg *decoded_resp_p,
- bmi_addr_t *svr_addr_p,
+ PVFS_BMI_addr_t *svr_addr_p,
int max_resp_sz)
{
PINT_encode_release(encoded_req_p,
Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.78 -r1.79
--- client-state-machine.h 12 Feb 2004 23:25:28 -0000 1.78
+++ client-state-machine.h 16 Feb 2004 21:35:27 -0000 1.79
@@ -51,7 +51,7 @@ typedef struct PINT_client_sm_msgpair_st
int comp_ct;
/* server address */
- bmi_addr_t svr_addr;
+ PVFS_BMI_addr_t svr_addr;
/* req and encoded_req are used to send a request */
struct PVFS_server_req req;
@@ -102,7 +102,7 @@ struct PINT_client_create_sm {
PVFS_sysresp_create *create_resp; /* in/out parameter*/
PVFS_sys_attr *sys_attr; /* input parameter */
int num_data_files;
- bmi_addr_t *data_server_addrs;
+ PVFS_BMI_addr_t *data_server_addrs;
PVFS_handle_extent_array *io_handle_extent_array;
PVFS_handle metafile_handle;
PVFS_handle *datafile_handles;
@@ -406,20 +406,20 @@ int PINT_serv_prepare_msgpair(PVFS_pinod
struct PVFS_server_req *req_p,
struct PINT_encoded_msg *encoded_req_out_p,
void **encoded_resp_out_pp,
- bmi_addr_t *svr_addr_p,
+ PVFS_BMI_addr_t *svr_addr_p,
int *max_resp_sz_out_p,
PVFS_msg_tag_t *session_tag_out_p);
int PINT_serv_decode_resp(void *encoded_resp_p,
struct PINT_decoded_msg *decoded_resp_p,
- bmi_addr_t *svr_addr_p,
+ PVFS_BMI_addr_t *svr_addr_p,
int actual_resp_sz,
struct PVFS_server_resp **resp_out_pp);
int PINT_serv_free_msgpair_resources(struct PINT_encoded_msg *encoded_req_p,
void *encoded_resp_p,
struct PINT_decoded_msg *decoded_resp_p,
- bmi_addr_t *svr_addr_p,
+ PVFS_BMI_addr_t *svr_addr_p,
int max_resp_sz);
/* TODO: is this the right name for this function? */
Index: pint-bucket.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-bucket.c,v
diff -p -u -r1.48 -r1.49
--- pint-bucket.c 16 Feb 2004 21:22:39 -0000 1.48
+++ pint-bucket.c 16 Feb 2004 21:35:27 -0000 1.49
@@ -167,7 +167,7 @@ int PINT_handle_load_mapping(struct serv
*/
int PINT_bucket_get_next_meta(struct server_configuration_s *config,
PVFS_fs_id fsid,
- bmi_addr_t *meta_addr,
+ PVFS_BMI_addr_t *meta_addr,
PVFS_handle_extent_array *ext_array)
{
int ret = -EINVAL, jitter = 0, num_meta_servers = 0;
@@ -233,7 +233,7 @@ int PINT_bucket_get_next_meta(struct ser
int PINT_bucket_get_next_io(struct server_configuration_s *config,
PVFS_fs_id fsid,
int num_servers,
- bmi_addr_t *io_addr_array,
+ PVFS_BMI_addr_t *io_addr_array,
PVFS_handle_extent_array *io_handle_extent_array)
{
int ret = -EINVAL, i = 0;
@@ -506,7 +506,7 @@ int PINT_bucket_get_server_array(struct
*
* returns 0 on success to -errno on failure
*/
-int PINT_bucket_map_to_server(bmi_addr_t *server_addr,
+int PINT_bucket_map_to_server(PVFS_BMI_addr_t *server_addr,
PVFS_handle handle,
PVFS_fs_id fsid)
{
@@ -747,7 +747,7 @@ static int cache_server_array(struct ser
struct qlist_head *hash_link = NULL;
struct config_fs_cache_s *cur_config_cache = NULL;
PINT_llist* tmp_server = NULL;
- bmi_addr_t tmp_bmi_addr;
+ PVFS_BMI_addr_t tmp_bmi_addr;
int dup_flag = 0;
int current = 0;
int array_index = 0, array_index2 = 0;
Index: pint-bucket.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-bucket.h,v
diff -p -u -r1.23 -r1.24
--- pint-bucket.h 16 Feb 2004 21:22:39 -0000 1.23
+++ pint-bucket.h 16 Feb 2004 21:35:27 -0000 1.24
@@ -28,13 +28,13 @@ int PINT_handle_load_mapping(struct serv
int PINT_bucket_get_next_meta(struct server_configuration_s *config,
PVFS_fs_id fsid,
- bmi_addr_t *meta_addr,
+ PVFS_BMI_addr_t *meta_addr,
PVFS_handle_extent_array *meta_extent_array);
int PINT_bucket_get_next_io(struct server_configuration_s *config,
PVFS_fs_id fsid,
int num_servers,
- bmi_addr_t *io_addr_array,
+ PVFS_BMI_addr_t *io_addr_array,
PVFS_handle_extent_array *io_handle_extent_array);
#define PINT_BUCKET_IO PVFS_MGMT_IO_SERVER
@@ -57,7 +57,7 @@ int PINT_bucket_count_servers(struct ser
int server_type,
int* count);
-int PINT_bucket_map_to_server(bmi_addr_t *server_addr,
+int PINT_bucket_map_to_server(PVFS_BMI_addr_t *server_addr,
PVFS_handle handle,
PVFS_fs_id fsid);
Index: pint-servreq.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-servreq.h,v
diff -p -u -r1.15 -r1.16
--- pint-servreq.h 15 Oct 2003 10:42:42 -0000 1.15
+++ pint-servreq.h 16 Feb 2004 21:35:27 -0000 1.16
@@ -13,7 +13,7 @@
#include "pvfs2-req-proto.h"
#if 0 /* unused */
-int PINT_send_req_array(bmi_addr_t* addr_array,
+int PINT_send_req_array(PVFS_BMI_addr_t* addr_array,
struct PVFS_server_req* req_array,
enum PVFS_encoding_type encoding,
void** resp_encoded_array,
@@ -22,7 +22,7 @@ int PINT_send_req_array(bmi_addr_t* addr
int array_size,
PVFS_msg_tag_t* op_tag_array);
-void PINT_release_req_array(bmi_addr_t* addr_array,
+void PINT_release_req_array(PVFS_BMI_addr_t* addr_array,
struct PVFS_server_req* req_array,
enum PVFS_encoding_type encoding,
void** resp_encoded_array,
@@ -31,21 +31,21 @@ void PINT_release_req_array(bmi_addr_t*
int array_size);
#endif
-int PINT_send_req(bmi_addr_t addr,
+int PINT_send_req(PVFS_BMI_addr_t addr,
struct PVFS_server_req *req_p,
enum PVFS_encoding_type encoding,
struct PINT_decoded_msg *decoded_resp,
void** encoded_resp,
PVFS_msg_tag_t op_tag);
-void PINT_release_req(bmi_addr_t addr,
+void PINT_release_req(PVFS_BMI_addr_t addr,
struct PVFS_server_req *req_p,
enum PVFS_encoding_type encoding,
struct PINT_decoded_msg *decoded_resp,
void** encoded_resp,
PVFS_msg_tag_t op_tag);
-int PINT_recv_ack_array(bmi_addr_t* addr_array,
+int PINT_recv_ack_array(PVFS_BMI_addr_t* addr_array,
bmi_size_t max_resp_size,
void** resp_encoded_array,
struct PINT_decoded_msg* resp_decoded_array,
@@ -53,7 +53,7 @@ int PINT_recv_ack_array(bmi_addr_t* addr
int array_size,
PVFS_msg_tag_t* op_tag_array);
-void PINT_release_ack_array(bmi_addr_t* addr_array,
+void PINT_release_ack_array(PVFS_BMI_addr_t* addr_array,
bmi_size_t max_resp_size,
void** resp_encoded_array,
struct PINT_decoded_msg* resp_decoded_array,
Index: pint-sysint-utils.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-sysint-utils.c,v
diff -p -u -r1.16 -r1.17
--- pint-sysint-utils.c 30 Jan 2004 20:12:10 -0000 1.16
+++ pint-sysint-utils.c 16 Feb 2004 21:35:27 -0000 1.17
@@ -82,7 +82,7 @@ int PINT_server_get_config(struct server
pvfs_mntlist mntent_list)
{
int ret = -1, i = 0;
- bmi_addr_t serv_addr;
+ PVFS_BMI_addr_t serv_addr;
struct PVFS_server_req serv_req;
struct PVFS_server_resp *serv_resp = NULL;
PVFS_credentials creds;
Index: remove.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/remove.c,v
diff -p -u -r1.30 -r1.31
--- remove.c 8 Sep 2003 14:09:05 -0000 1.30
+++ remove.c 16 Feb 2004 21:35:27 -0000 1.31
@@ -34,7 +34,7 @@ int PVFS_sys_remove_old(char* entry_name
struct PVFS_server_resp *ack_p = NULL; /* server response */
int ret = -1, ioserv_count = 0;
PINT_pinode *pinode_ptr = NULL, *item_ptr = NULL;
- bmi_addr_t serv_addr; /* PVFS address type structure */
+ PVFS_BMI_addr_t serv_addr; /* PVFS address type structure */
int name_sz = 0;
PVFS_pinode_reference entry;
int items_found = 0, i = 0;
Index: server-send-req.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/server-send-req.c,v
diff -p -u -r1.34 -r1.35
--- server-send-req.c 15 Oct 2003 10:42:42 -0000 1.34
+++ server-send-req.c 16 Feb 2004 21:35:27 -0000 1.35
@@ -29,7 +29,7 @@ extern job_context_id PVFS_sys_job_conte
*
* returns 0 on success, -errno on failure
*/
-int PINT_send_req(bmi_addr_t addr,
+int PINT_send_req(PVFS_BMI_addr_t addr,
struct PVFS_server_req *req_p,
enum PVFS_encoding_type encoding,
struct PINT_decoded_msg *decoded_resp,
@@ -195,7 +195,7 @@ send_req_out:
*
* no return value
*/
-void PINT_release_req(bmi_addr_t addr,
+void PINT_release_req(PVFS_BMI_addr_t addr,
struct PVFS_server_req *req_p,
enum PVFS_encoding_type encoding,
struct PINT_decoded_msg *decoded_resp,
@@ -232,7 +232,7 @@ void PINT_release_req(bmi_addr_t addr,
*
* returns 0 on success, -errno on failure
*/
-int PINT_send_req_array(bmi_addr_t* addr_array,
+int PINT_send_req_array(PVFS_BMI_addr_t* addr_array,
struct PVFS_server_req* req_array,
bmi_size_t max_resp_size,
void** resp_encoded_array,
@@ -484,7 +484,7 @@ out:
*
* no return value
*/
-void PINT_release_req_array(bmi_addr_t* addr_array,
+void PINT_release_req_array(PVFS_BMI_addr_t* addr_array,
struct PVFS_server_req* req_array,
bmi_size_t max_resp_size,
void** resp_encoded_array,
@@ -528,7 +528,7 @@ void PINT_release_req_array(bmi_addr_t*
*
* returns 0 on success, -errno on failure
*/
-int PINT_recv_ack_array(bmi_addr_t* addr_array,
+int PINT_recv_ack_array(PVFS_BMI_addr_t* addr_array,
bmi_size_t max_resp_size,
void** resp_encoded_array,
struct PINT_decoded_msg* resp_decoded_array,
@@ -678,7 +678,7 @@ out:
*
* no return value
*/
-void PINT_release_ack_array(bmi_addr_t* addr_array,
+void PINT_release_ack_array(PVFS_BMI_addr_t* addr_array,
bmi_size_t max_resp_size,
void** resp_encoded_array,
struct PINT_decoded_msg* resp_decoded_array,
Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.24 -r1.25
--- sys-create.sm 30 Jan 2004 20:12:10 -0000 1.24
+++ sys-create.sm 16 Feb 2004 21:35:27 -0000 1.25
@@ -502,8 +502,8 @@ static int create_datafiles_setup_msgpai
}
/* allocate data server bmi address array */
- sm_p->u.create.data_server_addrs = (bmi_addr_t *)
- malloc(sm_p->u.create.num_data_files * sizeof(bmi_addr_t));
+ sm_p->u.create.data_server_addrs = (PVFS_BMI_addr_t *)
+ malloc(sm_p->u.create.num_data_files * sizeof(PVFS_BMI_addr_t));
if (!sm_p->u.create.data_server_addrs)
{
gossip_err("create: failed to allocate data server addrs\n");
Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.8 -r1.9
--- sys-readdir.sm 30 Jan 2004 20:12:10 -0000 1.8
+++ sys-readdir.sm 16 Feb 2004 21:35:27 -0000 1.9
@@ -179,7 +179,7 @@ static int readdir_msg_setup_msgpair(PIN
job_status_s *js_p)
{
int ret = -1;
- bmi_addr_t server_addr;
+ PVFS_BMI_addr_t server_addr;
PINT_client_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "readdir state: "
More information about the PVFS2-CVS
mailing list