[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/client/sysint: client-state-machine.c fs-add.sm server-get-config.sm sys-readdirplus.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/client/sysint
In directory parlweb1:/tmp/cvs-serv26608/src/client/sysint

Modified Files:
      Tag: small-file-branch
	client-state-machine.c fs-add.sm server-get-config.sm 
	sys-readdirplus.sm 
Log Message:
syncing small-file-branch back up with trunk at small-file-branch-point2 tag
(reverse merge)


Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.93.2.3 -r1.93.2.4
--- client-state-machine.c	29 Feb 2008 20:12:17 -0000	1.93.2.3
+++ client-state-machine.c	7 Apr 2008 15:07:16 -0000	1.93.2.4
@@ -23,6 +23,8 @@
 #include "gossip.h"
 #include "pvfs2-util.h"
 #include "id-generator.h"
+#include "ncache.h"
+#include "acache.h"
 
 #define MAX_RETURNED_JOBS   256
 
@@ -945,6 +947,84 @@ int PVFS_mgmt_wait(
         out_error,
         "mgmt");
 }
+
+PVFS_error PVFS_sys_set_info(
+    enum PVFS_sys_setinfo_opt option,
+    unsigned int arg)
+{
+    PVFS_error ret = -PVFS_ENOSYS;
+
+    switch(option)
+    {
+        case PVFS_SYS_NCACHE_TIMEOUT_MSECS:
+            ret = PINT_ncache_set_info(NCACHE_TIMEOUT_MSECS, arg);
+            break;
+        case PVFS_SYS_ACACHE_TIMEOUT_MSECS:
+            ret = PINT_acache_set_info(ACACHE_TIMEOUT_MSECS, arg);
+            break;
+        case PVFS_SYS_MSG_TIMEOUT_SECS:
+        case PVFS_SYS_MSG_RETRY_LIMIT:
+        case PVFS_SYS_MSG_RETRY_DELAY_MSECS:
+            ret = -PVFS_ENOSYS;
+            break;
+#if 0
+        /* need some other code cleanup before these can be implemented */
+        case PVFS_SYS_MSG_TIMEOUT_SECS:
+            PINT_sys_msg_timeout_secs = arg;
+            ret = 0;
+            break;
+        case PVFS_SYS_MSG_RETRY_LIMIT:
+            PINT_sys_msg_retry_limit = arg;
+            ret = 0;
+            break;
+        case PVFS_SYS_MSG_RETRY_DELAY_MSECS:
+            PINT_sys_msg_retry_delay_msecs = arg;
+            ret = 0;
+            break;
+#endif
+    }
+
+    return(ret);
+}
+
+PVFS_error PVFS_sys_get_info(
+    enum PVFS_sys_setinfo_opt option,
+    unsigned int* arg)
+{
+    PVFS_error ret = -PVFS_ENOSYS;
+
+    switch(option)
+    {
+        case PVFS_SYS_NCACHE_TIMEOUT_MSECS:
+            ret = PINT_ncache_get_info(NCACHE_TIMEOUT_MSECS, arg);
+            break;
+        case PVFS_SYS_ACACHE_TIMEOUT_MSECS:
+            ret = PINT_acache_get_info(ACACHE_TIMEOUT_MSECS, arg);
+            break;
+        case PVFS_SYS_MSG_TIMEOUT_SECS:
+        case PVFS_SYS_MSG_RETRY_LIMIT:
+        case PVFS_SYS_MSG_RETRY_DELAY_MSECS:
+            ret = -PVFS_ENOSYS;
+            break;
+#if 0
+        case PVFS_SYS_MSG_TIMEOUT_SECS:
+            *arg = PINT_sys_msg_timeout_secs;
+            ret = 0;
+            break;
+        case PVFS_SYS_MSG_RETRY_LIMIT:
+            *arg = PINT_sys_msg_retry_limit;
+            ret = 0;
+            break;
+        case PVFS_SYS_MSG_RETRY_DELAY_MSECS:
+            *arg = PINT_sys_msg_retry_delay_msecs;
+            ret = 0;
+            break;
+#endif
+    }
+
+    return(ret);
+}
+
 
 /*
  * Local variables:

Index: fs-add.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/fs-add.sm,v
diff -p -u -r1.17 -r1.17.6.1
--- fs-add.sm	30 Aug 2007 00:13:41 -0000	1.17
+++ fs-add.sm	7 Apr 2008 15:07:16 -0000	1.17.6.1
@@ -134,7 +134,11 @@ PVFS_error PVFS_isys_fs_add(
     if (i == mntent->num_pvfs_config_servers)
     {
         gossip_err("%s: Failed to initialize any appropriate "
-                   "BMI methods.\n", __func__);
+                   "BMI methods for addresses:\n", __func__);
+        for(i = 0; i < mntent->num_pvfs_config_servers; ++i)
+        {
+            gossip_err("\t%s\n", mntent->pvfs_config_servers[i]);
+        }
         gen_mutex_unlock(&mt_config);
         return(ret);
     }

Index: server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.30 -r1.30.2.1
--- server-get-config.sm	14 Dec 2007 16:57:47 -0000	1.30
+++ server-get-config.sm	7 Apr 2008 15:07:16 -0000	1.30.2.1
@@ -236,6 +236,12 @@ static int server_parse_config(
         {
             ret = PINT_parse_config(config, fs_template, NULL);
         }
+        else
+        {
+            gossip_err("Failed to write fs.conf buffer to temp file: %s: %s\n",
+                       fs_template, strerror(errno));
+        }
+    
         close(fs_fd);
 
         remove(fs_template);

Index: sys-readdirplus.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-readdirplus.sm,v
diff -p -u -r1.7.6.2 -r1.7.6.3
--- sys-readdirplus.sm	10 Mar 2008 21:05:23 -0000	1.7.6.2
+++ sys-readdirplus.sm	7 Apr 2008 15:07:16 -0000	1.7.6.3
@@ -732,7 +732,7 @@ static PINT_sm_action readdirplus_fetch_
             msg_p->req,
             *sm_p->cred_p,
             sm_p->object_ref.fs_id,
-            sm_p->u.readdirplus.attrmask,
+            PVFS_ATTR_DATA_SIZE,
             sm_p->u.readdirplus.handle_count[i],
             sm_p->u.readdirplus.handles[i]);
         msg_p->fs_id = sm_p->object_ref.fs_id;