[Pvfs2-cvs] commit by walt in pvfs2-1/src/client/sysint:
client-job-timer.sm client-state-machine.c
client-state-machine.h fs-add.sm initialize.c
mgmt-create-dirent.sm mgmt-event-mon-list.sm
mgmt-get-dfile-array.sm mgmt-get-dirdata-handle.sm
mgmt-iterate-handles-list.sm mgmt-noop.sm
mgmt-remove-dirent.sm mgmt-remove-object.sm
mgmt-setparam-list.sm mgmt-statfs-list.sm
server-get-config.sm sys-create.sm sys-del-eattr.sm
sys-flush.sm sys-get-eattr.sm sys-getattr.sm sys-io.sm
sys-list-eattr.sm sys-lookup.sm sys-readdir.sm sys-remove.sm
sys-rename.sm sys-set-eattr.sm sys-setattr.sm sys-statfs.sm
sys-symlink.sm sys-truncate.sm
CVS commit program
cvs at parl.clemson.edu
Tue Aug 1 11:52:01 EDT 2006
Update of /projects/cvsroot/pvfs2-1/src/client/sysint
In directory parlweb1:/tmp/cvs-serv30331/src/client/sysint
Modified Files:
Tag: WALT3
client-job-timer.sm client-state-machine.c
client-state-machine.h fs-add.sm initialize.c
mgmt-create-dirent.sm mgmt-event-mon-list.sm
mgmt-get-dfile-array.sm mgmt-get-dirdata-handle.sm
mgmt-iterate-handles-list.sm mgmt-noop.sm
mgmt-remove-dirent.sm mgmt-remove-object.sm
mgmt-setparam-list.sm mgmt-statfs-list.sm server-get-config.sm
sys-create.sm sys-del-eattr.sm sys-flush.sm sys-get-eattr.sm
sys-getattr.sm sys-io.sm sys-list-eattr.sm sys-lookup.sm
sys-readdir.sm sys-remove.sm sys-rename.sm sys-set-eattr.sm
sys-setattr.sm sys-statfs.sm sys-symlink.sm sys-truncate.sm
Log Message:
updated term code, SM union remval and statecomp update for pjmp states
compiles clean, beginning test
Index: client-job-timer.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/client-job-timer.sm,v
diff -p -u -r1.4.20.6 -r1.4.20.7
--- client-job-timer.sm 18 Jul 2006 21:23:40 -0000 1.4.20.6
+++ client-job-timer.sm 1 Aug 2006 15:51:59 -0000 1.4.20.7
@@ -11,6 +11,7 @@
#include <fcntl.h>
#include <sys/time.h>
+#include "state-machine.h"
#include "client-state-machine.h"
#include "job-time-mgr.h"
@@ -53,7 +54,7 @@ static int job_timer_error(struct PINT_s
gossip_err("Error: stopping client job timer.\n");
PINT_SET_OP_COMPLETE;
- return 0;
+ return SM_ACTION_DEFERRED;
}
/* job_timer_do_work()
@@ -76,7 +77,7 @@ static int job_timer_do_work(struct PINT
if (ret < 0)
{
js_p->error_code = ret;
- return 1;
+ return SM_ACTION_COMPLETE;
}
/* post another timer */
Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.79.4.10 -r1.79.4.11
--- client-state-machine.c 21 Jul 2006 16:28:50 -0000 1.79.4.10
+++ client-state-machine.c 1 Aug 2006 15:51:59 -0000 1.79.4.11
@@ -241,6 +241,9 @@ struct PINT_client_op_entry_s PINT_clien
*/
struct PINT_state_machine_s *client_op_state_get_machine(int op)
{
+ gossip_debug(GOSSIP_CLIENT_DEBUG,
+ "client_op_state_get_machine %d\n",op);
+
switch (op)
{
/* special cases first */
@@ -274,6 +277,29 @@ struct PINT_state_machine_s *client_op_s
}
}
+/* callback for a terminating state machine
+ * the client adds terminted jobs to a completion list, unless
+ * they were cancelled.
+ */
+
+int client_state_machine_terminate(
+ struct PINT_smcb *smcb, job_status_s *js_p)
+{
+ int ret;
+
+ gossip_debug(GOSSIP_CLIENT_DEBUG,
+ "client_state_machine_terminate smcb %p\n",smcb);
+
+ if (!((PINT_smcb_op(smcb) == PVFS_SYS_IO) &&
+ (PINT_smcb_cancelled(smcb)) &&
+ (cancelled_io_jobs_are_pending(smcb))))
+ {
+ ret = add_sm_to_completion_list(smcb);
+ assert(ret == 0);
+ }
+ return SM_ACTION_TERMINATE;
+}
+
/*
NOTE: important usage notes regarding post(), test(), and testsome()
@@ -313,10 +339,8 @@ PVFS_error PINT_client_state_machine_pos
int pvfs_sys_op = PINT_smcb_op(smcb);
PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-#if 0
gossip_debug(GOSSIP_CLIENT_DEBUG,
- "PINT_client_state_machine_post called\n");
-#endif
+ "PINT_client_state_machine_post smcb %p\n",smcb);
CLIENT_SM_INIT_ONCE();
@@ -380,6 +404,9 @@ PVFS_error PINT_sys_dev_unexp(
PINT_smcb *smcb = NULL;
PINT_client_sm *sm_p = NULL;
+ gossip_debug(GOSSIP_CLIENT_DEBUG,
+ "PINT_sys_dev_unexp\n");
+
CLIENT_SM_INIT_ONCE();
/* we require more input args than the regular post method above */
@@ -388,11 +415,16 @@ PVFS_error PINT_sys_dev_unexp(
return -PVFS_EINVAL;
}
- PINT_smcb_alloc(&smcb, PVFS_DEV_UNEXPECTED,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
- if (!smcb)
+ ret = PINT_smcb_alloc(&smcb, PVFS_DEV_UNEXPECTED,
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
+ if (ret < 0)
{
- return -PVFS_ENOMEM;
+ gossip_lerr("Error: failed to allocate SMCB "
+ "of op type %x\n", PVFS_DEV_UNEXPECTED);
+ return ret;
}
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
sm_p->user_ptr = user_ptr;
@@ -401,7 +433,7 @@ PVFS_error PINT_sys_dev_unexp(
memset(jstat, 0, sizeof(job_status_s));
ret = job_dev_unexp(info, (void *)smcb, 0, jstat, &id,
JOB_NO_IMMED_COMPLETE, pint_client_sm_context);
- if (ret)
+ if (ret < 0)
{
PVFS_perror_gossip("PINT_sys_dev_unexp failed", ret);
PINT_smcb_free(&smcb);
@@ -425,7 +457,8 @@ PVFS_error PINT_client_io_cancel(PVFS_sy
PINT_smcb *smcb = NULL;
PINT_client_sm *sm_p = NULL;
- gossip_debug(GOSSIP_CLIENT_DEBUG, "PINT_client_io_cancel called\n");
+ gossip_debug(GOSSIP_CLIENT_DEBUG,
+ "PINT_client_io_cancel id %lld\n",id);
smcb = PINT_id_gen_safe_lookup(id);
if (!smcb)
@@ -553,10 +586,8 @@ PVFS_error PINT_client_state_machine_tes
job_status_s job_status_array[MAX_RETURNED_JOBS];
void *client_sm_p_array[MAX_RETURNED_JOBS] = {NULL};
-#if 0
gossip_debug(GOSSIP_CLIENT_DEBUG,
- "PINT_client_state_machine_test called\n");
-#endif
+ "PINT_client_state_machine_test id %lld\n",op_id);
CLIENT_SM_ASSERT_INITIALIZED();
@@ -595,6 +626,7 @@ PVFS_error PINT_client_state_machine_tes
tmp_smcb = (PINT_smcb *)client_sm_p_array[i];
assert(tmp_smcb);
+ /* why is this here - why doesn't an unexpected just terminate? */
if (PINT_smcb_op(tmp_smcb) == PVFS_DEV_UNEXPECTED)
{
PINT_smcb_set_complete(tmp_smcb);
@@ -604,27 +636,32 @@ PVFS_error PINT_client_state_machine_tes
{
ret = PINT_state_machine_next(tmp_smcb, &job_status_array[i]);
- assert(ret == SM_ACTION_DEFERRED); /* ret == 0 */
+ assert(ret == SM_ACTION_DEFERRED ||
+ ret == SM_ACTION_TERMINATE); /* ret == 0 */
}
/* make sure we don't return internally cancelled I/O jobs */
+ /* This is handled in terminate fn now
if ((PINT_smcb_op(tmp_smcb) == PVFS_SYS_IO) &&
(PINT_smcb_cancelled(tmp_smcb)) &&
(cancelled_io_jobs_are_pending(tmp_smcb)))
{
continue;
}
+ */
/*
if we've found a completed operation and it's NOT the op
being tested here, we add it to our local completion list so
that later calls to the sysint test/testsome can find it
*/
+ /* This is handled in terminate fn now
if ((tmp_smcb != smcb) && (PINT_smcb_complete(tmp_smcb)))
{
ret = add_sm_to_completion_list(tmp_smcb);
assert(ret == 0);
}
+ */
}
if (PINT_smcb_complete(smcb))
@@ -655,10 +692,8 @@ PVFS_error PINT_client_state_machine_tes
job_status_s job_status_array[MAX_RETURNED_JOBS];
void *client_sm_p_array[MAX_RETURNED_JOBS] = {NULL};
-#if 0
gossip_debug(GOSSIP_CLIENT_DEBUG,
- "PINT_client_state_machine_testsome called\n");
-#endif
+ "PINT_client_state_machine_testsome\n");
CLIENT_SM_ASSERT_INITIALIZED();
@@ -718,16 +753,19 @@ PVFS_error PINT_client_state_machine_tes
* itself; the return value of the underlying operation is
* kept in the job status structure.
*/
- assert(ret == SM_ACTION_DEFERRED);
+ assert(ret == SM_ACTION_DEFERRED ||
+ ret == SM_ACTION_TERMINATE);
}
/* make sure we don't return internally cancelled I/O jobs */
+ /* now done in terminate function
if ((PINT_smcb_op(smcb) == PVFS_SYS_IO) &&
(PINT_smcb_cancelled(smcb)) &&
(cancelled_io_jobs_are_pending(smcb)))
{
continue;
}
+ */
/*
by adding the completed op to our completion list, we can
@@ -735,11 +773,13 @@ PVFS_error PINT_client_state_machine_tes
grab all completed operations when we're finished
(i.e. outside of this loop).
*/
+ /* now done in terminate function
if (PINT_smcb_complete(smcb))
{
ret = add_sm_to_completion_list(smcb);
assert(ret == 0);
}
+ */
}
return completion_list_retrieve_completed(
@@ -796,6 +836,10 @@ void PVFS_sys_release(PVFS_sys_op_id op_
PINT_smcb *smcb = PINT_id_gen_safe_lookup(op_id);
PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PVFS_credentials *cred_p = sm_p->cred_p;
+
+ gossip_debug(GOSSIP_CLIENT_DEBUG,
+ "PVFS_sys_release id %lld\n",op_id);
+
if (smcb)
{
PINT_id_gen_safe_unregister(op_id);
@@ -815,6 +859,10 @@ void PVFS_mgmt_release(PVFS_mgmt_op_id o
{
PINT_smcb *smcb = PINT_id_gen_safe_lookup(op_id);
PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
+
+ gossip_debug(GOSSIP_CLIENT_DEBUG,
+ "PVFS_mgmt_release id %lld\n",op_id);
+
if (smcb)
{
PINT_id_gen_safe_unregister(op_id);
Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.162.2.7 -r1.162.2.8
--- client-state-machine.h 20 Jul 2006 23:08:30 -0000 1.162.2.7
+++ client-state-machine.h 1 Aug 2006 15:51:59 -0000 1.162.2.8
@@ -753,6 +753,7 @@ extern struct PINT_state_machine_s pvfs2
/* method for lookup up SM from OP */
struct PINT_state_machine_s *client_op_state_get_machine(int);
+int client_state_machine_terminate(struct PINT_smcb *, job_status_s *);
#endif /* __SM_CHECK_DEP */
#endif /* __PVFS2_CLIENT_STATE_MACHINE_H */
Index: fs-add.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/fs-add.sm,v
diff -p -u -r1.4.8.5 -r1.4.8.6
--- fs-add.sm 20 Jul 2006 23:08:30 -0000 1.4.8.5
+++ fs-add.sm 1 Aug 2006 15:51:59 -0000 1.4.8.6
@@ -120,7 +120,10 @@ PVFS_error PVFS_isys_fs_add(
mntent->the_pvfs_config_server = mntent->pvfs_config_servers[i];
PINT_smcb_alloc(&smcb, PVFS_SYS_FS_ADD,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
@@ -231,7 +234,7 @@ static int fs_add_parent_cleanup(struct
free(sm_p->u.get_config.config);
sm_p->error_code = js_p->error_code;
PINT_SET_OP_COMPLETE;
- return(0);
+ return SM_ACTION_DEFERRED;
}
#ifdef USE_TRUSTED
@@ -261,7 +264,7 @@ static int fs_add_parent_cleanup(struct
free(sm_p->u.get_config.config);
sm_p->error_code = ret;
PINT_SET_OP_COMPLETE;
- return(0);
+ return SM_ACTION_DEFERRED;
}
/*
@@ -280,7 +283,7 @@ static int fs_add_parent_cleanup(struct
free(sm_p->u.get_config.config);
sm_p->error_code = ret;
PINT_SET_OP_COMPLETE;
- return(0);
+ return SM_ACTION_DEFERRED;
}
/* finally, try to add the new config to the server config manager */
@@ -294,7 +297,7 @@ static int fs_add_parent_cleanup(struct
free(sm_p->u.get_config.config);
sm_p->error_code = ret;
PINT_SET_OP_COMPLETE;
- return(0);
+ return SM_ACTION_DEFERRED;
}
/*
@@ -306,9 +309,9 @@ static int fs_add_parent_cleanup(struct
gen_mutex_unlock(&mt_config);
sm_p->error_code = 0;
- PINT_SET_OP_COMPLETE;
- return 0;
+ PINT_SET_OP_COMPLETE;
+ return SM_ACTION_DEFERRED;
}
/*
Index: initialize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/initialize.c,v
diff -p -u -r1.99.14.3 -r1.99.14.4
--- initialize.c 20 Jul 2006 23:08:30 -0000 1.99.14.3
+++ initialize.c 1 Aug 2006 15:51:59 -0000 1.99.14.4
@@ -193,7 +193,10 @@ int PVFS_sys_initialize(uint64_t default
/* start job timer */
PINT_smcb_alloc(&smcb, PVFS_CLIENT_JOB_TIMER,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ NULL,
+ pint_client_sm_context);
if(!smcb)
{
return(-PVFS_ENOMEM);
Index: mgmt-create-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-create-dirent.sm,v
diff -p -u -r1.11.4.9 -r1.11.4.10
--- mgmt-create-dirent.sm 20 Jul 2006 23:08:30 -0000 1.11.4.9
+++ mgmt-create-dirent.sm 1 Aug 2006 15:51:59 -0000 1.11.4.10
@@ -99,7 +99,10 @@ PVFS_error PVFS_imgmt_create_dirent(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_CREATE_DIRENT,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: mgmt-event-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-event-mon-list.sm,v
diff -p -u -r1.26.4.9 -r1.26.4.10
--- mgmt-event-mon-list.sm 20 Jul 2006 23:08:31 -0000 1.26.4.9
+++ mgmt-event-mon-list.sm 1 Aug 2006 15:51:59 -0000 1.26.4.10
@@ -87,7 +87,10 @@ PVFS_error PVFS_imgmt_event_mon_list(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_EVENT_MON_LIST,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (!smcb)
{
return -PVFS_ENOMEM;
Index: mgmt-get-dfile-array.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-get-dfile-array.sm,v
diff -p -u -r1.27.4.8 -r1.27.4.9
--- mgmt-get-dfile-array.sm 20 Jul 2006 23:08:31 -0000 1.27.4.8
+++ mgmt-get-dfile-array.sm 1 Aug 2006 15:51:59 -0000 1.27.4.9
@@ -76,7 +76,10 @@ PVFS_error PVFS_imgmt_get_dfile_array(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_GET_DFILE_ARRAY,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (!smcb)
{
return -PVFS_ENOMEM;
Index: mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-get-dirdata-handle.sm,v
diff -p -u -r1.9.4.9 -r1.9.4.10
--- mgmt-get-dirdata-handle.sm 20 Jul 2006 23:08:31 -0000 1.9.4.9
+++ mgmt-get-dirdata-handle.sm 1 Aug 2006 15:51:59 -0000 1.9.4.10
@@ -100,7 +100,10 @@ PVFS_error PVFS_imgmt_get_dirdata_handle
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_GET_DIRDATA_HANDLE,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: mgmt-iterate-handles-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-iterate-handles-list.sm,v
diff -p -u -r1.25.4.9 -r1.25.4.10
--- mgmt-iterate-handles-list.sm 20 Jul 2006 23:08:31 -0000 1.25.4.9
+++ mgmt-iterate-handles-list.sm 1 Aug 2006 15:51:59 -0000 1.25.4.10
@@ -90,7 +90,10 @@ PVFS_error PVFS_imgmt_iterate_handles_li
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_ITERATE_HANDLES_LIST,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: mgmt-noop.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-noop.sm,v
diff -p -u -r1.29.4.8 -r1.29.4.9
--- mgmt-noop.sm 20 Jul 2006 23:08:31 -0000 1.29.4.8
+++ mgmt-noop.sm 1 Aug 2006 15:51:59 -0000 1.29.4.9
@@ -76,7 +76,10 @@ PVFS_error PVFS_imgmt_noop(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_imgmt_noop entered\n");
PINT_smcb_alloc(&smcb, PVFS_MGMT_NOOP,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (!smcb)
{
return -PVFS_ENOMEM;
Index: mgmt-remove-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-remove-dirent.sm,v
diff -p -u -r1.9.4.9 -r1.9.4.10
--- mgmt-remove-dirent.sm 20 Jul 2006 23:08:31 -0000 1.9.4.9
+++ mgmt-remove-dirent.sm 1 Aug 2006 15:51:59 -0000 1.9.4.10
@@ -98,7 +98,10 @@ PVFS_error PVFS_imgmt_remove_dirent(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_REMOVE_DIRENT,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: mgmt-remove-object.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-remove-object.sm,v
diff -p -u -r1.9.4.9 -r1.9.4.10
--- mgmt-remove-object.sm 20 Jul 2006 23:08:31 -0000 1.9.4.9
+++ mgmt-remove-object.sm 1 Aug 2006 15:52:00 -0000 1.9.4.10
@@ -96,7 +96,10 @@ PVFS_error PVFS_imgmt_remove_object(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_REMOVE_OBJECT,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: mgmt-setparam-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-setparam-list.sm,v
diff -p -u -r1.31.4.9 -r1.31.4.10
--- mgmt-setparam-list.sm 20 Jul 2006 23:08:31 -0000 1.31.4.9
+++ mgmt-setparam-list.sm 1 Aug 2006 15:52:00 -0000 1.31.4.10
@@ -95,7 +95,10 @@ PVFS_error PVFS_imgmt_setparam_list(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_SETPARAM_LIST,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.39.4.9 -r1.39.4.10
--- mgmt-statfs-list.sm 20 Jul 2006 23:08:31 -0000 1.39.4.9
+++ mgmt-statfs-list.sm 1 Aug 2006 15:52:00 -0000 1.39.4.10
@@ -110,7 +110,10 @@ PVFS_error PVFS_imgmt_statfs_list(
}
PINT_smcb_alloc(&smcb, PVFS_MGMT_STATFS_LIST,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.21.4.9 -r1.21.4.10
--- server-get-config.sm 20 Jul 2006 23:08:31 -0000 1.21.4.9
+++ server-get-config.sm 1 Aug 2006 15:52:00 -0000 1.21.4.10
@@ -125,7 +125,10 @@ int PINT_server_get_config(
mntent_p->pvfs_fs_name);
PINT_smcb_alloc(&smcb, PVFS_SERVER_GET_CONFIG,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-create.sm,v
diff -p -u -r1.92.2.9 -r1.92.2.10
--- sys-create.sm 20 Jul 2006 23:08:31 -0000 1.92.2.9
+++ sys-create.sm 1 Aug 2006 15:52:00 -0000 1.92.2.10
@@ -271,7 +271,10 @@ PVFS_error PVFS_isys_create(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_CREATE,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-del-eattr.sm,v
diff -p -u -r1.5.6.9 -r1.5.6.10
--- sys-del-eattr.sm 20 Jul 2006 23:08:31 -0000 1.5.6.9
+++ sys-del-eattr.sm 1 Aug 2006 15:52:00 -0000 1.5.6.10
@@ -78,7 +78,10 @@ PVFS_error PVFS_isys_deleattr(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_DELEATTR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.36.4.8 -r1.36.4.9
--- sys-flush.sm 20 Jul 2006 23:08:31 -0000 1.36.4.8
+++ sys-flush.sm 1 Aug 2006 15:52:00 -0000 1.36.4.9
@@ -100,7 +100,10 @@ PVFS_error PVFS_isys_flush(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_FLUSH,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (!smcb)
{
return -PVFS_ENOMEM;
Index: sys-get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-get-eattr.sm,v
diff -p -u -r1.6.4.9 -r1.6.4.10
--- sys-get-eattr.sm 20 Jul 2006 23:08:31 -0000 1.6.4.9
+++ sys-get-eattr.sm 1 Aug 2006 15:52:00 -0000 1.6.4.10
@@ -81,7 +81,10 @@ PVFS_error PVFS_isys_geteattr_list(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_GETEATTR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.99.2.9 -r1.99.2.10
--- sys-getattr.sm 20 Jul 2006 23:08:31 -0000 1.99.2.9
+++ sys-getattr.sm 1 Aug 2006 15:52:00 -0000 1.99.2.10
@@ -222,7 +222,10 @@ PVFS_error PVFS_isys_getattr(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_GETATTR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-io.sm,v
diff -p -u -r1.146.2.10 -r1.146.2.11
--- sys-io.sm 21 Jul 2006 16:28:50 -0000 1.146.2.10
+++ sys-io.sm 1 Aug 2006 15:52:00 -0000 1.146.2.11
@@ -303,7 +303,10 @@ PVFS_error PVFS_isys_io(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_IO,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-list-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-list-eattr.sm,v
diff -p -u -r1.3.8.8 -r1.3.8.9
--- sys-list-eattr.sm 20 Jul 2006 23:08:31 -0000 1.3.8.8
+++ sys-list-eattr.sm 1 Aug 2006 15:52:00 -0000 1.3.8.9
@@ -81,7 +81,10 @@ PVFS_error PVFS_isys_listeattr(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_LISTEATTR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.62.4.9 -r1.62.4.10
--- sys-lookup.sm 20 Jul 2006 23:08:31 -0000 1.62.4.9
+++ sys-lookup.sm 1 Aug 2006 15:52:00 -0000 1.62.4.10
@@ -464,7 +464,10 @@ PVFS_error PVFS_isys_ref_lookup(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_LOOKUP,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.44.4.9 -r1.44.4.10
--- sys-readdir.sm 20 Jul 2006 23:08:31 -0000 1.44.4.9
+++ sys-readdir.sm 1 Aug 2006 15:52:00 -0000 1.44.4.10
@@ -129,7 +129,10 @@ PVFS_error PVFS_isys_readdir(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_READDIR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.97.2.9 -r1.97.2.10
--- sys-remove.sm 20 Jul 2006 23:08:31 -0000 1.97.2.9
+++ sys-remove.sm 1 Aug 2006 15:52:00 -0000 1.97.2.10
@@ -204,7 +204,10 @@ PVFS_error PVFS_isys_remove(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_REMOVE,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.46.4.9 -r1.46.4.10
--- sys-rename.sm 20 Jul 2006 23:08:31 -0000 1.46.4.9
+++ sys-rename.sm 1 Aug 2006 15:52:00 -0000 1.46.4.10
@@ -310,7 +310,10 @@ PVFS_error PVFS_isys_rename(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_RENAME,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-set-eattr.sm,v
diff -p -u -r1.5.6.9 -r1.5.6.10
--- sys-set-eattr.sm 20 Jul 2006 23:08:31 -0000 1.5.6.9
+++ sys-set-eattr.sm 1 Aug 2006 15:52:00 -0000 1.5.6.10
@@ -82,7 +82,10 @@ PVFS_error PVFS_isys_seteattr_list(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_SETEATTR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.45.4.8 -r1.45.4.9
--- sys-setattr.sm 20 Jul 2006 23:08:31 -0000 1.45.4.8
+++ sys-setattr.sm 1 Aug 2006 15:52:00 -0000 1.45.4.9
@@ -125,7 +125,10 @@ PVFS_error PVFS_isys_setattr(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_SETATTR,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-statfs.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-statfs.sm,v
diff -p -u -r1.2.8.7 -r1.2.8.8
--- sys-statfs.sm 20 Jul 2006 23:08:31 -0000 1.2.8.7
+++ sys-statfs.sm 1 Aug 2006 15:52:01 -0000 1.2.8.8
@@ -48,7 +48,7 @@ machine pvfs2_client_statfs_sm(
state cleanup
{
run sys_statfs_cleanup;
- default => return;
+ default => terminate;
}
}
@@ -72,7 +72,10 @@ PVFS_error PVFS_isys_statfs(
"PVFS_isys_statfs entered\n");
PINT_smcb_alloc(&smcb, PVFS_SYS_STATFS,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.61.4.9 -r1.61.4.10
--- sys-symlink.sm 20 Jul 2006 23:08:31 -0000 1.61.4.9
+++ sys-symlink.sm 1 Aug 2006 15:52:01 -0000 1.61.4.10
@@ -215,7 +215,10 @@ PVFS_error PVFS_isys_symlink(
}
PINT_smcb_alloc(&smcb, PVFS_SYS_SYMLINK,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.49.4.8 -r1.49.4.9
--- sys-truncate.sm 20 Jul 2006 23:08:31 -0000 1.49.4.8
+++ sys-truncate.sm 1 Aug 2006 15:52:01 -0000 1.49.4.9
@@ -110,7 +110,10 @@ PVFS_error PVFS_isys_truncate(
"PVFS_isys_truncate entered with %lld\n", lld(size));
PINT_smcb_alloc(&smcb, PVFS_SYS_TRUNCATE,
- sizeof(struct PINT_client_sm), client_op_state_get_machine);
+ sizeof(struct PINT_client_sm),
+ client_op_state_get_machine,
+ client_state_machine_terminate,
+ pint_client_sm_context);
if (smcb == NULL)
{
return -PVFS_ENOMEM;
More information about the Pvfs2-cvs
mailing list