kostya-sigar 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d832b4da9c243bcd5fd904bf468c5a037aabf7b
-  data.tar.gz: d87517ce49ed465874a947daac4e245ade352b7f
+  metadata.gz: 85767451a1bf1803940ded1fd7165c4065db46f3
+  data.tar.gz: d289fe077a5d4c142d00e4feca14beeb4a29dbe7
 SHA512:
-  metadata.gz: 5550b885b8abe3e435f1d503ed8f356cb05cf101b5f546df2bc78e5849b53bafc168699d6f6bb91cbedde5db0af03e8762cc098efab3433cf42cb2e2ceac1709
-  data.tar.gz: a65167b661f5d042c6b5abc6722c2e8fc65a28f7057cefa9d5ffc37e654d0631bf0a69994ddb34ed1d984c1bffffb5f0586be1925c6f1efb7a05dd2e9a23c121
+  metadata.gz: 0f3f1a018f9182a69bc0c18cdd1334bbb17aa0d0a025e8c34ee0ceb08f1f3d066488492e46896015a9a85d52a673d526d88da2d8825899b86b1efc7d32976642
+  data.tar.gz: c43c6e68e84187ec8c01d6e4470f3bf9f82ddf46a522207463747ec74c7321397bb0a229216d41cc7b100383afeb0725fa14cc903dc1c2e1e84a125518a06183

data/src/os/linux/linux_sigar.c

@@ -124,30 +124,11 @@ sigar_pid_t sigar_pid_get(sigar_t *sigar)
 
 static int sigar_boot_time_get(sigar_t *sigar)
 {
-    FILE *fp;
-    char buffer[BUFSIZ], *ptr;
-    int found = 0;
+    unsigned long seconds_since_1970 = time(NULL);
+    sigar_uptime_t seconds_since_boot;
+    sigar_uptime_get(sigar, &seconds_since_boot);
 
-    if (!(fp = fopen(PROC_STAT, "r"))) {
-        return errno;
-    }
-
-    while ((ptr = fgets(buffer, sizeof(buffer), fp))) {
-        if (strnEQ(ptr, "btime", 5)) {
-            if ((ptr = sigar_skip_token(ptr))) {
-                sigar->boot_time = sigar_strtoul(ptr);
-                found = 1;
-            }
-            break;
-        }
-    }
-
-    fclose(fp);
-
-    if (!found) {
-        /* should never happen */
-        sigar->boot_time = time(NULL);
-    }
+    sigar->boot_time = seconds_since_1970 - (unsigned long)seconds_since_boot;
 
     return SIGAR_OK;
 }
@@ -848,16 +829,7 @@ int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid,
     proctime->user = pstat->utime;
     proctime->sys  = pstat->stime;
     proctime->total = proctime->user + proctime->sys;
-
-    // --- Added by kostya:
-    //   calculate start time by /proc/pid creation time
-    //   previous calculation was bad because when time on server changed,
-    //   sigar not updating it
-    char name[BUFSIZ];
-    (void)SIGAR_PROC_FILENAME(name, pid, "");
-    proctime->start_time = (sigar_uint64_t)file_birthtime(name);
-    proctime->start_time *= 1000;
-    // --- Added by kostya:
+    proctime->start_time = pstat->start_time;
 
     return SIGAR_OK;
 }

data/src/sigar_util.c

@@ -1058,19 +1058,3 @@ sigar_int64_t sigar_time_now_millis(void)
     return ((tv.tv_sec * SIGAR_USEC) + tv.tv_usec) / SIGAR_MSEC;
 }
 #endif
-
-#ifdef __linux__
-
-#include <sys/stat.h>
-#ifdef HAVE_ST_BIRTHTIME
-#define birthtime(x) x.st_birthtime
-#else
-#define birthtime(x) x.st_ctime
-#endif
-
-sigar_int64_t file_birthtime(char* filename) {
-    struct stat st;
-    if (stat(filename, &st) != 0) return 0; else return birthtime(st);
-}
-
-#endif

data/version.properties

@@ -1,7 +1,7 @@
 copyright.year=2004-2011
 version.major=1
 version.minor=8
-version.maint=7
+version.maint=8
 version.build=0
 project.name=kostya-sigar
 project.author=Doug MacEachern

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kostya-sigar
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Doug MacEachern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies: []
 description: System Information Gatherer And Reporter
 email: sigar-users@hyperic.org