sys-cpu 0.6.0 → 0.6.1

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.6.1 - 4-Jan-2009
+* Fix for OS X 10.5.x. Thanks go to Victor Costan for the spot and the patch.
+* Updated the gemspec and some other minor changes.
+* On MS Windows the impersonation level is now explicitly set to 'impersonate'
+  to avoid issues where systems might be using an older version of WMI.
+
 == 0.6.0 - 26-Apr-2007
 * Added support for most BSD flavors, including OS X. The freebsd.c file is
   now just bsd.c.

data/ext/bsd/bsd.c

@@ -6,12 +6,15 @@
  * Interface to provide various types of cpu information.
  * Based on the Unix::Processors Perl module (Wilson Snyder) with ideas from
  * Sys::CPU (Matt Sanford) and Solaris::Kstat (Alan Burlison) as well.
+ * OS X 10.5+ patch for uptime by Victor Costan.
  * 
  * Portions of this code lifted from the MPlayer source (cpuinfo.c).
  *****************************************************************************/
 #include <ruby.h>
 #include "version.h"
+#ifdef HAVE_KVM_H
 #include <kvm.h>
+#endif
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <string.h>
@@ -44,20 +47,43 @@ static int64_t rdtsc(void){
  * average.
  */
 static VALUE cpu_load_avg(VALUE klass){
-   kvm_t* k;
    double avgs[3];
    int n, max = 3;
    VALUE v_num_array = rb_ary_new();
+
+#ifdef HAVE_KVM_H
+   kvm_t* k;
    
    k = malloc(sizeof(kvm_t*));
    
-   if(!kvm_getloadavg(k, avgs, max))
+   if(!kvm_getloadavg(k, avgs, max)){
+      free(k);
       rb_raise(cCPUError, "error calling kvm_getloadavg(): %s", strerror(errno));
+   }
    
    for(n = 0; n < 3; n++)
       rb_ary_push(v_num_array, rb_float_new(avgs[n]));
 
    free(k);
+#else
+	struct loadavg k;
+	size_t len = sizeof(k);
+	
+#ifdef HAVE_SYSCTLBYNAME
+   if(sysctlbyname("vm.loadavg", &k, &len, NULL, 0))
+      rb_raise(cCPUError, "error calling sysctlbyname(): %s", strerror(errno));
+#else
+   int mib[2];
+   mib[0] = CTL_HW;
+   mib[1] = VM_LOADAVG;
+   
+   if(sysctl(mib, 2, &k, &len, NULL, 0))
+      rb_raise(cCPUError, "error calling sysctl(): %s", strerror(errno));
+#endif
+	
+   for(n = 0; n < 3; n++)
+      rb_ary_push(v_num_array, rb_float_new(k.ldavg[n] / (float)k.fscale));	
+#endif
 
    return v_num_array;
 }
@@ -135,7 +161,7 @@ static VALUE cpu_architecture(VALUE klass){
 #endif
 #else
    int mib[2];
-   mib[0] = CTL_HW;
+   mib[0] = CTL_VM;
    mib[1] = HW_MACHINE_ARCH;
 
    if(sysctl(mib, 2, &arch, &len, NULL, 0))
@@ -239,7 +265,7 @@ void Init_cpu()
     */
    cCPUError = rb_define_class_under(cCPU, "Error", rb_eStandardError);
 
-   /* 0.6.0: The version of this package, returned as a String */
+   /* 0.6.1: The version of this package, returned as a String */
    rb_define_const(cCPU, "VERSION", rb_str_new2(SYS_CPU_VERSION));
 
    /* Class Methods */

data/ext/extconf.rb

@@ -15,6 +15,7 @@ case RUBY_PLATFORM
       FileUtils.cp("bsd/bsd.c", "cpu.c")
       have_func("sysctlbyname")
       have_library("kvm")
+      have_header("kvm.h")
    when /linux|dos|windows|win32|mingw|cygwin/i
       STDERR.puts "Run 'ruby install.rb' instead for this platform"
    else

data/ext/version.h

@@ -1,2 +1,2 @@
 /* version.h - one version to rule them all */
-#define SYS_CPU_VERSION "0.6.0"
+#define SYS_CPU_VERSION "0.6.1"

data/test/tc_version.rb

@@ -1,16 +1,15 @@
-###########################################################
+#######################################################################
 # tc_version.rb
 #
-# The sole purpose of this test case is to verify the
-# version.  This reduces the pain of having separate tests
-# for the VERSION constant in every single test case.
-###########################################################
-require "sys/cpu"
-require "test/unit"
-include Sys
+# The sole purpose of this test case is to verify the version number.
+# This reduces the pain of having separate tests for the VERSION
+# constant in every single test case.
+#######################################################################
+require 'sys/cpu'
+require 'test/unit'
 
 class TC_Sys_CPU_VERSION < Test::Unit::TestCase
    def test_version
-      assert_equal('0.6.0', CPU::VERSION)
+      assert_equal('0.6.1', Sys::CPU::VERSION)
    end
 end

metadata

@@ -1,33 +1,29 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: sys-cpu
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-04-26 00:00:00 -06:00
-summary: A Ruby interface for providing CPU information
-require_paths: 
-- lib
-email: djberg96 at nospam at gmail dot com
-homepage: http://www.rubyforge.org/projects/sysutils
-rubyforge_project: sysutils
-description: A Ruby interface for providing CPU information
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 0.6.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-01-04 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: A Ruby interface for providing CPU information
+email: djberg96 at nospam at gmail dot com
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- CHANGES
+- README
+- MANIFEST
+- ext/bsd/bsd.c
 files: 
 - doc/bsd.txt
 - doc/hpux.txt
@@ -44,28 +40,34 @@ files:
 - CHANGES
 - README
 - MANIFEST
-- ext/sunos/sunos.c
-- ext/extconf.rb
-- ext/bsd
 - ext/bsd/bsd.c
-- ext/hpux
-- ext/hpux/hpux.c
-- ext/sunos
+- ext/extconf.rb
 - ext/version.h
-test_files: 
-- test/tc_cpu.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/sysutils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- CHANGES
-- README
-- MANIFEST
-- ext/sunos/sunos.c
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: sysutils
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A Ruby interface for providing CPU information
+test_files: 
+- test/tc_cpu.rb

data/ext/hpux/hpux.c

@@ -1,219 +0,0 @@
-/*****************************************************************************
- * hpux.c (cpu.c) - sys-cpu extension for HP-UX
- *
- * Author: Daniel J. Berger
- *
- * Interface to provide various types of cpu information.
- * Based on the Unix::Processors Perl module (Wilson Snyder) with ideas from
- * Sys::CPU (Matt Sanford) and Solaris::Kstat (Alan Burlison) as well.
- *****************************************************************************/
-#include <ruby.h>
-#include "version.h"
-#include <unistd.h>
-#include <sys/pstat.h>
-
-#ifndef PST_MAX_PROCS
-#define PST_MAX_PROCS 32
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-VALUE cCPUError;
-
-/*
- * call-seq:
- *    CPU.load_avg
- *    CPU.load_avg(cpu_num)
- *    CPU.load_avg{ block }
- *
- * In non-block form returns an array of three floats indicating the 1, 5
- * and 15 minute overall load average.
- *
- * In block form, it returns an array of three floats indicating the 1, 5
- * and 15 minute load average for each cpu.  Only useful on multi-cpu
- * systems.
- *
- * If 'cpu_num' is provided, returns the load average (as a 3-element
- * array) for that cpu only.
- *
- * You cannot provide +cpu_num+ and use block form at the same time.
- */
-static VALUE cpu_load_avg(int argc, VALUE *argv)
-{
-   struct pst_processor psp[PST_MAX_PROCS];
-   struct pst_dynamic psd;
-   int i, num_cpu;
-   VALUE ncpu = Qnil;
-   VALUE la_ary = rb_ary_new();
-
-   rb_scan_args(argc,argv,"01",&ncpu);
-
-   if( (ncpu != Qnil) && (rb_block_given_p()) )
-   {
-      rb_raise(rb_eArgError,"Can't use block form when CPU number is provided");
-   }
-
-   if( (ncpu != Qnil) || ((ncpu == Qnil) && (rb_block_given_p())) )
-   {
-      num_cpu = pstat_getprocessor(psp,sizeof(struct pst_processor),PST_MAX_PROCS,0);
-      if(num_cpu < 0)
-      {
-         rb_raise(cCPUError,"Call to pstat_getprocessor() failed.");
-      }
-      else
-      {
-         for(i = 0; i < num_cpu; i++)
-         {
-            if( (ncpu != Qnil) && (NUM2INT(ncpu)) != i){ continue; }
-
-            rb_ary_push(la_ary,rb_float_new(psp[i].psp_avg_1_min));
-            rb_ary_push(la_ary,rb_float_new(psp[i].psp_avg_5_min));
-            rb_ary_push(la_ary,rb_float_new(psp[i].psp_avg_15_min));
-            if(rb_block_given_p())
-            {
-               rb_yield(la_ary);
-            }
-            else
-            {
-               return la_ary;
-            }
-            rb_ary_clear(la_ary);
-         }
-      }
-   }
-   else
-   {
-      if(pstat_getdynamic(&psd,sizeof(psd), (size_t)1, 0) == -1)
-      {
-         rb_raise(cCPUError,"Call to pstat_getdynamic() failed.");
-      }
-      else
-      {
-         rb_ary_push(la_ary,rb_float_new(psd.psd_avg_1_min));
-         rb_ary_push(la_ary,rb_float_new(psd.psd_avg_5_min));
-         rb_ary_push(la_ary,rb_float_new(psd.psd_avg_15_min));
-         return la_ary;
-      }
-   }
-
-   return Qnil;
-}
-
-/*
- * call-seq:
- *    CPU.num_cpu
- *
- * Returns the number of CPU's on the system.
- */
-static VALUE cpu_num()
-{
-   struct pst_dynamic dyn;
-   pstat_getdynamic(&dyn, sizeof(dyn), 0, 0);
-   return INT2NUM(dyn.psd_max_proc_cnt);
-}
-
-/* call-seq:
- *    CPU.num_active_cpu
- *
- * Returns the number of active CPU's on the system.
- */
-static VALUE cpu_num_active()
-{
-   struct pst_dynamic dyn;
-   pstat_getdynamic(&dyn, sizeof(dyn), 0, 0);
-   return INT2NUM(dyn.psd_proc_cnt);
-}
-
-/*
- * call-seq:
- *    CPU.architecture
- *
- * Returns the cpu architecture, e.g. PA RISC 1.2, etc, or nil if it
- * cannot be determined.
- */
-static VALUE cpu_architecture()
-{
-   long cpu_ver = sysconf(_SC_CPU_VERSION);
-
-   if(cpu_ver == CPU_HP_MC68020){ return rb_str_new2("Motorola MC68020"); }
-   if(cpu_ver == CPU_HP_MC68030){ return rb_str_new2("Motorola MC68030"); }
-   if(cpu_ver == CPU_HP_MC68040){ return rb_str_new2("Motorola MC68040"); }
-   if(cpu_ver == CPU_PA_RISC1_0){ return rb_str_new2("HP PA-RISC 1.0"); }
-   if(cpu_ver == CPU_PA_RISC1_1){ return rb_str_new2("HP PA-RISC 1.1"); }
-   if(cpu_ver == CPU_PA_RISC1_2){ return rb_str_new2("HP PA-RISC 1.2"); }
-   if(cpu_ver == CPU_PA_RISC2_0){ return rb_str_new2("HP PA-RISC 2.0"); }
-
-   return Qnil;
-}
-
-/*
- * call-seq:
- *    CPU.freq(cpu_num=0)
- *
- * Returns an integer indicating the speed (i.e. frequency in Mhz) of
- * +cpu_num+, or CPU 0 if no +cpu_num+ is specified.
- */
-static VALUE cpu_freq(int argc, VALUE *argv)
-{
-   int cpu_num = 0; /* default value */
-   struct pst_processor psp;
-   unsigned long int clock_speed, scclktick;
-   VALUE ncpu = Qnil;
-
-   rb_scan_args(argc, argv, "01", &ncpu);
-
-   if(ncpu != Qnil)
-   {
-      Check_Type(ncpu,T_FIXNUM);
-      cpu_num = NUM2INT(ncpu);
-   }
-
-   if((pstat_getprocessor(&psp,sizeof(psp),(size_t)1,cpu_num)) == -1)
-      rb_raise(cCPUError, "Invalid CPU number?");
-
-   scclktick=sysconf(_SC_CLK_TCK);
-   clock_speed = (psp.psp_iticksperclktick * scclktick) / 1000000;
-
-   /************************************************************************/
-   /* It appears that pstat_getprocessor does not return a failure code    */
-   /* for an invalid processor number.  So, we'll assume that if the clock */
-   /* speed is 0 that an invalid number was provided.                      */
-   /************************************************************************/
-   if(clock_speed <= 0)
-      rb_raise(cCPUError, "Invalid CPU number?");
-
-   return UINT2NUM(clock_speed);
-}
-
-void Init_cpu()
-{
-   VALUE mSys, cCPU;
-
-   /* The Sys module serves as a toplevel namespace only */
-   mSys = rb_define_module("Sys");
-   
-   /* The CPU class provides class methods for obtaining CPU information */
-   cCPU = rb_define_class_under(mSys, "CPU", rb_cObject);
-   
-   /* The CPU::Error Exception class is raised whenever any of the CPU class
-    * methods fail.
-    */
-   cCPUError = rb_define_class_under(cCPU, "Error", rb_eStandardError);
-   
-   /* 0.6.0: The version of this package, returned as a String */
-   rb_define_const(cCPU, "VERSION", rb_str_new2(SYS_CPU_VERSION));
-
-   /* Class Methods */
-   rb_define_singleton_method(cCPU, "freq", cpu_freq, -1);
-   rb_define_singleton_method(cCPU, "num_cpu", cpu_num, 0);
-   rb_define_singleton_method(cCPU, "num_active_cpu", cpu_num_active, 0);
-   rb_define_singleton_method(cCPU, "load_avg", cpu_load_avg, -1);
-   rb_define_singleton_method(cCPU, "architecture", cpu_architecture, 0);
-}
-
-#ifdef __cplusplus
-}
-#endif

data/ext/sunos/sunos.c

@@ -1,281 +0,0 @@
-/*****************************************************************************
- * sunos.c (cpu.c) - Solaris code sys-cpu
- *
- * Interface to provide various types of cpu information.
- * Based on the Unix::Processors Perl module (Wilson Snyder) with ideas from
- * Sys::CPU (Matt Sanford) and Solaris::Kstat (Alan Burlison) as well.
- *
- * The kstat code for load_avg() was taken largely from a post by Casper Dik
- * on comp.unix.solaris.
- *****************************************************************************/
-#include <ruby.h>
-#include "version.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/processor.h>
-#include <sys/utsname.h>
-#include <sys/param.h>
-#include <kstat.h>
-
-#ifdef HAVE_GETLOADAVG
-#include <sys/loadavg.h>
-#endif
-
-/* Missing in older header files */
-#ifndef P_POWEROFF
-#define P_POWEROFF 5
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-VALUE cCPUError;
-
-/*
- * call-seq:
- *    CPU.freq(cpu_num=0)
- *
- * Returns an integer indicating the speed (i.e. frequency in Mhz) of
- * +cpu_num+, or cpu 0 (zero) if no number is provided. If you provide an
- * invalid cpu number then a CPUError is raised.
- */
-static VALUE cpu_freq(int argc, VALUE *argv)
-{
-   int ncpu = 0; /* Default value */
-   int cpu;
-   int last_cpu = 0;
-   int clock = 0;
-   processor_info_t pi;
-   VALUE cpu_num = Qnil;
-   
-   rb_scan_args(argc, argv, "01", &cpu_num);
-
-   if(cpu_num != Qnil)
-      ncpu = NUM2INT(cpu_num);
-   
-   for(cpu = ncpu; cpu < last_cpu+16; cpu++) {
-      if(processor_info(cpu, &pi) == 0 && pi.pi_state == P_ONLINE){
-         if(clock < pi.pi_clock){
-            clock = pi.pi_clock;
-         }
-         last_cpu = cpu;
-      }
-   }
-
-   if(clock == 0)
-      rb_raise(cCPUError, "Invalid CPU number?");
-
-   return INT2NUM(clock);
-}
-
-/*
- * call-seq:
- *    CPU.state(cpu_num=0)
- *
- * Returns a string indicating the cpu state of +cpu_num+, or cpu 0 if no
- * number is specified.  Raises a CPUError if an invalid +cpu_num+ is provided.
- */
-static VALUE cpu_state(int argc, VALUE *argv)
-{
-   int cpu = 0; /* Default value */
-   char* value = NULL;
-   processor_info_t pi;
-   VALUE cpu_num = Qnil;
-   
-   rb_scan_args(argc, argv, "01", &cpu_num);
-   
-   if(cpu_num != Qnil)
-      cpu = NUM2INT(cpu_num);
-   
-   if(processor_info(cpu, &pi) == 0){
-       switch (pi.pi_state)
-       {
-          case P_ONLINE:
-             value = "online";
-             break;
-          case P_OFFLINE:
-             value = "offline";
-             break;
-          case P_POWEROFF:
-             value = "poweroff";
-             break;
-          default:
-             value = "unknown";
-       }
-   }
-   else{
-      rb_raise(cCPUError, "state() call failed - invalid cpu num?");
-   }
-
-   return rb_str_new2(value);
-}
-
-/*
- * call-seq:
- *    CPU.num_cpu
- * 
- * Returns the number of cpu's on your system.
- */
-static VALUE cpu_num()
-{
-   int num_cpu;
-   num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
-   return INT2NUM(num_cpu);
-}
-
-/*
- * call-seq:
- *    CPU.cpu_type
- *
- * Returns a string indicating the type of processor.  This is the
- * architecture (e.g. sparcv9), not the exact model (e.g. Ultra-IIe).
- * Returns nil if not found.
- *--
- * All cpu must be the same type (right?)
- */
-static VALUE cpu_type()
-{
-   int cpu = 0;
-   char* value = NULL;
-   processor_info_t pi;
-
-   /* Some systems start the cpu num at 0, others start at 1 */
-   if(processor_info(cpu, &pi) == 0)
-      value = pi.pi_processor_type;
-   else if(processor_info(cpu+1, &pi) == 0)
-      value = pi.pi_processor_type;
-   else
-      return Qnil;
-
-   return rb_str_new2(value);
-}
-
-/*
- * call-seq:
- *    CPU.fpu_type
- *
- * Returns a string indicating the type of floating point unit, or nil if
- * not found.
- */
-static VALUE cpu_fpu_type()
-{
-   int cpu = 0;
-   char* value = NULL;
-   processor_info_t pi;
-
-   /* Some systems start the cpu num at 0, others start at 1 */
-   if(processor_info(cpu, &pi) == 0)
-      value = pi.pi_fputypes;
-   else if(processor_info(cpu+1, &pi) == 0)
-      value = pi.pi_fputypes;
-   else
-      return Qnil;
-
-   return rb_str_new2(value);
-}
-
-/*
- * call-seq:
- *    CPU.model
- *
- * Returns a string indicating the cpu model.  For now, this is the
- * architecture type, rather than the exact model.
- */
-static VALUE cpu_model()
-{
-   struct utsname u;
-   uname(&u);
-   return rb_str_new2(u.machine);
-}
-
-/*
- * call-seq:
- *    CPU.load_avg
- *
- * Returns an array of 3 floats, the load averages for the last 1, 5 and 15
- * minutes.
- */
-static VALUE cpu_load_avg()
-{
-   VALUE la_ary = rb_ary_new();
-
-#ifdef HAVE_GETLOADAVG
-   double load_avg[3];
-
-   if(getloadavg(load_avg, sizeof(load_avg)) < 0)
-      rb_raise(cCPUError, "getloadavg() error");
-
-   rb_ary_push(la_ary, rb_float_new(load_avg[0]));
-   rb_ary_push(la_ary, rb_float_new(load_avg[1]));
-   rb_ary_push(la_ary, rb_float_new(load_avg[2]));
-#else
-   kstat_ctl_t* kc;
-   kstat_t* ksp;
-   kstat_named_t* kn1;
-   kstat_named_t* kn5;
-   kstat_named_t* kn15;
-
-   kc = kstat_open();   
-
-   if(kc == 0)
-      rb_raise(cCPUError, "kstat_open() error");
-
-   ksp = kstat_lookup(kc, "unix", 0, "system_misc");
-
-   if(ksp == 0)
-      rb_raise(cCPUError, "kstat_lookup() error");
-
-   if(kstat_read(kc,ksp,0) == -1)
-      rb_raise(cCPUError, "kstat_read() error");
-
-   kn1  = kstat_data_lookup(ksp, "avenrun_1min");
-   kn5  = kstat_data_lookup(ksp, "avenrun_5min");
-   kn15 = kstat_data_lookup(ksp, "avenrun_15min");
-
-   if( (kn1 == 0) || (kn5 == 0) || (kn15 == 0) )
-      rb_raise(cCPUError, "kstat_lookup() error");
-
-   rb_ary_push(la_ary, rb_float_new((double)kn1->value.ui32/FSCALE));
-   rb_ary_push(la_ary, rb_float_new((double)kn5->value.ui32/FSCALE));
-   rb_ary_push(la_ary, rb_float_new((double)kn15->value.ui32/FSCALE));
-
-   kstat_close(kc);
-#endif
-
-   return la_ary;
-}
-
-void Init_cpu()
-{
-   VALUE mSys, cCPU;
-
-   /* The Sys module serves as a toplevel namespace only */
-   mSys = rb_define_module("Sys");
-   
-   /* The CPU class provides class methods for obtaining CPU information */
-   cCPU = rb_define_class_under(mSys, "CPU", rb_cObject);
-   
-   /* The CPU::Error Exception class is raised whenever any of the CPU class
-    * methods fail.
-    */
-   cCPUError = rb_define_class_under(cCPU, "Error", rb_eStandardError);
-   
-   /* 0.6.0: The version of this package, returned as a String */
-   rb_define_const(cCPU, "VERSION", rb_str_new2(SYS_CPU_VERSION));
-
-   /* Class Methods */
-   rb_define_singleton_method(cCPU, "freq", cpu_freq, -1);
-   rb_define_singleton_method(cCPU, "state", cpu_state, -1);
-   rb_define_singleton_method(cCPU, "num_cpu", cpu_num, 0);
-   rb_define_singleton_method(cCPU, "cpu_type", cpu_type, 0);
-   rb_define_singleton_method(cCPU, "fpu_type", cpu_fpu_type, 0);
-   rb_define_singleton_method(cCPU, "model", cpu_model, 0);
-   rb_define_singleton_method(cCPU, "load_avg", cpu_load_avg, 0);
-
-}
-
-#ifdef __cplusplus
-}
-#endif