pacct 0.8.2-universal-linux → 0.8.3-universal-linux

data/ext/pacct/pacct_c.c

@@ -41,22 +41,11 @@ static VALUE known_groups_by_id = Qnil;
 static int pageSize;
 static long ticksPerSecond;
 
-//Converts a comp_t to a long
+//Converts a comp_t to a ulong
 static unsigned long comp_t_to_ulong(comp_t c) {
   return (unsigned long)(c & 0x1fff) << (((c >> 13) & 0x7) * 3);
 }
 
-//Prints a number in binary (for debugging)
-static void print_bin(unsigned long val) {
-  //Cast prevents warning
-  unsigned long bits = (unsigned long)1 << (sizeof(unsigned long) * 8 - 1);
-  putchar('0' + ((val & bits) > 0));
-  while(bits >>= 1) {
-    putchar('0' + ((val & bits) > 0));
-  }
-  putchar('\n');
-}
-
 //Converts a long to a comp_t
 //To consider: make sure the value is positive?
 //To consider: more unit testing?
@@ -74,16 +63,15 @@ static comp_t ulong_to_comp_t(unsigned long l) {
   } else {
     size_t div_bits, rem_bits;
     bits -= 13;
-    div_bits = bits / 3;
-    if(div_bits >= 8) {
-      rb_raise(rb_eRangeError, "Exponent overflow in ulong_to_comp_t: Value %lu is too large.", l);
-    }
-    rem_bits = bits - div_bits * 3;
+    rem_bits = bits % 3;
     if(rem_bits) {
-      div_bits += 1;
+	  bits += (3 - rem_bits);
+    }
+	if(bits >= 24) {
+      rb_raise(rb_eRangeError, "Exponent overflow in ulong_to_comp_t: Value %lu is too large.", l);
     }
     //To consider: remove '&'?
-    return ((l >> bits) & 0x1fff) | ((div_bits & 0x7) << 13);
+    return ((l >> bits) & 0x1fff) | ((bits / 3) << 13);
   }
 }
 
@@ -855,5 +843,7 @@ void Init_pacct_c() {
     rb_define_module_function(mTest, "write_failure", test_write_failure, 0);
     rb_define_module_function(mTest, "read_failure", test_read_failure, 0);
     rb_define_module_function(mTest, "comp_t_to_ulong", test_comp_t_to_ulong, 1);
+	//To do: create unit test.
+	rb_define_module_function(mTest, "ulong_to_comp_t", test_ulong_to_comp_t, 1);
   }
 }

data/lib/pacct/version.rb

@@ -1,4 +1,4 @@
 module Pacct
   #The library version
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/entry_spec.rb

@@ -8,13 +8,23 @@ describe Pacct::Entry do
     comp_t_to_ulong.call((3 << 13) | 20).should eql(20 << 9)
   end
 
-#To do: unit test this (eventually).
-=begin
   it "correctly converts integers to \"comp_t\"s" do
-    
+	ulong_to_comp_t = Pacct::Test.method(:ulong_to_comp_t)
+    comp_t_to_ulong = Pacct::Test.method(:comp_t_to_ulong)
+    ulong_to_comp_t.call(1).should eql 1
+    ulong_to_comp_t.call(1 << 3).should eql(8)
+    ulong_to_comp_t.call(20 << 9).should eql((1 << 13) | (20 << 6))
+	ulong_to_comp_t.call((1 << 13) - 1).should eql((1 << 13) - 1)
+	#Upper limit of comp_t
+	ulong_to_comp_t.call(((1 << 13) - 1) << 21).should eql((1 << 16) - 1)
+	#Check for proper truncation.
+	ulong_to_comp_t.call((((1 << 13) - 1) << 21) + 1).should eql((1 << 16) - 1)
+	#Overflow
+	expect {
+		ulong_to_comp_t.call(1 << (13 + 21))
+	}.to raise_error("Exponent overflow in ulong_to_comp_t: Value 17179869184 is too large.")
   end
-=end
-  
+
   it "raises an error when a comp_t overflows" do
     e = Pacct::Entry.new
     expect {
@@ -31,7 +41,7 @@ describe Pacct::Entry do
   it "raises an error when encountering unknown user/group IDs" do
     log = Pacct::Log.new('snapshot/pacct_invalid_ids')
     log.each_entry do |entry|
-      #This assumes that these users and groups don't actually exist.
+      #This assumes that these users and groups don't actually exist on the testing system.
       #If, for some odd reason, they _do_ exist, this test will fail.
       expect { entry.user_name }.to raise_error(
         Errno::ENODATA.new('Unable to obtain user name for ID 4294967295').to_s)
@@ -43,4 +53,4 @@ describe Pacct::Entry do
         Errno::ENODATA.new("Unable to obtain group ID for name '_____ _'").to_s)
     end
   end
-end
+end

metadata

@@ -1,46 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pacct
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.8.3
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 2
-  version: 0.8.2
 platform: universal-linux
-authors: 
+authors:
 - Ben Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A C extension library for parsing accounting files in acct(5) format
-email: 
+email:
 - blm768@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/pacct/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -62,38 +56,29 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/blm768/pacct
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A C extension library for parsing accounting files in acct(5) format
-test_files: 
+test_files:
 - spec/entry_spec.rb
 - spec/log_spec.rb
 - spec/pacct_spec.rb