[PVFS2-CVS] commit by pcarns in pvfs2/include: pvfs2-encode-stubs.h pvfs2-mgmt.h pvfs2-types.h

CVS commit program cvs at parl.clemson.edu
Sun Sep 19 21:26:04 EDT 2004


Update of /projects/cvsroot/pvfs2/include
In directory parlweb:/tmp/cvs-serv16654/include

Modified Files:
	pvfs2-encode-stubs.h pvfs2-mgmt.h pvfs2-types.h 
Log Message:
make statfs return load averages from sysinfo()


Index: pvfs2-encode-stubs.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-encode-stubs.h,v
diff -p -u -r1.2 -r1.3
--- pvfs2-encode-stubs.h	21 Jan 2004 19:29:27 -0000	1.2
+++ pvfs2-encode-stubs.h	20 Sep 2004 00:26:03 -0000	1.3
@@ -32,6 +32,7 @@
 #define endecode_fields_3(n,t1,x1,t2,x2,t3,x3)
 #define endecode_fields_5(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5)
 #define endecode_fields_8(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8)
+#define endecode_fields_11(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8,t9,x9,t10,x10,t11,x11)
 #define endecode_fields_1_struct(n,t1,x1)
 #define endecode_fields_2_struct(n,t1,x1,t2,x2)
 #define endecode_fields_3_struct(n,t1,x1,t2,x2,t3,x3)

Index: pvfs2-mgmt.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-mgmt.h,v
diff -p -u -r1.43 -r1.44
--- pvfs2-mgmt.h	3 Sep 2004 14:57:00 -0000	1.43
+++ pvfs2-mgmt.h	20 Sep 2004 00:26:03 -0000	1.44
@@ -23,6 +23,9 @@ struct PVFS_mgmt_server_stat
     PVFS_size bytes_total;
     uint64_t ram_total_bytes;
     uint64_t ram_free_bytes;
+    uint64_t load_1;
+    uint64_t load_5;
+    uint64_t load_15;
     uint64_t uptime_seconds;
     uint64_t handles_available_count;
     uint64_t handles_total_count;

Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.95 -r1.96
--- pvfs2-types.h	2 Sep 2004 15:00:37 -0000	1.95
+++ pvfs2-types.h	20 Sep 2004 00:26:03 -0000	1.96
@@ -214,18 +214,24 @@ struct PVFS_statfs_s
     PVFS_size bytes_total;
     uint64_t ram_total_bytes;
     uint64_t ram_free_bytes;
+    uint64_t load_1;
+    uint64_t load_5;
+    uint64_t load_15;
     uint64_t uptime_seconds;
     uint64_t handles_available_count;
     uint64_t handles_total_count;
 };
 typedef struct PVFS_statfs_s PVFS_statfs;
-endecode_fields_8(
+endecode_fields_11(
     PVFS_statfs,
     PVFS_fs_id, fs_id,
     PVFS_size, bytes_available,
     PVFS_size, bytes_total,
     uint64_t, ram_total_bytes,
     uint64_t, ram_free_bytes,
+    uint64_t, load_1,
+    uint64_t, load_5,
+    uint64_t, load_15,
     uint64_t, uptime_seconds,
     uint64_t, handles_available_count,
     uint64_t, handles_total_count)



More information about the PVFS2-CVS mailing list