From 471d4bb02b54c46d7c86c0d48bf641b9d3491877 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Fri, 16 Jul 2004 01:20:47 +0000
Subject: [PATCH] call versioned boot_time functions based on uname version
 rather than always trying v4 first

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

diff --git a/src/os/aix/aix_sigar.c b/src/os/aix/aix_sigar.c
index de602616..54788e2c 100644
--- a/src/os/aix/aix_sigar.c
+++ b/src/os/aix/aix_sigar.c
@@ -16,6 +16,7 @@
 #include <sys/mntctl.h>
 #include <sys/stat.h>
 #include <sys/user.h>
+#include <sys/utsname.h>
 #include <sys/vmount.h>
 
 #include <sys/socket.h>
@@ -88,6 +89,7 @@ int sigar_os_open(sigar_t **sigar)
     void *dlhandle;
     int kmem = -1;
     vminfo_func_t vminfo = NULL;
+    struct utsname name;
 
     if ((dlhandle = dlopen("/unix", RTLD_NOW))) {
         vminfo = (vminfo_func_t)dlsym(dlhandle, "vmgetinfo");
@@ -128,6 +130,10 @@ int sigar_os_open(sigar_t **sigar)
 
     (*sigar)->self_path[0] = '\0';
 
+    uname(&name);
+
+    (*sigar)->aix_version = atoi(name.version);
+
     return SIGAR_OK;
 }
 
@@ -448,7 +454,7 @@ static int boot_time_v5(int fd, time_t *time)
     return SIGAR_OK;
 }
 
-static int boot_time(time_t *time)
+static int boot_time(sigar_t *sigar, time_t *time)
 {
     struct utmp_v5 data_v5;
     int utmp, status;
@@ -457,8 +463,10 @@ static int boot_time(time_t *time)
         return errno;
     }
 
-    if ((status = boot_time_v4(utmp, time)) != SIGAR_OK) {
-        lseek(utmp, 0, SEEK_SET);
+    if (sigar->aix_version == 4) {
+        status = boot_time_v4(utmp, time);
+    }
+    else {
         status = boot_time_v5(utmp, time);
     }
 
@@ -474,7 +482,7 @@ int sigar_uptime_get(sigar_t *sigar,
         int status;
         time_t time;
 
-        if ((status = boot_time(&time)) != SIGAR_OK) {
+        if ((status = boot_time(sigar, &time)) != SIGAR_OK) {
             return status;
         }
 
diff --git a/src/os/aix/sigar_os.h b/src/os/aix/sigar_os.h
index d7aff35e..183f8f2c 100644
--- a/src/os/aix/sigar_os.h
+++ b/src/os/aix/sigar_os.h
@@ -43,6 +43,7 @@ struct sigar_t {
     int cpu_mhz;
     char model[128];
     char self_path[SIGAR_PATH_MAX]; /* path to where libsigar.so lives */
+    int aix_version;
 };
 
 #define HAVE_STRERROR_R