[Pvfs2-cvs] commit by walt in pvfs2/src/client/sysint:
client-state-machine.c client-state-machine.h sys-create-file.sm
CVS commit program
cvs at parl.clemson.edu
Tue Apr 8 15:18:13 EDT 2008
Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv1920/src/client/sysint
Modified Files:
Tag: cu-sandbox-branch
client-state-machine.c client-state-machine.h
sys-create-file.sm
Log Message:
fixed references to create_file (versus create) in client code for
create_file
Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.88.4.2 -r1.88.4.3
--- client-state-machine.c 22 Feb 2008 21:13:03 -0000 1.88.4.2
+++ client-state-machine.c 8 Apr 2008 19:18:13 -0000 1.88.4.3
@@ -219,7 +219,7 @@ struct PINT_client_op_entry_s PINT_clien
{&pvfs2_client_statfs_sm},
{&pvfs2_fs_add_sm},
{&pvfs2_client_readdirplus_sm},
- {&pvfs2_client_create_file_sm},
+ {&pvfs2_client_create_file_sm}
};
struct PINT_client_op_entry_s PINT_client_sm_mgmt_table[] =
Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.170.4.3 -r1.170.4.4
--- client-state-machine.h 1 Apr 2008 17:00:43 -0000 1.170.4.3
+++ client-state-machine.h 8 Apr 2008 19:18:13 -0000 1.170.4.4
@@ -78,9 +78,6 @@ struct PINT_client_remove_sm
struct PINT_client_create_file_sm
{
- PVFS_fs_id fs_id;
- PVFS_handle parent_handle;
- PVFS_ds_type object_type;
char *object_name; /* input parameter */
PVFS_sysresp_create_file *create_file_resp; /* in/out parameter*/
PVFS_sys_attr sys_attr; /* input parameter */
@@ -90,9 +87,10 @@ struct PINT_client_create_file_sm
int num_data_files;
int stored_error_code;
+ PVFS_handle_extent_array *metafile_handle_extent_array;
+
PINT_dist *dist;
PVFS_sys_layout layout;
- PVFS_handle_extent_array *metafile_handle_extent_array;
PVFS_handle metafile_handle;
PVFS_handle *datafile_handles;
PVFS_BMI_addr_t *data_server_addrs;
Index: sys-create-file.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/Attic/sys-create-file.sm,v
diff -p -u -r1.1.2.5 -r1.1.2.6
--- sys-create-file.sm 8 Apr 2008 16:40:38 -0000 1.1.2.5
+++ sys-create-file.sm 8 Apr 2008 19:18:13 -0000 1.1.2.6
@@ -1,5 +1,6 @@
/*
- * Copyright � Acxiom Corporation, 2006
+ * (C) 2008 Clemson University and The University of Chicago and
+ * � Acxiom Corporation, 2006
*
* See COPYING in top-level directory.
*/
@@ -117,7 +118,7 @@ PVFS_error PVFS_isys_create_file(
if ((attr.mask & PVFS_ATTR_SYS_ALL_SETABLE) != PVFS_ATTR_SYS_ALL_SETABLE)
{
- gossip_lerr("PVFS_isys_create() failure: invalid attribute mask: %d, "
+ gossip_lerr("PVFS_isys_create_file() failure: invalid attribute mask: %d, "
"expected SYS_ALL_SETABLE (%d)\n",
attr.mask, PVFS_ATTR_SYS_ALL_SETABLE);
return ret;
@@ -137,7 +138,7 @@ PVFS_error PVFS_isys_create_file(
return -PVFS_ENAMETOOLONG;
}
- PINT_smcb_alloc(&smcb, PVFS_SYS_CREATE,
+ PINT_smcb_alloc(&smcb, PVFS_SYS_CREATE_FILE,
sizeof(struct PINT_client_sm),
client_op_state_get_machine,
client_state_machine_terminate,
@@ -151,35 +152,39 @@ PVFS_error PVFS_isys_create_file(
/* set up the create-file request */
PINT_init_msgarray_params(&sm_p->msgarray_params, parent_ref.fs_id);
PINT_init_sysint_credentials(sm_p->cred_p, credentials);
- sm_p->u.create.object_name = object_name;
- sm_p->u.create_file.create_file_resp = resp;
- sm_p->u.create.datafile_handles = NULL;
- PVFS_util_copy_sys_attr(&sm_p->u.create.sys_attr, &attr);
- sm_p->u.create.stored_error_code = 0;
- sm_p->u.create.retry_count = 0;
sm_p->parent_ref = parent_ref;
+ sm_p->u.create_file.object_name = object_name;
+ sm_p->u.create_file.create_file_resp = resp;
+ PVFS_util_copy_sys_attr(&sm_p->u.create_file.sys_attr, &attr);
+
+ sm_p->u.create_file.retry_count = 0;
+ sm_p->u.create_file.num_data_files = 0;
+ sm_p->u.create_file.stored_error_code = 0;
+
+ sm_p->u.create_file.datafile_handles = NULL;
+
/* copy layout to sm struct */
if(layout)
{
- sm_p->u.create.layout.algorithm = layout->algorithm;
+ sm_p->u.create_file.layout.algorithm = layout->algorithm;
if(layout->algorithm == PVFS_SYS_LAYOUT_LIST)
{
- sm_p->u.create.layout.server_list.count = layout->server_list.count;
- sm_p->u.create.layout.server_list.servers =
+ sm_p->u.create_file.layout.server_list.count = layout->server_list.count;
+ sm_p->u.create_file.layout.server_list.servers =
malloc(layout->server_list.count * sizeof(PVFS_BMI_addr_t));
- if(!sm_p->u.create.layout.server_list.servers)
+ if(!sm_p->u.create_file.layout.server_list.servers)
{
return -PVFS_ENOMEM;
}
- memcpy(sm_p->u.create.layout.server_list.servers,
+ memcpy(sm_p->u.create_file.layout.server_list.servers,
layout->server_list.servers,
layout->server_list.count * sizeof(PVFS_BMI_addr_t));
}
}
else
{
- sm_p->u.create.layout.algorithm = PVFS_SYS_LAYOUT_ROUND_ROBIN;
+ sm_p->u.create_file.layout.algorithm = PVFS_SYS_LAYOUT_ROUND_ROBIN;
}
sm_p->object_ref = parent_ref;
@@ -194,19 +199,19 @@ PVFS_error PVFS_isys_create_file(
return -PVFS_EINVAL;
}
- sm_p->u.create.dist = PINT_dist_create(dist->name);
- if (!sm_p->u.create.dist)
+ sm_p->u.create_file.dist = PINT_dist_create(dist->name);
+ if (!sm_p->u.create_file.dist)
{
PINT_smcb_free(smcb);
return -PVFS_ENOMEM;
}
- sm_p->u.create.dist->params = dist->params;
+ sm_p->u.create_file.dist->params = dist->params;
}
else
{
/* Get the default distribution */
- sm_p->u.create.dist = get_default_distribution(sm_p->parent_ref.fs_id);
- if (!sm_p->u.create.dist)
+ sm_p->u.create_file.dist = get_default_distribution(sm_p->parent_ref.fs_id);
+ if (!sm_p->u.create_file.dist)
{
PINT_smcb_free(smcb);
return -PVFS_ENOMEM;
@@ -237,9 +242,9 @@ PVFS_error PVFS_isys_create_file(
/* Determine the number of dfiles, passing in client hints to
override any server hints */
ret = PINT_cached_config_get_num_dfiles(sm_p->object_ref.fs_id,
- sm_p->u.create.dist,
+ sm_p->u.create_file.dist,
num_dfiles_req,
- &sm_p->u.create.num_data_files);
+ &sm_p->u.create_file.num_data_files);
if (ret < 0)
{
@@ -336,11 +341,11 @@ static int create_file_comp_fn(void *v_p
}
/* otherwise, just stash the newly created meta handle */
- sm_p->u.create.metafile_handle = resp_p->u.create.handle;
+ sm_p->u.create_file.metafile_handle = resp_p->u.create_file.handle;
gossip_debug(
GOSSIP_CLIENT_DEBUG, "*** Got newly created handle %llu\n",
- llu(sm_p->u.create.metafile_handle));
+ llu(sm_p->u.create_file.metafile_handle));
return 0;
}
@@ -360,15 +365,15 @@ static PINT_sm_action create_file_setup_
js_p->error_code = 0;
- if (sm_p->u.create.num_data_files > PVFS_REQ_LIMIT_DFILE_COUNT)
+ if (sm_p->u.create_file.num_data_files > PVFS_REQ_LIMIT_DFILE_COUNT)
{
- sm_p->u.create.num_data_files = PVFS_REQ_LIMIT_DFILE_COUNT;
+ sm_p->u.create_file.num_data_files = PVFS_REQ_LIMIT_DFILE_COUNT;
gossip_err("Warning: reducing number of data "
"files to PVFS_REQ_LIMIT_DFILE_COUNT\n");
}
gossip_debug(GOSSIP_CLIENT_DEBUG, "need to create %d datafiles\n",
- sm_p->u.create.num_data_files);
+ sm_p->u.create_file.num_data_files);
gossip_debug(GOSSIP_CLIENT_DEBUG," create_file: posting create-file req\n");
@@ -416,11 +421,11 @@ static PINT_sm_action create_file_failur
struct PINT_smcb *smcb, job_status_s *js_p)
{
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
- sm_p->u.create.stored_error_code = js_p->error_code;
+ sm_p->u.create_file.stored_error_code = js_p->error_code;
gossip_debug(GOSSIP_CLIENT_DEBUG,
"create_file state: request failure error=%d\n",
- sm_p->u.create.stored_error_code);
+ sm_p->u.create_file.stored_error_code);
return SM_ACTION_COMPLETE;
}
@@ -436,33 +441,33 @@ static PINT_sm_action create_file_cleanu
gossip_debug(GOSSIP_CLIENT_DEBUG, "create_file state: cleanup\n");
- PVFS_util_release_sys_attr(&sm_p->u.create.sys_attr);
+ PVFS_util_release_sys_attr(&sm_p->u.create_file.sys_attr);
/* PINT_SM_GETATTR_STATE_CLEAR(sm_p->getattr); ??? */
- sm_p->error_code = (sm_p->u.create.stored_error_code ?
- sm_p->u.create.stored_error_code :
+ sm_p->error_code = (sm_p->u.create_file.stored_error_code ?
+ sm_p->u.create_file.stored_error_code :
js_p->error_code);
memset(&metafile_ref, 0, sizeof(metafile_ref));
if (sm_p->error_code == 0)
{
- metafile_ref.handle = sm_p->u.create.metafile_handle;
+ metafile_ref.handle = sm_p->u.create_file.metafile_handle;
metafile_ref.fs_id = sm_p->object_ref.fs_id;
/* fill in outgoing response fields */
- sm_p->u.create.create_resp->ref = metafile_ref;
+ sm_p->u.create_file.create_file_resp->ref = metafile_ref;
/* insert newly created metafile into the ncache */
- PINT_ncache_update((const char*) sm_p->u.create.object_name,
+ PINT_ncache_update((const char*) sm_p->u.create_file.object_name,
(const PVFS_object_ref*) &metafile_ref,
(const PVFS_object_ref*) &(sm_p->object_ref));
/* we only insert a cache entry if the entire create succeeds,
* i.e. crdirent succeeded. set size to 0 */
ret = PINT_acache_update(metafile_ref,
- &sm_p->u.create.cache_attr, /*where filled???*/
+ &sm_p->u.create_file.cache_attr, /*where filled???*/
&tmp_size);
if(ret < 0)
{
@@ -470,47 +475,47 @@ static PINT_sm_action create_file_cleanu
}
}
else if ((PVFS_ERROR_CLASS(-sm_p->error_code) == PVFS_ERROR_BMI) &&
- (sm_p->u.create.retry_count < sm_p->msgarray_params.retry_limit))
+ (sm_p->u.create_file.retry_count < sm_p->msgarray_params.retry_limit))
{
- sm_p->u.create.stored_error_code = 0;
- sm_p->u.create.retry_count++;
+ sm_p->u.create_file.stored_error_code = 0;
+ sm_p->u.create_file.retry_count++;
gossip_debug(GOSSIP_CLIENT_DEBUG, "Retrying create operation "
- "(attempt number %d)\n", sm_p->u.create.retry_count);
+ "(attempt number %d)\n", sm_p->u.create_file.retry_count);
js_p->error_code = CREATE_RETRY;
return SM_ACTION_COMPLETE;
}
- PINT_free_object_attr(&sm_p->u.create.cache_attr);
+ PINT_free_object_attr(&sm_p->u.create_file.cache_attr);
- if (sm_p->u.create.io_handle_extent_array)
+ if (sm_p->u.create_file.io_handle_extent_array)
{
- free(sm_p->u.create.io_handle_extent_array);
- sm_p->u.create.io_handle_extent_array = NULL;
+ free(sm_p->u.create_file.io_handle_extent_array);
+ sm_p->u.create_file.io_handle_extent_array = NULL;
}
- if (sm_p->u.create.data_server_addrs)
+ if (sm_p->u.create_file.data_server_addrs)
{
- free(sm_p->u.create.data_server_addrs);
- sm_p->u.create.data_server_addrs = NULL;
+ free(sm_p->u.create_file.data_server_addrs);
+ sm_p->u.create_file.data_server_addrs = NULL;
}
- if (sm_p->u.create.datafile_handles)
+ if (sm_p->u.create_file.datafile_handles)
{
- free(sm_p->u.create.datafile_handles);
- sm_p->u.create.datafile_handles = NULL;
+ free(sm_p->u.create_file.datafile_handles);
+ sm_p->u.create_file.datafile_handles = NULL;
}
- if (sm_p->u.create.dist)
+ if (sm_p->u.create_file.dist)
{
- PINT_dist_free(sm_p->u.create.dist);
- sm_p->u.create.dist = NULL;
+ PINT_dist_free(sm_p->u.create_file.dist);
+ sm_p->u.create_file.dist = NULL;
}
- if(sm_p->u.create.layout.algorithm == PVFS_SYS_LAYOUT_LIST)
+ if(sm_p->u.create_file.layout.algorithm == PVFS_SYS_LAYOUT_LIST)
{
- free(sm_p->u.create.layout.server_list.servers);
+ free(sm_p->u.create_file.layout.server_list.servers);
}
if (sm_p->msgarray != &(sm_p->msgpair))
More information about the Pvfs2-cvs
mailing list