china_ad_ip 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9308d7c16f1fd0d16c4454a9a77c654dc5bdcd
-  data.tar.gz: 482b0e42b7abe1634dc5fc93ee6a8334fd6884ce
+  metadata.gz: 6f93ae8ff8e2025522fb7b4ab01ca88284b6b78b
+  data.tar.gz: 39e883203a646deb706077d5035a3aa8e0507ef6
 SHA512:
-  metadata.gz: 9a9da6df919e5d79c814d7355a2582ab9ad9554031e8701884da023504ba71cbd8488fc1a767e935bfe9a57eacd6adf488bef2c32d6f33b531845985bdc29ebb
-  data.tar.gz: 161cdfc0ff74af14cbdac61f4a7169d0fe56ea007a7913882fd328c2905f8aa9bfbfda366439addac526f6b418bd9d546dc6bbaa8f7f5e0faefbb3c92e14a301
+  metadata.gz: 537a6704a6deeb63a2ae4fed3fa911991f0caea259553dfaac00948ca9765b8acb4f9c73f56b2ec048bc6cb1eff83b2d2a0c9babd68fcec86ab6054f2ebe4078
+  data.tar.gz: 76811430031222e2f64c086b76bf747cdcb03268009634ff23357acda96ac8b0728392e1f50df6ae981240446c0f04a9f858cd88cdc909c19d55595b3d4fd592

data/.gitignore

@@ -16,7 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 *.bundle
-*.so
 *.o
 *.a
 mkmf.log

data/china_ad_ip.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  # spec.add_development_dependency "ipaddress"
+  spec.add_development_dependency "ffi"
 end

data/lib/china_ad_ip.rb

@@ -1,12 +1,34 @@
 require "china_ad_ip/version"
 require 'china_ad_ip/ipv4'
 require 'csv'
+require 'ffi'
 
 module ChinaAdIp
   NAME            = "ChinaAdIp"
   GEM             = "china_ad_ip"
   AUTHORS         = ["suezhen <sz3001@gmail.com>"]
 
+  extend FFI::Library
+  ffi_lib "libbinarysearch.so"
+  attach_function :binarysearch, [:pointer,:long,:long], :long
+
+
+  module LibC
+      extend FFI::Library
+      ffi_lib FFI::Library::LIBC
+
+      # memory allocators
+      attach_function :malloc, [:size_t], :pointer
+      attach_function :calloc, [:size_t], :pointer
+      attach_function :valloc, [:size_t], :pointer
+      attach_function :realloc, [:pointer, :size_t], :pointer
+      attach_function :free, [:pointer], :void
+
+      # memory movers
+      attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
+      attach_function :bcopy, [:pointer, :pointer, :size_t], :void
+
+  end # module LibC
 
   def self.ntoa(uint)
     unless(uint.is_a? Numeric and uint <= 0xffffffff and uint >= 0)
@@ -64,9 +86,7 @@ module ChinaAdIp
     ip_addr = ChinaAdIp::IPv4.new(addr)
 
     if $ip_sections && $locations
-
-      index = dichotomy(ip_addr.to_i,$ip_sections.collect{|ip_section| ip_section[0]}.to_a) 
-
+      index =  ChinaAdIp.binarysearch(self.arr_pointer,ip_addr.to_i,ip_arr.length)
       $locations[$ip_sections[index][2]]
     else
       raise(::ArgumentError, "not exists csv data")    
@@ -75,16 +95,13 @@ module ChinaAdIp
   end
 
 
-  def self.dichotomy(search,array)
-    index = 0 , start_index = 0 , end_index = array.length
-    while(true)
-      index = start_index + ((end_index - start_index) / 2)
-      start_index = index if array[index] < search
-      end_index = index if array[index] > search
-      break if array[index] == search || ((start_index == index) && (start_index+1 == end_index))
-    end 
-    index
+  def self.ip_arr
+    @@ip_arr ||= $ip_sections.collect{|ip_section| ip_section[0]}.to_a
   end
 
+  def self.arr_pointer
+    buffer = LibC.malloc(ip_arr.first.size * ip_arr.size)
+    buffer.write_array_of_long ip_arr
+  end
 
 end

data/lib/china_ad_ip/version.rb

@@ -1,3 +1,3 @@
 module ChinaAdIp
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: china_ad_ip
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - suezhen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'locate ip '
 email:
 - sz3001@gmail.com
@@ -51,9 +65,11 @@ files:
 - README.md
 - Rakefile
 - china_ad_ip.gemspec
+- lib/.DS_Store
 - lib/china_ad_ip.rb
 - lib/china_ad_ip/ipv4.rb
 - lib/china_ad_ip/version.rb
+- lib/libbinarysearch.so
 homepage: https://github.com/suzhen/china_ad_ip
 licenses:
 - MIT