From 37d68c81800f8ba1ae34d78fe903c6a3f834a475 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Wed, 23 Feb 2005 17:29:10 +0000
Subject: [PATCH] keep /dev/mem fd open

---
 src/os/aix/aix_sigar.c | 19 ++++++++++++-------
 src/os/aix/sigar_os.h  |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/os/aix/aix_sigar.c b/src/os/aix/aix_sigar.c
index 666939e6..330d6402 100644
--- a/src/os/aix/aix_sigar.c
+++ b/src/os/aix/aix_sigar.c
@@ -120,6 +120,7 @@ int sigar_os_open(sigar_t **sigar)
     (*sigar)->getvminfo = vminfo;
     (*sigar)->getprocfd = NULL; /*XXX*/
     (*sigar)->kmem = kmem;
+    (*sigar)->dmem = -1;
     (*sigar)->pagesize = 0;
     (*sigar)->boot_time = 0;
     (*sigar)->last_pid = -1;
@@ -166,6 +167,9 @@ int sigar_os_close(sigar_t *sigar)
     if (sigar->kmem > 0) {
         close(sigar->kmem);
     }
+    if (sigar->dmem > 0) {
+        close(sigar->dmem);
+    }
     if (sigar->pinfo) {
         free(sigar->pinfo);
     }
@@ -1515,22 +1519,26 @@ static int get_disk_metrics(sigar_t *sigar,
                             sigar_file_system_usage_t *fsusage,
                             aix_diskio_t *diskio)
 {
-    int fd, i;
-    int cnt;
+    int i, cnt, fd;
     struct iostat iostat;
     struct dkstat dkstat, *dp;
     struct nlist nl[] = {
         { "iostat" },
     };
 
-    if ((fd = open("/dev/mem", O_RDONLY)) <= 0) {
-        return errno;
+    if (sigar->dmem == -1) {
+        if ((sigar->dmem = open("/dev/mem", O_RDONLY)) <= 0) {
+            return errno;
+        }
     }
 
+    fd = sigar->dmem;
+
     if (diskio->addr != -1) {
         int status;
         lseek(fd, diskio->addr, SEEK_SET);
         read(fd, &dkstat, sizeof(dkstat));
+
         if (strEQ(diskio->name, dkstat.diskname)) {
             fsusage->disk_reads = dkstat.dk_rblks;
             fsusage->disk_writes = dkstat.dk_wblks;
@@ -1539,14 +1547,12 @@ static int get_disk_metrics(sigar_t *sigar,
         else {
             status = ENOENT;
         }
-        close(fd);
         return status;
     }
 
     i = knlist(nl, 1, sizeof(struct nlist));
 
     if (i == -1) {
-        close(fd);
         return errno;
     }
 
@@ -1572,7 +1578,6 @@ static int get_disk_metrics(sigar_t *sigar,
         }
     }
 
-    close(fd);
     return SIGAR_OK;
 }
 
diff --git a/src/os/aix/sigar_os.h b/src/os/aix/sigar_os.h
index cb2316fd..18afea49 100644
--- a/src/os/aix/sigar_os.h
+++ b/src/os/aix/sigar_os.h
@@ -44,6 +44,7 @@ typedef int (*thread_rusage_func_t)(struct rusage *, int);
 struct sigar_t {
     SIGAR_T_BASE;
     int kmem;
+    int dmem;
     /* offsets for seeking on kmem */
     long koffsets[KOFFSET_MAX];
     vminfo_func_t getvminfo;