[PVFS2-CVS] commit by pcarns in pvfs2/src/client/sysint: client-state-machine.h mgmt-event-mon-list.sm mgmt-get-dfile-array.sm mgmt-iterate-handles-list.sm mgmt-noop.sm mgmt-perf-mon-list.sm mgmt-setparam-list.sm mgmt-statfs-list.sm server-get-config.sm sys-create.sm sys-flush.sm sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm sys-readdir.sm sys-remove.sm sys-rename.sm sys-setattr.sm sys-symlink.sm sys-truncate.sm

CVS commit program cvs at parl.clemson.edu
Mon Jul 12 22:47:55 EDT 2004


Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv20338/src/client/sysint

Modified Files:
	client-state-machine.h mgmt-event-mon-list.sm 
	mgmt-get-dfile-array.sm mgmt-iterate-handles-list.sm 
	mgmt-noop.sm mgmt-perf-mon-list.sm mgmt-setparam-list.sm 
	mgmt-statfs-list.sm server-get-config.sm sys-create.sm 
	sys-flush.sm sys-getattr.sm sys-io.sm sys-lookup.sm 
	sys-mkdir.sm sys-readdir.sm sys-remove.sm sys-rename.sm 
	sys-setattr.sm sys-symlink.sm sys-truncate.sm 
Log Message:
Added a new structure for msgpairarray nested machine:
PINT_sm_msgpair_params.  This struct contains parameters for the
msgpairarray that apply to all entries.  So far only contains 4 fields that
were previously fixed at compile time in state machine.  Will later move other
parameters from PINT_sm_msgpair_state that don't need to be duplicated at
each array entry.  Benefits:
- another step towards breaking dependence on client side code
- will eventually reduce overall state machine size (when duplicate fields
  are moved from array)
- will allow some parameters that were previously set at compile time (like
  timeouts, etc.) to be changed at runtime if we want


Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.116 -r1.117
--- client-state-machine.h	13 Jul 2004 00:47:35 -0000	1.116
+++ client-state-machine.h	13 Jul 2004 01:47:55 -0000	1.117
@@ -371,6 +371,7 @@ typedef struct PINT_client_sm
      */
     int msgarray_count;
     PINT_sm_msgpair_state *msgarray;
+    PINT_sm_msgpair_params msgarray_params;
 
     /*
       internal pvfs_object references; used in conjunction with the

Index: mgmt-event-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-event-mon-list.sm,v
diff -p -u -r1.18 -r1.19
--- mgmt-event-mon-list.sm	13 Jul 2004 00:47:35 -0000	1.18
+++ mgmt-event-mon-list.sm	13 Jul 2004 01:47:55 -0000	1.19
@@ -85,6 +85,11 @@ int PVFS_imgmt_event_mon_list(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.event_mon_list.fs_id = fs_id;

Index: mgmt-get-dfile-array.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-get-dfile-array.sm,v
diff -p -u -r1.14 -r1.15
--- mgmt-get-dfile-array.sm	8 Jul 2004 20:06:47 -0000	1.14
+++ mgmt-get-dfile-array.sm	13 Jul 2004 01:47:55 -0000	1.15
@@ -85,6 +85,11 @@ int PVFS_imgmt_get_dfile_array(
 	return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->object_ref = ref;

Index: mgmt-iterate-handles-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-iterate-handles-list.sm,v
diff -p -u -r1.16 -r1.17
--- mgmt-iterate-handles-list.sm	13 Jul 2004 00:47:36 -0000	1.16
+++ mgmt-iterate-handles-list.sm	13 Jul 2004 01:47:55 -0000	1.17
@@ -85,8 +85,12 @@ int PVFS_imgmt_iterate_handles_list(
     {
         return -PVFS_ENOMEM;
     }
-
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.iterate_handles_list.fs_id = fs_id;

Index: mgmt-noop.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-noop.sm,v
diff -p -u -r1.20 -r1.21
--- mgmt-noop.sm	13 Jul 2004 00:47:36 -0000	1.20
+++ mgmt-noop.sm	13 Jul 2004 01:47:55 -0000	1.21
@@ -70,6 +70,11 @@ int PVFS_imgmt_noop(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->msgpair.fs_id = fs_id;

Index: mgmt-perf-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-perf-mon-list.sm,v
diff -p -u -r1.21 -r1.22
--- mgmt-perf-mon-list.sm	13 Jul 2004 00:47:36 -0000	1.21
+++ mgmt-perf-mon-list.sm	13 Jul 2004 01:47:55 -0000	1.22
@@ -88,6 +88,11 @@ int PVFS_imgmt_perf_mon_list(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.perf_mon_list.fs_id = fs_id;

Index: mgmt-setparam-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-setparam-list.sm,v
diff -p -u -r1.19 -r1.20
--- mgmt-setparam-list.sm	13 Jul 2004 00:47:36 -0000	1.19
+++ mgmt-setparam-list.sm	13 Jul 2004 01:47:55 -0000	1.20
@@ -87,8 +87,12 @@ int PVFS_imgmt_setparam_list(
     {
         return -PVFS_ENOMEM;
     }
-
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.setparam_list.fs_id = fs_id;

Index: mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.27 -r1.28
--- mgmt-statfs-list.sm	13 Jul 2004 00:47:36 -0000	1.27
+++ mgmt-statfs-list.sm	13 Jul 2004 01:47:55 -0000	1.28
@@ -83,8 +83,12 @@ int PVFS_imgmt_statfs_list(
     {
         return -PVFS_ENOMEM;
     }
-
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.statfs_list.fs_id = fs_id;

Index: server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.8 -r1.9
--- server-get-config.sm	13 Jul 2004 00:47:36 -0000	1.8
+++ server-get-config.sm	13 Jul 2004 01:47:55 -0000	1.9
@@ -104,6 +104,11 @@ int PINT_server_get_config(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, &creds);
     sm_p->u.get_config.mntent = mntent_p;

Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.50 -r1.51
--- sys-create.sm	13 Jul 2004 00:47:36 -0000	1.50
+++ sys-create.sm	13 Jul 2004 01:47:55 -0000	1.51
@@ -260,6 +260,11 @@ int PVFS_isys_create(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.create.object_name = object_name;

Index: sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.21 -r1.22
--- sys-flush.sm	13 Jul 2004 00:47:36 -0000	1.21
+++ sys-flush.sm	13 Jul 2004 01:47:55 -0000	1.22
@@ -110,6 +110,11 @@ int PVFS_isys_flush(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->object_ref = ref;

Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.62 -r1.63
--- sys-getattr.sm	13 Jul 2004 00:47:36 -0000	1.62
+++ sys-getattr.sm	13 Jul 2004 01:47:55 -0000	1.63
@@ -151,6 +151,11 @@ int PVFS_isys_getattr(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->error_code = 0;

Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.82 -r1.83
--- sys-io.sm	12 Jul 2004 21:12:39 -0000	1.82
+++ sys-io.sm	13 Jul 2004 01:47:55 -0000	1.83
@@ -234,6 +234,11 @@ int PVFS_isys_io(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->object_ref = ref;

Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.40 -r1.41
--- sys-lookup.sm	12 Jul 2004 18:22:32 -0000	1.40
+++ sys-lookup.sm	13 Jul 2004 01:47:55 -0000	1.41
@@ -481,6 +481,11 @@ int PVFS_isys_ref_lookup(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(PINT_client_sm));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.lookup.orig_pathname = relative_pathname;

Index: sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.28 -r1.29
--- sys-mkdir.sm	13 Jul 2004 00:47:36 -0000	1.28
+++ sys-mkdir.sm	13 Jul 2004 01:47:55 -0000	1.29
@@ -190,6 +190,11 @@ int PVFS_isys_mkdir(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.mkdir.object_name = object_name;

Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.21 -r1.22
--- sys-readdir.sm	13 Jul 2004 00:47:36 -0000	1.21
+++ sys-readdir.sm	13 Jul 2004 01:47:55 -0000	1.22
@@ -126,6 +126,11 @@ int PVFS_isys_readdir(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.readdir.pos_token = token;

Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.68 -r1.69
--- sys-remove.sm	13 Jul 2004 00:47:37 -0000	1.68
+++ sys-remove.sm	13 Jul 2004 01:47:55 -0000	1.69
@@ -178,6 +178,11 @@ int PVFS_isys_remove(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.remove.object_name = object_name;

Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.26 -r1.27
--- sys-rename.sm	13 Jul 2004 00:47:37 -0000	1.26
+++ sys-rename.sm	13 Jul 2004 01:47:55 -0000	1.27
@@ -271,6 +271,11 @@ int PVFS_isys_rename(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     /*
       this state machine has several hardcoded 2's around because

Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.22 -r1.23
--- sys-setattr.sm	13 Jul 2004 00:47:37 -0000	1.22
+++ sys-setattr.sm	13 Jul 2004 01:47:55 -0000	1.23
@@ -127,6 +127,11 @@ int PVFS_isys_setattr(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->object_ref = ref;

Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.34 -r1.35
--- sys-symlink.sm	13 Jul 2004 00:47:37 -0000	1.34
+++ sys-symlink.sm	13 Jul 2004 01:47:55 -0000	1.35
@@ -221,6 +221,11 @@ int PVFS_isys_symlink(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->u.sym.link_name = entry_name;

Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.25 -r1.26
--- sys-truncate.sm	13 Jul 2004 00:47:37 -0000	1.25
+++ sys-truncate.sm	13 Jul 2004 01:47:55 -0000	1.26
@@ -112,6 +112,11 @@ int PVFS_isys_truncate(
         return -PVFS_ENOMEM;
     }
     memset(sm_p, 0, sizeof(*sm_p));
+    /* set msgpair default parameters */
+    sm_p->msgarray_params.job_context = pint_client_sm_context;
+    sm_p->msgarray_params.job_timeout = PVFS2_CLIENT_JOB_TIMEOUT;
+    sm_p->msgarray_params.retry_delay = PVFS2_CLIENT_RETRY_DELAY;
+    sm_p->msgarray_params.retry_limit = PVFS2_CLIENT_RETRY_LIMIT;
 
     PINT_init_sysint_credentials(sm_p->cred_p, credentials);
     sm_p->object_ref = ref;



More information about the PVFS2-CVS mailing list