ip2cityisp 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 45cb7493b2a23fe9c395f54052523cfe5cb83f55
-  data.tar.gz: 1cdc500256b41de11ff32ded3231c71095d36d51
+  metadata.gz: 3344f17152f528b22d350cc53215abee21c00351
+  data.tar.gz: 8b23d93db20e84c7c14b582a6321133e4b56564c
 SHA512: 
-  metadata.gz: e05112f49a911907eae0cb98eeeb227da04bcc180525a38491e5eaefb017036acbedb38ac6424d5a66607c6125d63d8e49390c50aaf6252f3e4b78338d464fe1
-  data.tar.gz: c74bb311d6d7ce86a062b1c268048768d6781cf11a7864418e349dbcabc0e3953b59009d5bae77719acaa2bd90dd12f949a14b89635d43228d846e54b2e769fd
+  metadata.gz: 16ee18179c69f63d8cc393ea9fcf684f89c2b358bc8ab0b6f2c39a4c18bfdda97e41f1f08d3bc24b0240e90eae464c42eb64d550ea0fea2676b3bdb91348d4cd
+  data.tar.gz: 77ab73e25f602edaf6c0750ada1d71cf7dfaef67731b95ab8428e1e6114b0a103df1e23d079a1334c228ef9a0958b54b49fd6e917b468ea4dc148964c2e84b10

data/lib/ip2cityisp/database.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'bindata'
+require 'thread'
 module Ip2cityisp
   class Header < BinData::Record
     SIZE = 8
@@ -21,11 +22,14 @@ module Ip2cityisp
   class Database
     attr_reader  :area, :isp
     def initialize(file = 'ipinfo.data')
+      p "enable multi threads test...."
+      @mutex = Mutex.new
       if file.respond_to?(:to_str)
         @file = File.new(file.to_str)
       else
         @file = file
-        @file.seek(0)
+        atomic_seek(0)
+        #@file.seek(0)
       end
       @header = Ip2cityisp::Header.read(@file)
       $start = Ip2cityisp::Header::SIZE
@@ -33,13 +37,26 @@ module Ip2cityisp
       $off1 = @header.total_nums*12 + 20
       $version  = @header.index_version
       #get end off2
-      @file.seek($high*12+8)
+      atomic_seek($high*12+8)
+      #@file.seek($high*12+8)
       index = Ip2cityisp::Index.read(@file)
       $off2 = $off1 + index.country_offset
       $create_time=  index.isp_offset
-      @file.seek(0)
+      #@file.seek(0)
+      atomic_seek(0)
+    end
+    def atomic_seek( offset)
+        if @mutex
+          @mutex.synchronize { atomic_seek_unguarded(offset) }
+        else
+          atomic_seek_unguarded( offset)
+        end 
+    end
+    def atomic_seek_unguarded( offset)
+          io = @file
+          io.seek(offset)
+          #io.read(length)
     end
-
     def version
         $version + ":CREATE TIME:" + Time.at($create_time).to_date.to_s
     end
@@ -61,7 +78,8 @@ module Ip2cityisp
       while(low <= high)
           middle = (low + high) >> 1 
           #p middle
-          @file.seek(start + middle * Ip2cityisp::Index::SIZE)
+          #@file.seek(start + middle * Ip2cityisp::Index::SIZE)
+          atomic_seek(start + middle * Ip2cityisp::Index::SIZE)
           index = Ip2cityisp::Index.read(@file)
           ip_start = index.ip_start
           country_offset = index.country_offset
@@ -75,7 +93,8 @@ module Ip2cityisp
               if country_offset >= 0
                   country_off = $off1 +  country_offset
                   if country_off < @file.size
-                      @file.seek(country_off)
+                      atomic_seek(country_off)
+                      #@file.seek(country_off)
                       vlen = @file.read(1).unpack('C')[0]
                       info["area"] = @file.read(vlen).force_encoding("UTF-8")
                   end
@@ -84,7 +103,8 @@ module Ip2cityisp
               if isp_offset >= 0
                   isp_off = $off2 +  isp_offset
                   if isp_off < @file.size
-                      @file.seek(isp_off)
+                      atomic_seek(isp_off)
+                      #@file.seek(isp_off)
                       vlen = @file.read(1).unpack('C')[0]
                       info["isp"] = @file.read(vlen).force_encoding("UTF-8")
                   end

data/lib/ip2cityisp/version.rb

@@ -1,3 +1,3 @@
 module Ip2cityisp
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/tt.rb

@@ -3,7 +3,15 @@ require 'bundler/setup'
 require 'ip2cityisp'
 ip =  ARGV[0]
 @db = Ip2cityisp::Database.new('/tmp/ipinfo.data')
-r = @db.query('8.8.8.8')
+r = @db.query('123.123.21.12')
+rip = r["area"]+r["isp"]  
+p rip
+p @db.version
+r = @db.query('13.123.21.12')
+rip = r["area"]+r["isp"]  
+p rip
+p @db.version
+r = @db.query('3.123.21.12')
 rip = r["area"]+r["isp"]  
 p rip
 p @db.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ip2cityisp
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - geda
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-09 00:00:00 Z
+date: 2014-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -60,8 +60,6 @@ files:
 - lib/ip2cityisp.rb
 - lib/ip2cityisp/database.rb
 - lib/ip2cityisp/version.rb
-- test.rb
-- test2.rb
 - tt.rb
 homepage: ""
 licenses: