posixtimer 0.1 → 0.2

data/ext/posixtimer.c

@@ -52,20 +52,6 @@ static VALUE timer_alloc(VALUE klass)
   return obj;
 }
 
-/* call-seq:
-*     Posix::Timer.new
-*     Posix::Timer.new("ALRM")
-*     Posix::Timer.new("USR1")
-*     Posix::Timer.new { some_block }
-*
-*  Create a new Posix::Timer object.  The argument passed can be any valid
-*  signal type from Signal.list.
-*
-*  If a block is passed, that block will be executed when the Posix::Timer timeout
-*  has expired.  This is done by trapping the signal specified as creation time, so
-*  be careful if you have other uses of that signal in your program.
-*
-*/
 static VALUE timer_initialize(int argc, VALUE *argv, VALUE self)
 {
   VALUE sigtype, codeblock;
@@ -97,11 +83,26 @@ static VALUE timer_initialize(int argc, VALUE *argv, VALUE self)
   data->sig_event = &data->se;
 
   destroy_timer(data);
+  data->timer_id = 0;
   create_new_timer(data);
 
   return self;
 }
 
+/* call-seq:
+*     Posix::Timer.new
+*     Posix::Timer.new("ALRM")
+*     Posix::Timer.new("USR1")
+*     Posix::Timer.new { some_block }
+*
+*  Create a new Posix::Timer object.  The argument passed can be any valid
+*  signal type from Signal.list.
+*
+*  If a block is passed, that block will be executed when the Posix::Timer timeout
+*  has expired.  This is done by trapping the signal specified as creation time, so
+*  be careful if you have other uses of that signal in your program.
+*
+*/
 static VALUE timer_new(int argc, VALUE *argv, VALUE self)
 {
   VALUE obj = rb_funcall(self, rb_intern("allocate"), 0);
@@ -141,6 +142,9 @@ static VALUE timer_arm(VALUE klass, VALUE arg)
 
   data->tspec.it_value.tv_sec = sec;
   data->tspec.it_value.tv_nsec = usec;
+  // Set the interval to 0 for timer resets
+  data->tspec.it_interval.tv_sec = 0;
+  data->tspec.it_interval.tv_nsec = 0;
 
   if(timer_settime(data->timer_id, 0, &(data->tspec), NULL) == -1)
     rb_sys_fail("timer_settime()");

data/test/timertests.rb

@@ -37,6 +37,8 @@ class TimerTest < Test::Unit::TestCase
   def test_timer_with_block
     i = 5
     a = Posix::Timer.new { i = 10 }
+    assert i == 5
+
     assert_nothing_raised(SignalException) {
       a.arm(1)
       sleep(2) 

metadata

@@ -1,10 +1,10 @@
-!ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification 
 rubygems_version: 0.8.11
 specification_version: 1
 name: posixtimer
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2005-12-09 00:00:00 -05:00
+  version: "0.2"
+date: 2006-02-09 00:00:00 -05:00
 summary: A class that provides a definable timeout
 require_paths: 
 - .