rrd-ffi 0.2.9 → 0.2.10

data/CHANGELOG.rdoc

@@ -9,6 +9,9 @@
 * TODO: Add memory leak test
 * TODO: Add tune methods to RRD::Base instance
 
+== 2011-04-11 version 0.2.10
+
+* Fixes Segmentation Fault when using in a multi-thread environment
 
 == 2010-08-31 version 0.2.8
 

data/lib/rrd/version.rb

@@ -3,7 +3,7 @@ module RRD
   module Version  #:nodoc: all
     MAJOR = 0
     MINOR = 2
-    PATCH = 9
+    PATCH = 10
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/lib/rrd/wrapper.rb

@@ -382,24 +382,24 @@ module RRD
    
       private
       def empty_pointer
-        @mem_ptrs ||= []
+        mem_ptrs ||= []
         ptr = FFI::MemoryPointer.new(:pointer)
-        @mem_ptrs << ptr
+        mem_ptrs << ptr
         ptr
       end
 
       # FIXME: remove clear_error from here
       def to_pointer(array_of_strings)
         clear_error
-        @strptrs = []
-        array_of_strings.each {|item| @strptrs << FFI::MemoryPointer.from_string(item)}
+        str_ptrs = []
+        array_of_strings.each {|item| str_ptrs << FFI::MemoryPointer.from_string(item)}
 
-        @argv = FFI::MemoryPointer.new(:pointer, @strptrs.length)
-        @strptrs.each_with_index do |p, i|
-          @argv[i].put_pointer(0,  p)
+        argv = FFI::MemoryPointer.new(:pointer, str_ptrs.length)
+        str_ptrs.each_with_index do |p, i|
+          argv[i].put_pointer(0,  p)
         end
 
-        @argv
+        argv
       end
       
       def free_in_rrd(*pointers)
@@ -407,17 +407,26 @@ module RRD
       end
       
       def free_pointers
-        @strptrs ||= []
-        @mem_ptrs ||= []
+        str_ptrs ||= []
+        mem_ptrs ||= []
         
-        @strptrs.each{|str_ptr| str_ptr.free}
-        @mem_ptrs.each{|mem_ptr| mem_ptr.free}
-        @argv.free unless @argv.nil?
+        str_ptrs.each{|str_ptr| str_ptr.free}
+        mem_ptrs.each{|mem_ptr| mem_ptr.free}
+        argv.free unless argv.nil?
         
-        @argv = nil
-        @str_ptrs = nil
-        @mem_ptrs = nil
+        argv = nil
+        str_ptrs = nil
+        mem_ptrs = nil
       end
+
+      [:str_ptrs, :mem_ptrs, :argv].each do |name|
+        define_method name do 
+          Thread.current[name]
+        end
+        define_method "#{name}=" do |value|
+          Thread.current[name] = value
+        end        
+      end     
       
     end
   end

data/rrd-ffi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rrd-ffi"
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["morellon"]
-  s.date = "2012-03-23"
+  s.date = "2012-04-12"
   s.description = "Provides bindings for many RRD functions (using ffi gem and librrd), as well as DSLs for graphic and rrd building. You must have librrd in your system!"
   s.email = "morellon@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrd-ffi
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152258360 !ruby/object:Gem::Requirement
+  requirement: &2152158960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152258360
+  version_requirements: *2152158960
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2152284560 !ruby/object:Gem::Requirement
+  requirement: &2152156840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152284560
+  version_requirements: *2152156840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152282180 !ruby/object:Gem::Requirement
+  requirement: &2152155000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152282180
+  version_requirements: *2152155000
 description: Provides bindings for many RRD functions (using ffi gem and librrd),
   as well as DSLs for graphic and rrd building. You must have librrd in your system!
 email: morellon@gmail.com