[Sblim-commit] cmpi-base/mof Linux_Base.mof,1.11,1.12 Linux_Base.sfcb.reg,1.1,1.2 Linux_BaseRegistration.mof,1.9,1.10

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base/mof
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2372/mof

Modified Files:
	Linux_Base.mof Linux_Base.sfcb.reg Linux_BaseRegistration.mof 
Log Message:
feature request# 1186592: support for OS statistical information added
... contribution by Michael Schuele :) ... thx


Index: Linux_Base.mof
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/mof/Linux_Base.mof,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Linux_Base.mof	17 Mar 2005 08:39:54 -0000	1.11
+++ Linux_Base.mof	20 Apr 2005 11:34:56 -0000	1.12
@@ -106,6 +106,62 @@
 
 
 // ===================================================================
+// 	Linux_OperatingSystemStatisticalData
+// ===================================================================
+
+[ Provider("cmpi:cmpiOSBase_OperatingSystemStatisticalDataProvider") ] 
+class Linux_OperatingSystemStatisticalData : CIM_StatisticalData
+{
+  [ Counter,
+    Description("The cumulative time the system ran in user mode "
+    "since system startup.")
+  ]
+  uint64 CPUUserTime;
+
+  [ Counter,
+    Description("The cumulative time the system ran in system mode "
+    "since system startup.")
+  ]
+  uint64 CPUSystemTime;
+
+  [ Counter,
+    Description("The cumulative time the system waited for I/O "
+    "requests to be completed since system startup.")
+  ]
+  uint64 CPUWaitTime;
+
+  [ Counter,
+    Description("The cumulative time the system was idle since "
+    "system startup.")
+  ]
+  uint64 CPUIdleTime;
+
+  [ Counter,
+    Description("The amount of processes currently running or "
+    "ready to be run.")
+  ]
+  uint64 RunQueueLength;
+
+  [ Counter,
+    Description("The amount of processes currently waiting for "
+    "I/O requests to be completed.")
+  ]
+  uint64 BlockQueueLength;
+
+  [ Counter,
+    Description("The amount of pages paged in since system "
+    "startup.")
+  ]
+  uint64 PagesPagedIn;
+
+  [ Counter,
+    Description("The amount of pages paged out since system "
+    "startup.")]
+  uint64 PagesPagedOut;
+};
+
+
+// ===================================================================
 // 	Linux_UnixProcess
 // ===================================================================
 
@@ -201,6 +257,28 @@
 
 
 // ===================================================================
+// 	Linux_OperatingSystemStatistics
+// ===================================================================
+
+[ Association, 
+  Provider("cmpi:cmpiOSBase_OperatingSystemStatisticsProvider") ] 
+class Linux_OperatingSystemStatistics : CIM_ElementStatisticalData
+{
+  [ Override("ManagedElement"),
+    Min(1),
+    Max(1),
+    Description("The System to which the statistics apply.")
+  ]
+  Linux_OperatingSystem REF ManagedElement;
+
+  [ Override("Stats"),
+    Description("The statistical object.")
+  ]
+  Linux_OperatingSystemStatisticalData REF Stats;
+};
+
+
+// ===================================================================
 // 	Linux_CSProcessor
 // ===================================================================
 

Index: Linux_BaseRegistration.mof
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/mof/Linux_BaseRegistration.mof,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Linux_BaseRegistration.mof	17 Mar 2005 08:39:54 -0000	1.9
+++ Linux_BaseRegistration.mof	20 Apr 2005 11:34:57 -0000	1.10
@@ -140,6 +140,45 @@
 
 
 // ===================================================================
+// 	Linux_OperatingSystemStatisticalData
+// ===================================================================
+
+instance of PG_ProviderModule
+{
+   Name="OSBase_OperatingSystemStatisticalDataProviderModule";
+   // the library name
+   Location="cmpiOSBase_OperatingSystemStatisticalDataProvider";
+   Vendor="IBM";
+   Version="2.0.0";
+   InterfaceType="CMPI";
+   InterfaceVersion="2.1.0";
+};
+
+instance of PG_Provider
+{
+   // the provider module as defined in PG_ProviderModule
+   ProviderModuleName="OSBase_OperatingSystemStatisticalDataProviderModule";
+   // the provider name as referenced in the code
+   Name="OSBase_OperatingSystemStatisticalDataProvider";
+};
+
+instance of PG_ProviderCapabilities
+{
+   // provider module as defined in PG_ProviderModule
+   ProviderModuleName="OSBase_OperatingSystemStatisticalDataProviderModule";
+   // provider name as defined in PG_Provider
+   ProviderName="OSBase_OperatingSystemStatisticalDataProvider";
+   CapabilityID="1";
+   // name of CIM class as defined in the mof
+   ClassName="Linux_OperatingSystemStatisticalData";
+   Namespaces={"root/cimv2"};
+   ProviderType={2,5}; // Instance, Method
+   SupportedProperties=NULL; // All properties
+   SupportedMethods = NULL; // All methods
+};
+
+
+// ===================================================================
 // 	Linux_UnixProcess
 // ===================================================================
 
@@ -345,6 +384,45 @@
 
 
 // ===================================================================
+// 	Linux_OperatingSystemStatistics
+// ===================================================================
+
+instance of PG_ProviderModule
+{
+   Name="OSBase_OperatingSystemStatisticsProviderModule";
+   // the library name
+   Location="cmpiOSBase_OperatingSystemStatisticsProvider";
+   Vendor="IBM";
+   Version="2.0.0";
+   InterfaceType="CMPI";
+   InterfaceVersion="2.1.0";
+};
+
+instance of PG_Provider
+{
+   // the provider module as defined in PG_ProviderModule
+   ProviderModuleName="OSBase_OperatingSystemStatisticsProviderModule";
+   // the provider name as referenced in the code
+   Name="OSBase_OperatingSystemStatisticsProvider";
+};
+
+instance of PG_ProviderCapabilities
+{
+   // provider module as defined in PG_ProviderModule
+   ProviderModuleName="OSBase_OperatingSystemStatisticsProviderModule";
+   // provider name as defined in PG_Provider
+   ProviderName="OSBase_OperatingSystemStatisticsProvider";
+   CapabilityID="1";
+   // name of CIM class as defined in the mof
+   ClassName="Linux_OperatingSystemStatistics";
+   Namespaces={"root/cimv2"};
+   ProviderType={2,3}; // Instance, Association
+   SupportedProperties=NULL; // All properties
+   SupportedMethods=NULL; // All methods
+};
+
+
+// ===================================================================
 // 	Linux_CSProcessor
 // ===================================================================
 

Index: Linux_Base.sfcb.reg
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/mof/Linux_Base.sfcb.reg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Linux_Base.sfcb.reg	6 Apr 2005 16:29:48 -0000	1.1
+++ Linux_Base.sfcb.reg	20 Apr 2005 11:34:56 -0000	1.2
@@ -22,6 +22,13 @@
    type: instance
    namespace: root/cimv2
 #
+#
+[Linux_OperatingSystemStatisticalData]
+   provider: OSBase_OperatingSystemStatisticalDataProvider
+   location: cmpiOSBase_OperatingSystemStatisticalDataProvider
+   type: instance
+   namespace: root/cimv2
+#
 [Linux_BaseBoard]
    provider: OSBase_BaseBoardProvider
    location: cmpiOSBase_BaseBoardProvider
@@ -40,6 +47,12 @@
    type: instance association
    namespace: root/cimv2
 #
+[Linux_OperatingSystemStatistics]
+   provider: OSBase_OperatingSystemStatisticsProvider
+   location: cmpiOSBase_OperatingSystemStatisticsProvider
+   type: instance association
+   namespace: root/cimv2
+#
 [Linux_CSProcessor]
    provider: OSBase_CSProcessorProvider
    location: cmpiOSBase_CSProcessorProvider