sigar 0.7.2 → 0.7.3

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 
 #so we can: ssh host rake -f $hudson_workspace/sigar/Rakefile
@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.name = GEM
 #  s.version = props['version.major'] + '.' + props['version.minor'] + '.' + props['version.maint']
 #  '0.7.x' until the sigar-1.7.0 release
-  s.version = '0' + '.' + props['version.minor'] + '.' + '2'
+  s.version = '0' + '.' + props['version.minor'] + '.' + '3'
   s.summary = props['project.summary']
   s.description = s.summary
   s.author = props['project.author']
@@ -34,13 +34,13 @@ spec = Gem::Specification.new do |s|
   s.files =
     %w(LICENSE NOTICE README Rakefile version.properties) +
     %w(bindings/SigarWrapper.pm bindings/SigarBuild.pm) +
-    `git ls-files -- bindings/ruby/*`.split("\n") +
+    `git ls-files -- bindings/ruby/*.*`.split("\n") +
     Dir.glob("include/*.h") +
     Dir.glob("src/**/*.[ch]") +
     Dir.glob("src/**/*.in")
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

data/bindings/SigarWrapper.pm

@@ -43,6 +43,7 @@ my %has_name_arg = map { $_, 1 } qw(FileSystemUsage DiskUsage
                                     FileAttrs DirStat DirUsage
                                     NetInterfaceConfig NetInterfaceStat);
 
+
 my %proc_no_arg = map { $_, 1 } qw(stat);
 
 my %get_not_impl = map { $_, 1 } qw(net_address net_route net_connection net_stat cpu_perc
@@ -527,6 +528,7 @@ use vars qw(%classes %cmds);
          plat => '*'
       },
     ],
+
     ProcMem => [
       {
          name => 'size', type => 'Long',
@@ -627,6 +629,51 @@ use vars qw(%classes %cmds);
          plat => '*'
       },
     ],
+    ProcDiskIO => [
+      {
+         name => 'bytes_read', type => 'Long',
+         desc => 'Bytes Read',
+         plat => 'LW'
+      },
+      {
+         name => 'bytes_written', type => 'Long',
+         desc => 'Bytes Written',
+         plat => 'LW'
+      },
+      {
+         name => 'bytes_total', type => 'Long',
+         desc => 'Bytes Total',
+         plat => 'LWAHS'
+      }
+    ],
+
+    ProcCumulativeDiskIO => [
+      {
+         name => 'bytes_read', type => 'Long',
+         desc => 'Bytes Read from Start',
+         plat => 'LW'
+      },
+      {
+         name => 'bytes_written', type => 'Long',
+         desc => 'Bytes Written from Start',
+         plat => 'LW'
+      },
+      {
+         name => 'bytes_total', type => 'Long',
+         desc => 'Bytes Total from Start',
+         plat => 'LWAHS'
+      }
+    ],
+
+    DumpPidCache => [
+      {
+         name => 'dummy', type => 'Long',
+         desc => 'Dummy',
+         plat => 'LWAHS'
+      }
+    ],
+
+
     ProcState => [
       {
          name => 'state', type => 'Char',

data/include/sigar.h

@@ -292,6 +292,47 @@ typedef struct {
 SIGAR_DECLARE(int) sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
                                       sigar_proc_mem_t *procmem);
 
+typedef struct {
+     sigar_uint64_t 
+        bytes_read,
+        bytes_written,
+        bytes_total;
+} sigar_proc_disk_io_t;
+
+SIGAR_DECLARE(int) sigar_proc_disk_io_get(sigar_t *sigar, sigar_pid_t pid,
+                                          sigar_proc_disk_io_t *proc_disk_io);
+
+typedef struct {
+    sigar_uint64_t
+        bytes_read,
+        bytes_written,
+        bytes_total;
+    sigar_uint64_t last_time;
+    sigar_uint64_t
+        bytes_read_diff,
+        bytes_written_diff,
+        bytes_total_diff;
+} sigar_cached_proc_disk_io_t;
+
+
+typedef struct {
+    sigar_uint64_t
+        bytes_read,
+        bytes_written,
+        bytes_total;
+} sigar_proc_cumulative_disk_io_t;
+
+SIGAR_DECLARE(int) sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid,
+                                          sigar_proc_cumulative_disk_io_t *proc_cumulative_disk_io);
+
+
+typedef struct  { 
+    sigar_uint64_t dummy;
+}sigar_dump_pid_cache_t;
+
+SIGAR_DECLARE(int) sigar_dump_pid_cache_get(sigar_t *sigar, sigar_dump_pid_cache_t *info);
+
+
 typedef struct {
     sigar_uid_t uid;
     sigar_gid_t gid;

data/include/sigar_private.h

@@ -68,7 +68,8 @@
    sigar_cache_t *proc_cpu; \
    sigar_cache_t *net_listen; \
    sigar_cache_t *net_services_tcp; \
-   sigar_cache_t *net_services_udp
+   sigar_cache_t *net_services_udp;\
+   sigar_cache_t *proc_io
 
 #if defined(WIN32)
 #   define SIGAR_INLINE __inline
@@ -398,11 +399,15 @@ int sigar_get_iftype(const char *name, int *type, int *inst);
 #define SIGAR_NIC_SIT      "IPv6-in-IPv4"
 #define SIGAR_NIC_IRDA     "IrLAP"
 #define SIGAR_NIC_EC       "Econet"
-
+#define PID_CACHE_CLEANUP_PERIOD 1000*60*10 /* 10 minutes */
+#define PID_CACHE_ENTRY_EXPIRE_PERIOD 1000*60*20 /* 20 minutes */
 #ifndef WIN32
 #include <netdb.h>
 #endif
 
+#define PROC_PID_CPU_CACHE 1
+#define PROC_PID_IO_CACHE 2
+
 #define SIGAR_HOSTENT_LEN 1024
 #if defined(_AIX)
 #define SIGAR_HAS_HOSTENT_DATA

data/include/sigar_util.h

@@ -170,15 +170,21 @@ struct sigar_cache_entry_t {
     sigar_cache_entry_t *next;
     sigar_uint64_t id;
     void *value;
+    sigar_uint64_t last_access_time;
 };
 
 typedef struct {
     sigar_cache_entry_t **entries;
     unsigned int count, size;
     void (*free_value)(void *ptr);
+    sigar_uint64_t entry_expire_period;
+    sigar_uint64_t cleanup_period_millis;
+    sigar_uint64_t last_cleanup_time;
 } sigar_cache_t;
 
 sigar_cache_t *sigar_cache_new(int size);
+sigar_cache_t *sigar_expired_cache_new(int size, sigar_uint64_t cleanup_period_millis, sigar_uint64_t entry_expire_period);
+void sigar_cache_dump(sigar_cache_t *table);
 
 sigar_cache_entry_t *sigar_cache_get(sigar_cache_t *table,
                                      sigar_uint64_t key);

data/src/os/aix/aix_sigar.c

@@ -754,6 +754,23 @@ int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
     return SIGAR_OK;
 }
 
+int sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid,
+                           sigar_proc_cumulative_disk_io_t *cumulative_proc_disk_io)
+{
+    int status = sigar_getprocs(sigar, pid);
+    struct procsinfo64 *pinfo = sigar->pinfo;
+
+    if (status != SIGAR_OK) {
+        return status;
+    }
+    cumulative_proc_disk_io->bytes_read = SIGAR_FIELD_NOTIMPL;
+    cumulative_proc_disk_io->bytes_written =  SIGAR_FIELD_NOTIMPL;
+    cumulative_proc_disk_io->bytes_total = pinfo->pi_ioch;
+
+    return SIGAR_OK;
+}
+
+
 int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,
                         sigar_proc_cred_t *proccred)
 {

data/src/os/darwin/darwin_sigar.c

@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-#include "sigar.h"
-#include "sigar_private.h"
-#include "sigar_util.h"
-#include "sigar_os.h"
-
 #include <sys/param.h>
 #include <sys/mount.h>
 #if !(defined(__FreeBSD__) && (__FreeBSD_version >= 800000))
@@ -66,14 +61,6 @@
 #include <stdio.h>
 #endif
 
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-#define SIGAR_FREEBSD5_NFSSTAT
-#include <nfsclient/nfs.h>
-#include <nfsserver/nfs.h>
-#else
-#include <nfs/nfs.h>
-#endif
-
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
@@ -88,6 +75,14 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#define SIGAR_FREEBSD5_NFSSTAT
+#include <nfsclient/nfs.h>
+#include <nfsserver/nfs.h>
+#else
+#include <nfs/nfs.h>
+#endif
+
 #include <dirent.h>
 #include <errno.h>
 
@@ -112,6 +107,11 @@
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_fsm.h>
 
+#include "sigar.h"
+#include "sigar_private.h"
+#include "sigar_util.h"
+#include "sigar_os.h"
+
 #define NMIB(mib) (sizeof(mib)/sizeof(mib[0]))
 
 #ifdef __FreeBSD__
@@ -1241,6 +1241,13 @@ int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
     return SIGAR_OK;
 }
 
+int sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid,
+                           sigar_proc_cumulative_disk_io_t *proc_cumulative_disk_io)
+{
+    return SIGAR_ENOTIMPL;
+}
+
+
 int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,
                         sigar_proc_cred_t *proccred)
 {

data/src/os/hpux/hpux_sigar.c

@@ -307,6 +307,25 @@ int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
     return SIGAR_OK;
 }
 
+int sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid, 
+                           sigar_proc_cumulative_disk_io_t *proc_cumulative_disk_io)
+{
+
+    int status = sigar_pstat_getproc(sigar, pid);
+    struct pst_status *pinfo = sigar->pinfo;
+
+    if (status != SIGAR_OK) {
+        return status;
+    }
+    proc_cumulative_disk_io->bytes_read = SIGAR_FIELD_NOTIMPL; 
+    proc_cumulative_disk_io->bytes_written = SIGAR_FIELD_NOTIMPL; 
+    proc_cumulative_disk_io->bytes_total =  pinfo->pst_ioch;
+
+
+   return SIGAR_OK;
+}
+
+
 int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,
                         sigar_proc_cred_t *proccred)
 {

data/src/os/linux/linux_sigar.c

@@ -768,6 +768,34 @@ int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
     return SIGAR_OK;
 }
 
+SIGAR_INLINE sigar_uint64_t get_named_proc_token(char *buffer,
+                                                 char *token) {
+  char *ptr = strstr(buffer, token);
+  if (!ptr) {
+    return SIGAR_FIELD_NOTIMPL;
+  }
+  ptr = sigar_skip_token(ptr);
+  return sigar_strtoul(ptr);
+}
+
+int sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid,
+                           sigar_proc_cumulative_disk_io_t *proc_cumulative_disk_io)
+{
+    char buffer[BUFSIZ];
+    
+    int status = SIGAR_PROC_FILE2STR(buffer, pid, "/io");
+    
+    if (status != SIGAR_OK) {
+        return status;
+    }
+
+    proc_cumulative_disk_io->bytes_read = get_named_proc_token(buffer, "\nread_bytes");
+    proc_cumulative_disk_io->bytes_written = get_named_proc_token(buffer, "\nwrite_bytes");
+    proc_cumulative_disk_io->bytes_total = proc_cumulative_disk_io->bytes_read + proc_cumulative_disk_io->bytes_written;
+
+    return SIGAR_OK;
+}
+
 #define NO_ID_MSG "[proc_cred] /proc/%lu" PROC_PSTATUS " missing "
 
 int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,

data/src/os/solaris/solaris_sigar.c

@@ -407,7 +407,7 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
         cpu->idle  += xcpu->idle;
         cpu->nice  += xcpu->nice;
         cpu->wait  += xcpu->wait;
-        cpu->total = xcpu->total;
+        cpu->total += xcpu->total;
     }
 
     return SIGAR_OK;
@@ -719,6 +719,21 @@ int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
     return SIGAR_OK;
 }
 
+int sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid, 
+                           sigar_proc_cumulative_disk_io_t *proc_cumulative_disk_io)
+{
+   prusage_t usage;
+   int status;
+   if ((status = sigar_proc_usage_get(sigar, &usage, pid)) != SIGAR_OK) {
+        return status;
+   }
+   proc_cumulative_disk_io->bytes_read = SIGAR_FIELD_NOTIMPL;
+   proc_cumulative_disk_io->bytes_written = SIGAR_FIELD_NOTIMPL;
+   proc_cumulative_disk_io->bytes_total =  usage.pr_ioch;
+
+    return SIGAR_OK;
+}
+
 int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,
                         sigar_proc_cred_t *proccred)
 {

data/src/os/win32/sigar_os.h

@@ -345,6 +345,8 @@ typedef struct {
     sigar_uint64_t handles;
     sigar_uint64_t threads;
     sigar_uint64_t page_faults;
+	sigar_uint64_t bytes_read;
+	sigar_uint64_t bytes_written;
 } sigar_win32_pinfo_t;
 
 typedef struct {

data/src/os/win32/win32_sigar.c

@@ -62,6 +62,8 @@ typedef enum {
 #define PERF_TITLE_PPID       1410
 #define PERF_TITLE_PRIORITY   682
 #define PERF_TITLE_START_TIME 684
+#define PERF_TITLE_IO_READ_BYTES_SEC	1420
+#define PERF_TITLE_IO_WRITE_BYTES_SEC	1422
 
 typedef enum {
     PERF_IX_CPUTIME,
@@ -74,6 +76,8 @@ typedef enum {
     PERF_IX_PPID,
     PERF_IX_PRIORITY,
     PERF_IX_START_TIME,
+	PERF_IX_IO_READ_BYTES_SEC,
+	PERF_IX_IO_WRITE_BYTES_SEC,
     PERF_IX_MAX
 } perf_proc_offsets_t;
 
@@ -1210,6 +1214,23 @@ SIGAR_DECLARE(int) sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid,
     return SIGAR_OK;
 }
 
+SIGAR_DECLARE(int) sigar_proc_cumulative_disk_io_get(sigar_t *sigar, sigar_pid_t pid,
+                                          sigar_proc_cumulative_disk_io_t *proc_cumulative_disk_io)
+{
+    int status = get_proc_info(sigar, pid);
+    sigar_win32_pinfo_t *pinfo = &sigar->pinfo;
+
+    if (status != SIGAR_OK) {
+        return status;
+    }
+
+    proc_cumulative_disk_io->bytes_read = pinfo->bytes_read;
+    proc_cumulative_disk_io->bytes_written = pinfo->bytes_written;
+    proc_cumulative_disk_io->bytes_total = proc_cumulative_disk_io->bytes_read + proc_cumulative_disk_io->bytes_written;
+
+    return SIGAR_OK;
+}
+
 #define TOKEN_DAC (STANDARD_RIGHTS_READ | READ_CONTROL | TOKEN_QUERY)
 
 SIGAR_DECLARE(int)
@@ -1441,6 +1462,12 @@ static int get_proc_info(sigar_t *sigar, sigar_pid_t pid)
           case PERF_TITLE_START_TIME:
             perf_offsets[PERF_IX_START_TIME] = offset;
             break;
+		  case PERF_TITLE_IO_READ_BYTES_SEC:
+			perf_offsets[PERF_IX_IO_READ_BYTES_SEC] = offset;
+			break;
+		  case PERF_TITLE_IO_WRITE_BYTES_SEC:
+			perf_offsets[PERF_IX_IO_WRITE_BYTES_SEC] = offset;
+			break;
         }
     }
 
@@ -1466,6 +1493,8 @@ static int get_proc_info(sigar_t *sigar, sigar_pid_t pid)
         pinfo->handles  = PERF_VAL(PERF_IX_HANDLE_CNT);
         pinfo->threads  = PERF_VAL(PERF_IX_THREAD_CNT);
         pinfo->page_faults = PERF_VAL(PERF_IX_PAGE_FAULTS);
+		pinfo->bytes_read = PERF_VAL(PERF_IX_IO_READ_BYTES_SEC);
+		pinfo->bytes_written = PERF_VAL(PERF_IX_IO_WRITE_BYTES_SEC);
 
         return SIGAR_OK;
     }
@@ -3693,6 +3722,7 @@ int sigar_who_list_get_win32(sigar_t *sigar,
 #define SIGAR_ARCH "x86"
 #endif
 
+
 int sigar_os_sys_info_get(sigar_t *sigar,
                           sigar_sys_info_t *sysinfo)
 {
@@ -3700,7 +3730,7 @@ int sigar_os_sys_info_get(sigar_t *sigar,
     char *vendor_name, *vendor_version, *code_name=NULL;
 
     version.dwOSVersionInfoSize = sizeof(version);
-    GetVersionEx((OSVERSIONINFO *)&version);
+    GetVersionEx((OSVERSIONINFO *)&version); 
 
     if (version.dwMajorVersion == 4) {
         vendor_name = "Windows NT";
@@ -3740,11 +3770,25 @@ int sigar_os_sys_info_get(sigar_t *sigar,
                 code_name = "Vienna";
             }
         }
-        else {
-            vendor_name = "Windows 2008";
-            vendor_version = "2008";
-            code_name = "Longhorn Server";
-        }
+	else {
+             // not nt work station
+             if (version.dwMinorVersion == 0 || version.dwMinorVersion ==1) {
+            	vendor_name = "Windows 2008";
+            	vendor_version = "2008";
+	        code_name = "Longhorn Server";
+             }
+	     else  if (version.dwMinorVersion == 2) {
+ 	    	vendor_name = "Windows 2012";
+            	vendor_version = "2012";
+            	code_name = "Windows Server 8";
+	     }
+	     else {
+		// defaults
+		 vendor_name = "Windows Unknown";
+		 vendor_version = "2012";
+	     }
+	}
+
     }
 
     SIGAR_SSTRCPY(sysinfo->name, "Win32");