[Pvfs2-cvs] commit by dbonnie in pvfs2/include: pvfs2-hint.h pvfs2-sysint.h pvfs2-types.h

[CVS commit program]

Update of /anoncvs/pvfs2/include
In directory parlweb1:/tmp/cvs-serv1762/include

Modified Files:
      Tag: cu-security-branch
	pvfs2-sysint.h pvfs2-types.h 
Added Files:
      Tag: cu-security-branch
	pvfs2-hint.h 
Log Message:
Updated branch with code from HEAD


--- /dev/null	2004-06-24 14:04:38.000000000 -0400
+++ pvfs2-hint.h	2008-05-16 11:15:18.000000000 -0400
@@ -0,0 +1,48 @@
+/*
+ * (C) 2001 Clemson University and The University of Chicago
+ *
+ * See COPYING in top-level directory.
+ */
+
+#ifndef __PVFS2_HINT_H
+#define __PVFS2_HINT_H
+
+#include "pvfs2-types.h"
+
+#define PINT_HINT_TRANSFER 0x01
+
+#define PVFS_HINT_REQUEST_ID_NAME "pvfs.hint.request_id"
+#define PVFS_HINT_CLIENT_ID_NAME  "pvfs.hint.client_id"
+#define PVFS_HINT_HANDLE_NAME     "pvfs.hint.handle"
+#define PVFS_HINT_OP_ID_NAME      "pvfs.hint.op_id"
+
+typedef struct PVFS_hint_s *PVFS_hint;
+
+#define PVFS_HINT_NULL NULL
+
+int PVFS_hint_add(
+    PVFS_hint *hint,
+    const char *type,
+    int length,
+    void *value);
+
+int PVFS_hint_copy(PVFS_hint old_hint, PVFS_hint *new_hint);
+
+void PVFS_hint_free(PVFS_hint hint);
+
+/*
+ * function allows users to specify hints in an environment variable.
+ */
+int PVFS_hint_import_env(PVFS_hint *out_hint);
+
+#endif /* __PVFS2_HINT_H */
+
+/*
+ * Local variables:
+ *  mode: c
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ft=c ts=8 sts=4 sw=4 expandtab
+ */

Index: pvfs2-sysint.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-sysint.h,v
diff -p -u -r1.75 -r1.75.8.1
--- pvfs2-sysint.h	20 Sep 2007 15:09:21 -0000	1.75
+++ pvfs2-sysint.h	16 May 2008 15:15:18 -0000	1.75.8.1
@@ -23,6 +23,16 @@
 #include "pvfs2-types.h"
 #include "pvfs2-request.h"
 
+/** Options supported by get_info() and set_info(). */
+enum PVFS_sys_setinfo_opt
+{
+    PVFS_SYS_NCACHE_TIMEOUT_MSECS = 1,
+    PVFS_SYS_ACACHE_TIMEOUT_MSECS,
+    PVFS_SYS_MSG_TIMEOUT_SECS,
+    PVFS_SYS_MSG_RETRY_LIMIT,
+    PVFS_SYS_MSG_RETRY_DELAY_MSECS,
+};
+
 /** Holds a non-blocking system interface operation handle. */
 typedef PVFS_id_gen_t PVFS_sys_op_id;
 
@@ -585,6 +595,14 @@ PVFS_error PVFS_sys_listeattr(
     int32_t nkey,
     const PVFS_credentials *credentials,
     PVFS_sysresp_listeattr *resp);
+
+PVFS_error PVFS_sys_set_info(
+    enum PVFS_sys_setinfo_opt option,
+    unsigned int arg);
+
+PVFS_error PVFS_sys_get_info(
+    enum PVFS_sys_setinfo_opt option,
+    unsigned int* arg);
 
 /* exported test functions for isys calls */
 

Index: pvfs2-types.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.147 -r1.147.4.1
--- pvfs2-types.h	19 Dec 2007 05:39:09 -0000	1.147
+++ pvfs2-types.h	16 May 2008 15:15:18 -0000	1.147.4.1
@@ -189,6 +189,7 @@ enum PVFS_sys_layout_algorithm
     /* order the datafiles based on the list specified */
     PVFS_SYS_LAYOUT_LIST = 4
 };
+#define PVFS_SYS_LAYOUT_DEFAULT PVFS_SYS_LAYOUT_ROUND_ROBIN
 
 /* The list of datafile servers that can be passed into PVFS_sys_create
  * to specify the exact layout of a file.  The count parameter will override