[PVFS2-CVS]
commit by pcarns in pvfs2/src/client/sysint: client-state-machine.c
client-state-machine.h mgmt-event-mon-list.sm
mgmt-iterate-handles-list.sm mgmt-perf-mon-list.sm
mgmt-setparam-list.sm mgmt-statfs-list.sm remove.sm
server-get-config.sm shared-state-methods.c sys-create.sm
sys-flush.sm sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm
sys-readdir.sm sys-rename.sm sys-setattr.sm sys-symlink.sm
sys-truncate.sm
CVS commit program
cvs at parl.clemson.edu
Mon Jul 12 15:22:32 EDT 2004
Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv18179/src/client/sysint
Modified Files:
client-state-machine.c client-state-machine.h
mgmt-event-mon-list.sm mgmt-iterate-handles-list.sm
mgmt-perf-mon-list.sm mgmt-setparam-list.sm
mgmt-statfs-list.sm remove.sm server-get-config.sm
shared-state-methods.c sys-create.sm sys-flush.sm
sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm
sys-readdir.sm sys-rename.sm sys-setattr.sm sys-symlink.sm
sys-truncate.sm
Log Message:
move definition of msgpair state structure out of client header
and into generic msgpairarray header, and rename accordingly
Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.53 -r1.54
--- client-state-machine.c 8 Jul 2004 21:02:19 -0000 1.53
+++ client-state-machine.c 12 Jul 2004 18:22:31 -0000 1.54
@@ -832,7 +832,7 @@ int PINT_serv_free_msgpair_resources(
* returns 0 on success, -PVFS_error on failure
*/
int PINT_serv_msgpairarray_resolve_addrs(
- int count, PINT_client_sm_msgpair_state *msgarray)
+ int count, PINT_sm_msgpair_state *msgarray)
{
int i = 0;
int ret = -PVFS_EINVAL;
@@ -841,7 +841,7 @@ int PINT_serv_msgpairarray_resolve_addrs
{
for(i = 0; i < count; i++)
{
- PINT_client_sm_msgpair_state *msg_p = &msgarray[i];
+ PINT_sm_msgpair_state *msg_p = &msgarray[i];
assert(msg_p);
ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.114 -r1.115
--- client-state-machine.h 8 Jul 2004 16:17:06 -0000 1.114
+++ client-state-machine.h 12 Jul 2004 18:22:31 -0000 1.115
@@ -20,6 +20,7 @@
#include "trove.h"
#include "acache.h"
#include "id-generator.h"
+#include "msgpairarray.h"
#define PINT_STATE_STACK_SIZE 3
@@ -44,63 +45,6 @@
/* the number of milliseconds to delay before retries */
#define PVFS2_CLIENT_RETRY_DELAY 2000
-/*
- * This structure holds everything that we need for the state of a
- * message pair. We need arrays of these in some cases, so it's
- * convenient to group it like this.
- *
- */
-typedef struct PINT_client_sm_msgpair_state_s
-{
- /* NOTE: fs_id, handle, retry flag, and comp_fn, should be filled
- * in prior to going into the msgpair code path.
- */
- PVFS_fs_id fs_id;
- PVFS_handle handle;
-
- /* should be either PVFS_MSGPAIR_RETRY, or PVFS_MSGPAIR_NO_RETRY*/
- int retry_flag;
-
- /* don't use this -- internal msgpairarray use only */
- int retry_count;
-
- /* comp_fn called after successful reception and decode of
- * respone, if the msgpair state machine is used for processing.
- */
- int (* comp_fn)(void *sm_p, struct PVFS_server_resp *resp_p, int i);
-
- /* comp_ct used to keep up with number of operations remaining */
- int comp_ct;
-
- /* server address */
- PVFS_BMI_addr_t svr_addr;
-
- /* req and encoded_req are used to send a request */
- struct PVFS_server_req req;
- struct PINT_encoded_msg encoded_req;
-
- /* max_resp_sz, svr_addr, and encoded_resp_p used to recv a response */
- int max_resp_sz;
- void *encoded_resp_p;
-
- /* send_id, recv_id used to track completion of operations */
- job_id_t send_id, recv_id;
- /* send_status, recv_status used for error handling etc. */
- job_status_s send_status, recv_status;
-
- /* op_status is the code returned from the server, if the
- * operation was actually processed (recv_status.error_code == 0)
- */
- PVFS_error op_status;
-
- /*
- used in the retry code path to know if we've already completed
- or not (to avoid re-doing the work we've already done)
- */
- int complete;
-
-} PINT_client_sm_msgpair_state;
-
/* PINT_client_sm_recv_state_s
*
* This is used for extra receives, such as acknowledgements from
@@ -190,7 +134,7 @@ typedef struct
PVFS_handle data_handle;
/* a reference to the msgpair we're using for communication */
- PINT_client_sm_msgpair_state *msg;
+ PINT_sm_msgpair_state *msg;
job_id_t flow_job_id;
job_status_s flow_status;
@@ -419,14 +363,14 @@ typedef struct PINT_client_sm
PVFS_object_attr acache_attr;
/* generic msgpair used with msgpair substate */
- PINT_client_sm_msgpair_state msgpair;
+ PINT_sm_msgpair_state msgpair;
/* msgpair array ptr used when operations can be performed
* concurrently. this must be allocated within the upper-level
* state machine and is used with the msgpairarray sm.
*/
int msgarray_count;
- PINT_client_sm_msgpair_state *msgarray;
+ PINT_sm_msgpair_state *msgarray;
/*
internal pvfs_object references; used in conjunction with the
@@ -582,7 +526,7 @@ int PINT_serv_free_msgpair_resources(
int PINT_serv_msgpairarray_resolve_addrs(
int count,
- PINT_client_sm_msgpair_state* msgarray);
+ PINT_sm_msgpair_state* msgarray);
int PINT_client_bmi_cancel(job_id_t id);
Index: mgmt-event-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-event-mon-list.sm,v
diff -p -u -r1.16 -r1.17
--- mgmt-event-mon-list.sm 8 Jul 2004 20:06:47 -0000 1.16
+++ mgmt-event-mon-list.sm 12 Jul 2004 18:22:31 -0000 1.17
@@ -95,8 +95,8 @@ int PVFS_imgmt_event_mon_list(
sm_p->u.event_mon_list.details = details;
sm_p->msgarray_count = server_count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- server_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ server_count * sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray == NULL)
{
free(sm_p);
@@ -153,7 +153,7 @@ static int mgmt_event_mon_list_setup_msg
job_status_s *js_p)
{
int i = 0;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "event_mon_list state: "
"mgmt_event_mon_list_setup_msgpair\n");
Index: mgmt-iterate-handles-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-iterate-handles-list.sm,v
diff -p -u -r1.14 -r1.15
--- mgmt-iterate-handles-list.sm 21 May 2004 17:22:37 -0000 1.14
+++ mgmt-iterate-handles-list.sm 12 Jul 2004 18:22:31 -0000 1.15
@@ -98,8 +98,8 @@ int PVFS_imgmt_iterate_handles_list(
sm_p->u.iterate_handles_list.details = details;
sm_p->msgarray_count = server_count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- server_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ server_count * sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray == NULL)
{
PVFS_util_release_credentials(sm_p->cred_p);
@@ -158,7 +158,7 @@ static int mgmt_iterate_handles_list_set
job_status_s * js_p)
{
int i = 0, j = 0;
- PINT_client_sm_msgpair_state *msg_p;
+ PINT_sm_msgpair_state *msg_p;
gossip_debug(GOSSIP_CLIENT_DEBUG, "iterate_handles_list state: "
"mgmt_iterate_handles_list_setup_msgpair\n");
Index: mgmt-perf-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-perf-mon-list.sm,v
diff -p -u -r1.19 -r1.20
--- mgmt-perf-mon-list.sm 8 Jul 2004 20:06:48 -0000 1.19
+++ mgmt-perf-mon-list.sm 12 Jul 2004 18:22:31 -0000 1.20
@@ -100,8 +100,8 @@ int PVFS_imgmt_perf_mon_list(
sm_p->u.perf_mon_list.details = details;
sm_p->msgarray_count = server_count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- server_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ server_count * sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray == NULL)
{
PVFS_util_release_credentials(sm_p->cred_p);
@@ -162,7 +162,7 @@ static int mgmt_perf_mon_list_setup_msgp
job_status_s *js_p)
{
int i = 0;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "perf_mon_list state: "
"mgmt_perf_mon_list_setup_msgpair\n");
Index: mgmt-setparam-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-setparam-list.sm,v
diff -p -u -r1.17 -r1.18
--- mgmt-setparam-list.sm 8 Jul 2004 20:06:48 -0000 1.17
+++ mgmt-setparam-list.sm 12 Jul 2004 18:22:31 -0000 1.18
@@ -100,8 +100,8 @@ int PVFS_imgmt_setparam_list(
sm_p->u.setparam_list.details = details;
sm_p->msgarray_count = count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ count * sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray == NULL)
{
free(sm_p);
@@ -169,7 +169,7 @@ static int mgmt_setparam_list_setup_msgp
job_status_s *js_p)
{
int i = 0;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "setparam_list state: "
"mgmt_setparam_list_setup_msgpair\n");
Index: mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.25 -r1.26
--- mgmt-statfs-list.sm 8 Jul 2004 21:02:19 -0000 1.25
+++ mgmt-statfs-list.sm 12 Jul 2004 18:22:31 -0000 1.26
@@ -97,8 +97,8 @@ int PVFS_imgmt_statfs_list(
(count * sizeof(struct PVFS_mgmt_server_stat)));
sm_p->msgarray_count = count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- (count * sizeof(PINT_client_sm_msgpair_state)));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ (count * sizeof(PINT_sm_msgpair_state)));
if (sm_p->msgarray == NULL)
{
PVFS_util_release_credentials(sm_p->cred_p);
@@ -154,7 +154,7 @@ static int mgmt_statfs_list_setup_msgpai
job_status_s *js_p)
{
int i = 0;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"statfs_list state: mgmt_statfs_list_setup_msgpair\n");
Index: remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/remove.sm,v
diff -p -u -r1.4 -r1.5
--- remove.sm 12 Jul 2004 17:04:40 -0000 1.4
+++ remove.sm 12 Jul 2004 18:22:31 -0000 1.5
@@ -313,7 +313,7 @@ static int remove_check_dir_contents_set
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "remove state: "
"remove_check_dir_contents_setup_msgpair\n");
@@ -321,7 +321,7 @@ static int remove_check_dir_contents_set
js_p->error_code = 0;
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
PINT_SERVREQ_READDIR_FILL(
msg_p->req,
@@ -377,8 +377,8 @@ static int remove_datafile_remove_setup_
gossip_debug(GOSSIP_CLIENT_DEBUG,
"remove state: datafile_remove_setup_msgpair\n");
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- sm_p->datafile_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ sm_p->datafile_count * sizeof(PINT_sm_msgpair_state));
if (!sm_p->msgarray)
{
js_p->error_code = -PVFS_ENOMEM;
@@ -389,7 +389,7 @@ static int remove_datafile_remove_setup_
/* for each datafile, post a send/recv pair for the remove */
for (i = 0; i < sm_p->datafile_count; i++)
{
- PINT_client_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
gossip_debug(GOSSIP_CLIENT_DEBUG,
" datafile_remove: removing handle %Lu\n",
Index: server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.6 -r1.7
--- server-get-config.sm 8 Jul 2004 20:06:48 -0000 1.6
+++ server-get-config.sm 12 Jul 2004 18:22:31 -0000 1.7
@@ -270,7 +270,7 @@ static int server_get_config_setup_msgpa
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
PVFS_BMI_addr_t serv_addr;
gossip_debug(GOSSIP_CLIENT_DEBUG,
Index: shared-state-methods.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/shared-state-methods.c,v
diff -p -u -r1.20 -r1.21
--- shared-state-methods.c 8 Jul 2004 21:02:19 -0000 1.20
+++ shared-state-methods.c 12 Jul 2004 18:22:31 -0000 1.21
@@ -29,7 +29,7 @@ int PINT_sm_common_parent_getattr_setup_
js_p->error_code = 0;
- memset(&sm_p->msgpair, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(&sm_p->msgpair, 0, sizeof(PINT_sm_msgpair_state));
sm_p->msgarray = &(sm_p->msgpair);
sm_p->msgarray_count = 1;
@@ -78,7 +78,7 @@ int PINT_sm_common_object_getattr_setup_
js_p->error_code = 0;
- memset(&sm_p->msgpair, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(&sm_p->msgpair, 0, sizeof(PINT_sm_msgpair_state));
sm_p->msgarray = &(sm_p->msgpair);
sm_p->msgarray_count = 1;
Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.48 -r1.49
--- sys-create.sm 8 Jul 2004 21:02:19 -0000 1.48
+++ sys-create.sm 12 Jul 2004 18:22:31 -0000 1.49
@@ -486,7 +486,7 @@ static int create_dspace_create_setup_ms
{
int ret = -PVFS_EINVAL;
PVFS_handle_extent_array meta_handle_extent_array;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
struct server_configuration_s *server_config = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "create state: "
@@ -507,7 +507,7 @@ static int create_dspace_create_setup_ms
gossip_debug(GOSSIP_CLIENT_DEBUG," create: posting create req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
server_config = PINT_get_server_config_struct(
sm_p->parent_ref.fs_id);
@@ -568,16 +568,16 @@ static int create_datafiles_setup_msgpai
js_p->error_code = 0;
- memset(&sm_p->msgpair, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(&sm_p->msgpair, 0, sizeof(PINT_sm_msgpair_state));
/* allocate msgarray and set msgarray_count */
if (sm_p->msgarray && (sm_p->msgarray != &(sm_p->msgpair)))
{
free(sm_p->msgarray);
}
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
(sm_p->u.create.num_data_files *
- sizeof(PINT_client_sm_msgpair_state)));
+ sizeof(PINT_sm_msgpair_state)));
if (sm_p->msgarray == NULL)
{
gossip_err("create: failed to allocate msgarray\n");
@@ -635,7 +635,7 @@ static int create_datafiles_setup_msgpai
/* for each datafile, prepare to post a create send/recv pair */
for(i = 0; i < sm_p->u.create.num_data_files; i++)
{
- PINT_client_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
PINT_SERVREQ_CREATE_FILL(
msg_p->req,
@@ -675,7 +675,7 @@ static int create_setattr_setup_msgpair(
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"create state: setattr_setup_msgpair\n");
@@ -685,7 +685,7 @@ static int create_setattr_setup_msgpair(
gossip_debug(GOSSIP_CLIENT_DEBUG," create: posting setattr req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
sm_p->msgarray = msg_p;
sm_p->msgarray_count = 1;
@@ -744,7 +744,7 @@ static int create_crdirent_setup_msgpair
job_status_s *js_p)
{
int ret = -1;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"create state: crdirent_setup_msgpair\n");
@@ -755,7 +755,7 @@ static int create_crdirent_setup_msgpair
gossip_debug(GOSSIP_CLIENT_DEBUG," create: posting crdirent req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
PINT_SERVREQ_CRDIRENT_FILL(msg_p->req,
*sm_p->cred_p,
@@ -817,7 +817,7 @@ static int create_delete_handles_setup_m
js_p->error_code = 0;
- memset(&sm_p->msgpair, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(&sm_p->msgpair, 0, sizeof(PINT_sm_msgpair_state));
ret = PINT_cached_config_map_to_server(&metafile_server_addr,
sm_p->u.create.metafile_handle,
@@ -849,8 +849,8 @@ static int create_delete_handles_setup_m
}
}
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- (actual_count * sizeof(PINT_client_sm_msgpair_state)));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ (actual_count * sizeof(PINT_sm_msgpair_state)));
if (sm_p->msgarray == NULL)
{
@@ -869,7 +869,7 @@ static int create_delete_handles_setup_m
*/
for(i = 0; i < actual_count; i++)
{
- PINT_client_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
gossip_debug(GOSSIP_CLIENT_DEBUG,
"create: posting data file remove req %d\n",i);
Index: sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.19 -r1.20
--- sys-flush.sm 8 Jul 2004 20:06:48 -0000 1.19
+++ sys-flush.sm 12 Jul 2004 18:22:31 -0000 1.20
@@ -153,7 +153,7 @@ static int flush_datafile_setup_msgpaira
{
int ret = -PVFS_EINVAL, i = 0;
PVFS_object_attr *attr = NULL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "(%p) flush state: "
"datafile_setup_msgpairarray\n", sm_p);
@@ -173,9 +173,9 @@ static int flush_datafile_setup_msgpaira
sm_p->msgarray_count = (attr->u.meta.dfile_count + 1);
/* allocate memory for datafile message pairs and the metafile */
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)
+ sm_p->msgarray = (PINT_sm_msgpair_state *)
malloc(sm_p->msgarray_count *
- sizeof(PINT_client_sm_msgpair_state));
+ sizeof(PINT_sm_msgpair_state));
if (!sm_p->msgarray)
{
js_p->error_code = -PVFS_ENOMEM;
Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.60 -r1.61
--- sys-getattr.sm 8 Jul 2004 21:02:19 -0000 1.60
+++ sys-getattr.sm 12 Jul 2004 18:22:32 -0000 1.61
@@ -447,8 +447,8 @@ static int getattr_datafile_getattr_setu
&sm_p->acache_attr);
assert(attr);
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- attr->u.meta.dfile_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ attr->u.meta.dfile_count * sizeof(PINT_sm_msgpair_state));
if (!sm_p->msgarray)
{
js_p->error_code = -PVFS_ENOMEM;
@@ -471,7 +471,7 @@ static int getattr_datafile_getattr_setu
/* for each datafile, post a send/recv pair to obtain the size */
for (i=0; i < sm_p->msgarray_count; i++)
{
- PINT_client_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
assert(msg_p);
gossip_debug(GOSSIP_GETATTR_DEBUG,
Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.80 -r1.81
--- sys-io.sm 8 Jul 2004 21:02:19 -0000 1.80
+++ sys-io.sm 12 Jul 2004 18:22:32 -0000 1.81
@@ -441,14 +441,14 @@ static int io_datafile_setup_msgpairs(PI
(target_datafile_count * sizeof(PINT_client_io_ctx)));
sm_p->msgarray_count = target_datafile_count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- (sm_p->msgarray_count * sizeof(PINT_client_sm_msgpair_state)));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ (sm_p->msgarray_count * sizeof(PINT_sm_msgpair_state)));
if (!sm_p->msgarray)
{
goto malloc_error_exit;
}
memset(sm_p->msgarray, 0, (sm_p->msgarray_count *
- sizeof(PINT_client_sm_msgpair_state)));
+ sizeof(PINT_sm_msgpair_state)));
sm_p->u.io.total_cancellations_remaining = 0;
@@ -456,12 +456,12 @@ static int io_datafile_setup_msgpairs(PI
for(i = 0; i < target_datafile_count; i++)
{
PINT_client_io_ctx *cur_ctx = &sm_p->u.io.contexts[i];
- PINT_client_sm_msgpair_state *msg = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg = &sm_p->msgarray[i];
assert(msg && cur_ctx);
memset(cur_ctx, 0, sizeof(PINT_client_io_ctx));
- memset(msg, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg, 0, sizeof(PINT_sm_msgpair_state));
gossip_debug(GOSSIP_IO_DEBUG, "initializing context[%d] %p\n",
i, cur_ctx);
@@ -552,7 +552,7 @@ static int io_datafile_post_msgpairs(PIN
for(i = 0; i < sm_p->u.io.datafile_count; i++)
{
PINT_client_io_ctx *cur_ctx = &sm_p->u.io.contexts[i];
- PINT_client_sm_msgpair_state *msg = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg = &sm_p->msgarray[i];
assert(cur_ctx && msg);
assert(cur_ctx->msg == msg);
@@ -1070,7 +1070,7 @@ static inline int complete_context_send_
int ret = -PVFS_EINVAL, index = 0;
unsigned long status_user_tag = 0;
PINT_client_io_ctx *cur_ctx = NULL;
- PINT_client_sm_msgpair_state *msg = NULL;
+ PINT_sm_msgpair_state *msg = NULL;
gossip_debug(GOSSIP_IO_DEBUG,
"- complete_context_send_or_recv called\n");
Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.39 -r1.40
--- sys-lookup.sm 8 Jul 2004 21:02:19 -0000 1.39
+++ sys-lookup.sm 12 Jul 2004 18:22:32 -0000 1.40
@@ -606,7 +606,7 @@ static int lookup_segment_lookup_setup_m
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
PINT_client_lookup_sm_segment *cur_seg = NULL;
char *seg_to_lookup = NULL;
@@ -620,7 +620,7 @@ static int lookup_segment_lookup_setup_m
assert(cur_seg);
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
/*
the pvfs2 lookup_path server operation has an optimization that
@@ -727,7 +727,7 @@ static int lookup_segment_getattr_setup_
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
PINT_client_lookup_sm_segment *cur_seg = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "lookup state: "
@@ -743,7 +743,7 @@ static int lookup_segment_getattr_setup_
assert(cur_seg);
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
PINT_SERVREQ_GETATTR_FILL(
msg_p->req,
Index: sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.26 -r1.27
--- sys-mkdir.sm 8 Jul 2004 21:02:20 -0000 1.26
+++ sys-mkdir.sm 12 Jul 2004 18:22:32 -0000 1.27
@@ -323,7 +323,7 @@ static int mkdir_msg_setup_msgpair(PINT_
{
int ret = -PVFS_EINVAL;
PVFS_handle_extent_array meta_handle_extent_array;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
struct server_configuration_s *server_config = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
@@ -334,7 +334,7 @@ static int mkdir_msg_setup_msgpair(PINT_
gossip_debug(GOSSIP_CLIENT_DEBUG," mkdir: posting mkdir req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
server_config = PINT_get_server_config_struct(
sm_p->parent_ref.fs_id);
@@ -385,7 +385,7 @@ static int mkdir_crdirent_setup_msgpair(
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"mkdir state: crdirent_setup_msgpair\n");
@@ -395,7 +395,7 @@ static int mkdir_crdirent_setup_msgpair(
gossip_debug(GOSSIP_CLIENT_DEBUG," mkdir: posting crdirent req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
gossip_debug(GOSSIP_CLIENT_DEBUG, "hooking dirent %s (%Lu) under "
"parent handle %Lu\n", sm_p->u.mkdir.object_name,
@@ -447,7 +447,7 @@ static int mkdir_delete_handle_setup_msg
{
int ret = -PVFS_EINVAL;
PVFS_BMI_addr_t metafile_server_addr;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "mkdir state: "
"delete_handle_setup_msgpair_array\n");
@@ -455,7 +455,7 @@ static int mkdir_delete_handle_setup_msg
js_p->error_code = 0;
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
sm_p->msgarray = msg_p;
sm_p->msgarray_count = 1;
Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.19 -r1.20
--- sys-readdir.sm 8 Jul 2004 21:02:20 -0000 1.19
+++ sys-readdir.sm 12 Jul 2004 18:22:32 -0000 1.20
@@ -197,7 +197,7 @@ static int readdir_msg_setup_msgpair(PIN
{
int ret = -PVFS_EINVAL;
PVFS_BMI_addr_t server_addr;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "readdir state: "
"readdir_msg_setup_msgpair\n");
@@ -218,7 +218,7 @@ static int readdir_msg_setup_msgpair(PIN
gossip_debug(GOSSIP_READDIR_DEBUG," readdir: posting readdir req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
gossip_debug(
GOSSIP_READDIR_DEBUG, "%Lu|%d | token is %d | limit is %d\n",
Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.24 -r1.25
--- sys-rename.sm 8 Jul 2004 21:02:20 -0000 1.24
+++ sys-rename.sm 12 Jul 2004 18:22:32 -0000 1.25
@@ -487,8 +487,8 @@ static int rename_lookups_setup_msgpair_
/* allocate msgarray and set msgarray_count */
sm_p->msgarray_count = 2;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- sm_p->msgarray_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ sm_p->msgarray_count * sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray == NULL)
{
gossip_err("rename: failed to allocate msgarray\n");
@@ -498,7 +498,7 @@ static int rename_lookups_setup_msgpair_
/* prepare to post the lookup send/recv pairs */
for(i = 0; i < 2; i++)
{
- PINT_client_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
+ PINT_sm_msgpair_state *msg_p = &sm_p->msgarray[i];
gossip_debug(GOSSIP_CLIENT_DEBUG,
"rename: posting lookup req %d\n",i);
@@ -545,7 +545,7 @@ static int rename_crdirent_setup_msgpair
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "rename state: "
"rename_crdirent_setup_msgpair\n");
@@ -559,7 +559,7 @@ static int rename_crdirent_setup_msgpair
free(sm_p->msgarray);
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
/*
hook the 'old' handle up to the new parent with the 'new_entry'
@@ -600,7 +600,7 @@ static int rename_rmdirent_setup_msgpair
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "rename state: "
"rename_rmdirent_setup_msgpair\n");
@@ -610,7 +610,7 @@ static int rename_rmdirent_setup_msgpair
gossip_debug(GOSSIP_CLIENT_DEBUG," rename: posting rmdirent req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
/*
in the normal case, the state machine will lead us
@@ -691,7 +691,7 @@ static int rename_chdirent_setup_msgpair
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "rename state: "
"rename_chdirent_setup_msgpair\n");
@@ -701,7 +701,7 @@ static int rename_chdirent_setup_msgpair
gossip_debug(GOSSIP_CLIENT_DEBUG," rename: posting chdirent req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
/*
here, we're exhanging the existing dirent under the 'new' parent
Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.20 -r1.21
--- sys-setattr.sm 8 Jul 2004 21:02:20 -0000 1.20
+++ sys-setattr.sm 12 Jul 2004 18:22:32 -0000 1.21
@@ -205,7 +205,7 @@ static int setattr_msg_setup_msgpair(PIN
{
int ret = -PVFS_EINVAL;
PVFS_object_attr *attr = NULL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "setattr state: "
"setattr_msg_setup_msgpair\n");
@@ -215,7 +215,7 @@ static int setattr_msg_setup_msgpair(PIN
gossip_debug(GOSSIP_CLIENT_DEBUG," setattr: posting setattr req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
sm_p->msgarray = msg_p;
sm_p->msgarray_count = 1;
Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.32 -r1.33
--- sys-symlink.sm 8 Jul 2004 21:02:20 -0000 1.32
+++ sys-symlink.sm 12 Jul 2004 18:22:32 -0000 1.33
@@ -371,7 +371,7 @@ static int symlink_dspace_create_setup_m
{
int ret = -PVFS_EINVAL;
PVFS_handle_extent_array meta_handle_extent_array;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
struct server_configuration_s *server_config = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "symlink state: "
@@ -382,7 +382,7 @@ static int symlink_dspace_create_setup_m
gossip_debug(GOSSIP_CLIENT_DEBUG," create: posting create req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
server_config = PINT_get_server_config_struct(
sm_p->parent_ref.fs_id);
@@ -433,7 +433,7 @@ static int symlink_crdirent_setup_msgpai
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"symlink state: crdirent_setup_msgpair\n");
@@ -443,7 +443,7 @@ static int symlink_crdirent_setup_msgpai
gossip_debug(GOSSIP_CLIENT_DEBUG," symlink: posting crdirent req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
sm_p->msgarray = msg_p;
sm_p->msgarray_count = 1;
@@ -494,7 +494,7 @@ static int symlink_setattr_setup_msgpair
job_status_s *js_p)
{
int ret = -PVFS_EINVAL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"symlink state: setattr_setup_msgpair\n");
@@ -504,7 +504,7 @@ static int symlink_setattr_setup_msgpair
gossip_debug(GOSSIP_CLIENT_DEBUG," symlink: posting setattr req\n");
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray != &(sm_p->msgpair))
{
@@ -562,7 +562,7 @@ static int symlink_delete_handle_setup_m
{
int ret = -PVFS_EINVAL;
PVFS_BMI_addr_t metafile_server_addr;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
gossip_debug(GOSSIP_CLIENT_DEBUG, "symlink state: "
"delete_handle_setup_msgpair_array\n");
@@ -570,7 +570,7 @@ static int symlink_delete_handle_setup_m
js_p->error_code = 0;
msg_p = &sm_p->msgpair;
- memset(msg_p, 0, sizeof(PINT_client_sm_msgpair_state));
+ memset(msg_p, 0, sizeof(PINT_sm_msgpair_state));
if (sm_p->msgarray && (sm_p->msgarray != &(sm_p->msgpair)))
{
Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.23 -r1.24
--- sys-truncate.sm 8 Jul 2004 20:06:49 -0000 1.23
+++ sys-truncate.sm 12 Jul 2004 18:22:32 -0000 1.24
@@ -158,7 +158,7 @@ static int truncate_datafile_setup_msgpa
{
int ret = -PVFS_EINVAL, i = 0;
PVFS_object_attr *attr = NULL;
- PINT_client_sm_msgpair_state *msg_p = NULL;
+ PINT_sm_msgpair_state *msg_p = NULL;
PVFS_size new_dfile_size = 0;
gossip_debug(GOSSIP_CLIENT_DEBUG,
@@ -187,8 +187,8 @@ static int truncate_datafile_setup_msgpa
sm_p->msgarray_count = attr->u.meta.dfile_count;
- sm_p->msgarray = (PINT_client_sm_msgpair_state *)malloc(
- sm_p->msgarray_count * sizeof(PINT_client_sm_msgpair_state));
+ sm_p->msgarray = (PINT_sm_msgpair_state *)malloc(
+ sm_p->msgarray_count * sizeof(PINT_sm_msgpair_state));
if (!sm_p->msgarray)
{
js_p->error_code = -PVFS_ENOMEM;
More information about the PVFS2-CVS
mailing list