DIY-pcap 0.3.6 → 0.3.8

data/lib/diy/controller.rb

@@ -45,14 +45,15 @@ module DIY
             DIY::Logger.info @offline.mac_learner.dump
             break
           end
-          #~ begin
-            #~ @offline.next_pcap
-            #~ server.terminal
-          #~ rescue EOFError
-            #~ client.terminal
-            #~ server.terminal
-            #~ break
-          #~ end
+          begin
+            @offline.next_pcap
+            client.terminal
+            server.terminal
+          rescue EOFError
+            client.terminal
+            server.terminal
+            break
+          end
           #~ client,server = @client, @server
         rescue EOFError
           client.terminal
@@ -90,8 +91,9 @@ module DIY
       end
       
       recv_pkt_proc_set( pkts )
+      @ready = false
       server.ready(&@recv_pkt_proc)
-      
+      @ready = true
       client_send(client, pkts)
       wait_recv_ok(pkts)
       server.terminal
@@ -103,6 +105,7 @@ module DIY
       # 不重新赋值, 防止 DRb 回收
       @recv_pkt_proc ||= lambda do |recv_pkt|
         begin
+          next unless @ready # strip this recv pkt unless it's ready to.
           next if @error_flag # error accur waiting other thread do with it
           @recv_pkt_keeper = Packet.new(recv_pkt)
           @strategy.call(@queue_keeper.first, @recv_pkt_keeper, @queue_keeper)

data/lib/diy/utils.rb

@@ -45,7 +45,7 @@ module DIY
         timeout(timeout) do
           loop do
             break if block.call
-            sleep 0.01
+            sleep 0.001
           end
         end
       end

data/lib/diy/version.rb

@@ -1,5 +1,5 @@
 module DIY
   class PCAP
-    VERSION = "0.3.6"
+    VERSION = "0.3.8"
   end
 end

data/lib/diy/worker.rb

@@ -30,7 +30,10 @@ module DIY
       @recv_t = Thread.new do
         DIY::Logger.info "start thread recving pkt..."
         @live.loop do |this, pkt|
-          next unless @start
+          if ! @start
+            @recv_stop_flag = true
+            next
+          end
           @queue.push(pkt.body)
         end
         DIY::Logger.debug "worker: stopped loop recv"
@@ -45,7 +48,15 @@ module DIY
           begin
             pkt = @queue.pop
             #~ DIY::Logger.info "callback: #{pkt}"
-            @block.call(pkt) if @start and @block
+            
+            if ! @start
+              @callback_stop_flag = true
+              next
+            end
+            
+            if @block and pkt
+              @block.call(pkt)
+            end
           rescue DRb::DRbConnError
             DIY::Logger.info "closed connection by controller"
             @start = false
@@ -61,24 +72,22 @@ module DIY
     
     #收包
     def ready(&block)
-      @start = false
+      stopping
       DIY::Logger.info("start recv pkt")
       @block = block
-      @queue.clear
-      @start = true
+      start
     end
     
     # 停止收发
     def terminal
       DIY::Logger.info("stop recv pkt")
-      @start = false
-      @queue.clear
+      pause
     end
     
     # 停止线程
     def stop
       @running = false
-      @queue.push nil
+      pause
       @live.break
       Utils.wait_until { @recv_t && ! @recv_t.alive? }
       Utils.wait_until { @callback_t && ! @callback_t.alive? }    
@@ -92,6 +101,45 @@ module DIY
     def inspect
       "<Worker: #{@live.net}>"
     end
+    
+    private
+    def stopping
+      pause
+      while ! paused?
+      end
+    end
+    
+    def pause
+      @start = false
+      @recv_stop_flag = false
+      @callback_stop_flag = false
+      @queue.clear
+      @queue.push nil
+    end
+    
+    def start
+      @start = true
+    end
+    
+    def paused?
+      ! @start and recv_stop? and callback_stop?
+    end
+    
+    def recv_stop
+      @recv_stop_flag = true
+    end
+    
+    def recv_stop?
+      @recv_stop_flag
+    end
+    
+    def callback_stop
+      @callback_stop_flag = true
+    end
+    
+    def callback_stop?
+      @callback_stop_flag
+    end
   
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - yafei Lee
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 +08:00
-default_executable: 
+date: 2012-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi-pcap
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
@@ -149,7 +150,6 @@ files:
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -163,6 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -171,13 +172,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: DIY pcap send and recv