Index: devpcp/src/pmdas/darwin/pmda.c
===================================================================
--- devpcp.orig/src/pmdas/darwin/pmda.c	2007-03-08 11:54:28.488458000 +1100
+++ devpcp/src/pmdas/darwin/pmda.c	2007-03-08 11:56:42.404827250 +1100
@@ -176,11 +176,11 @@ static pmdaMetric metrictab[] = {
 /* hinv.physmem */
   { NULL, 
     { PMDA_PMID(CLUSTER_VMSTAT,2), PM_TYPE_U32, PM_INDOM_NULL,
-      PM_SEM_INSTANT, PMDA_PMUNITS(1,0,0,PM_SPACE_MBYTE,0,0) }, },
+      PM_SEM_DISCRETE, PMDA_PMUNITS(1,0,0,PM_SPACE_MBYTE,0,0) }, },
 /* mem.physmem */
   { NULL,
     { PMDA_PMID(CLUSTER_VMSTAT,3), PM_TYPE_U64, PM_INDOM_NULL,
-      PM_SEM_INSTANT, PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) }, },
+      PM_SEM_DISCRETE, PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) }, },
 /* mem.freemem */
   { NULL,
     { PMDA_PMID(CLUSTER_VMSTAT,4), PM_TYPE_U64, PM_INDOM_NULL,
@@ -299,7 +299,7 @@ static pmdaMetric metrictab[] = {
 /* filesys.capacity */ 
   { NULL,
     { PMDA_PMID(CLUSTER_FILESYS,32), PM_TYPE_U64, FILESYS_INDOM,
-      PM_SEM_INSTANT, PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) }, },
+      PM_SEM_DISCRETE, PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) }, },
 /* filesys.used */
   { NULL,
     { PMDA_PMID(CLUSTER_FILESYS,33), PM_TYPE_U64, FILESYS_INDOM,
Index: devpcp/src/pmdas/linux/pmda.c
===================================================================
--- devpcp.orig/src/pmdas/linux/pmda.c	2007-03-08 11:54:28.400452500 +1100
+++ devpcp/src/pmdas/linux/pmda.c	2007-03-08 12:06:11.736408250 +1100
@@ -579,7 +579,7 @@ static pmdaMetric metrictab[] = {
 
 /* hinv.physmem */
     { NULL, 
-      { PMDA_PMID(CLUSTER_MEMINFO,9), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_INSTANT, 
+      { PMDA_PMID(CLUSTER_MEMINFO,9), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_DISCRETE,
       PMDA_PMUNITS(1,0,0,PM_SPACE_MBYTE,0,0) }, },
 
 /* mem.freemem */
@@ -805,7 +805,7 @@ static pmdaMetric metrictab[] = {
 
 /* filesys.capacity */
   { NULL,
-    { PMDA_PMID(CLUSTER_FILESYS,1), PM_TYPE_U64, FILESYS_INDOM, PM_SEM_INSTANT,
+    { PMDA_PMID(CLUSTER_FILESYS,1), PM_TYPE_U64, FILESYS_INDOM, PM_SEM_DISCRETE,
     PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) } },
 
 /* filesys.used */
@@ -820,7 +820,7 @@ static pmdaMetric metrictab[] = {
 
 /* filesys.maxfiles */
   { NULL,
-     { PMDA_PMID(CLUSTER_FILESYS,4), PM_TYPE_U32, FILESYS_INDOM, PM_SEM_INSTANT,
+     { PMDA_PMID(CLUSTER_FILESYS,4), PM_TYPE_U32, FILESYS_INDOM, PM_SEM_DISCRETE,
      PMDA_PMUNITS(0,0,0,0,0,0) } },
 
 /* filesys.usedfiles */
@@ -868,17 +868,17 @@ static pmdaMetric metrictab[] = {
 
 /* swapdev.length */
   { NULL,
-    { PMDA_PMID(CLUSTER_SWAPDEV,1), PM_TYPE_U32, SWAPDEV_INDOM, PM_SEM_INSTANT,
+    { PMDA_PMID(CLUSTER_SWAPDEV,1), PM_TYPE_U32, SWAPDEV_INDOM, PM_SEM_DISCRETE,
     PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) } },
 
 /* swapdev.maxswap */
   { NULL,
-    { PMDA_PMID(CLUSTER_SWAPDEV,2), PM_TYPE_U32, SWAPDEV_INDOM, PM_SEM_INSTANT,
+    { PMDA_PMID(CLUSTER_SWAPDEV,2), PM_TYPE_U32, SWAPDEV_INDOM, PM_SEM_DISCRETE,
     PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) } },
 
 /* swapdev.vlength */
   { NULL,
-    { PMDA_PMID(CLUSTER_SWAPDEV,3), PM_TYPE_U32, SWAPDEV_INDOM, PM_SEM_INSTANT,
+    { PMDA_PMID(CLUSTER_SWAPDEV,3), PM_TYPE_U32, SWAPDEV_INDOM, PM_SEM_DISCRETE,
     PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0) } },
 
 /* swapdev.priority */
@@ -2485,7 +2485,7 @@ static pmdaMetric metrictab[] = {
 
 /* hinv.machine */
   { NULL,
-    { PMDA_PMID(CLUSTER_CPUINFO, 7), PM_TYPE_STRING, PM_INDOM_NULL, PM_SEM_INSTANT,
+    { PMDA_PMID(CLUSTER_CPUINFO, 7), PM_TYPE_STRING, PM_INDOM_NULL, PM_SEM_DISCRETE,
     PMDA_PMUNITS(0,0,0,0,0,0) } },
 
 /*
Index: devpcp/src/pmdas/windows/data.c
===================================================================
--- devpcp.orig/src/pmdas/windows/data.c	2007-03-08 11:57:14.242817000 +1100
+++ devpcp/src/pmdas/windows/data.c	2007-03-08 11:57:48.040929250 +1100
@@ -657,7 +657,7 @@ static struct {
     },
 
 /* filesys.capacity */
-    { { PMDA_PMID(0,117), PM_TYPE_U64, LDISK_INDOM, PM_SEM_INSTANT,
+    { { PMDA_PMID(0,117), PM_TYPE_U64, LDISK_INDOM, PM_SEM_DISCRETE,
 	PMDA_PMUNITS(1,0,0,PM_SPACE_KBYTE,0,0)
       }, Q_LDISK, M_NONE, ""
     },