Merge head

1 files changed, 12 insertions, 5 deletions

diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index 0f313fb..ade8738 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -150,7 +150,9 @@ static const char *namelist[] = {
 	"_devstat_version",
 #define X_DEVICE_STATQ	3
 	"_device_statq",
-#define X_END		4
+#define X_TIME_UPTIME	4
+	"_time_uptime",
+#define X_END		5
 };
 
 /*
@@ -199,7 +201,7 @@ devstat_getnumdevs(kvm_t *kd)
  * supplied in a more atmoic manner by the kern.devstat.all sysctl.
  * Because this generation sysctl is separate from the statistics sysctl,
  * the device list and the generation could change between the time that
- * this function is called and the device list is retreived.
+ * this function is called and the device list is retrieved.
  */
 long
 devstat_getgeneration(kvm_t *kd)
@@ -349,10 +351,10 @@ devstat_getdevs(kvm_t *kd, struct statinfo *stats)
 	oldnumdevs = dinfo->numdevs;
 	oldgeneration = dinfo->generation;
 
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	stats->snap_time = ts.tv_sec + ts.tv_nsec * 1e-9;
-
 	if (kd == NULL) {
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		stats->snap_time = ts.tv_sec + ts.tv_nsec * 1e-9;
+
 		/* If this is our first time through, mem_ptr will be null. */
 		if (dinfo->mem_ptr == NULL) {
 			/*
@@ -433,6 +435,11 @@ devstat_getdevs(kvm_t *kd, struct statinfo *stats)
 		} 
 
 	} else {
+		if (KREADNL(kd, X_TIME_UPTIME, ts.tv_sec) == -1)
+			return(-1);
+		else
+			stats->snap_time = ts.tv_sec;
+
 		/* 
 		 * This is of course non-atomic, but since we are working
 		 * on a core dump, the generation is unlikely to change