DIY-pcap 0.3.8 → 0.4.1

data/lib/diy/builder.rb

@@ -94,11 +94,11 @@ module DIY
       @strategies.each { |builder| @strategy_builder.add(builder) }
       find_worker_keepers
       set_filter
-      controller = Controller.new( @client, @server, @offline, @strategy_builder )
-      controller.before_send(&@before_send_hook)
-      controller.timeout(@timeout) if @timeout
-      controller.error_on_stop if @error_on_stop
-      controller.run
+      @controller = Controller.new( @client, @server, @offline, @strategy_builder )
+      @controller.before_send(&@before_send_hook)
+      @controller.timeout(@timeout) if @timeout
+      @controller.error_on_stop if @error_on_stop
+      @controller.run
     end
     
   end

data/lib/diy/controller.rb

@@ -11,6 +11,7 @@ module DIY
       @before_send = nil
       @timeout = nil
       @error_on_stop = nil
+      @fail_count = 0
     end
     
     def run
@@ -86,9 +87,12 @@ module DIY
       @round_count = 0 unless @round_count
       @round_count += 1
       DIY::Logger.info "round #{@round_count}: (c:#{client.__drburi} / s:#{server.__drburi}) #{pkts[0].pretty_print}:(queue= #{pkts.size})"
-      if pkts.size >= 10
-        DIY::Logger.info "queue size too big: #{pkts.size}, maybe something error"
-      end
+      
+      # check is client or server at this time
+      # give the flag to **before_send** block
+      client_or_server = client == @client
+      
+      before_send_call(pkts, client_or_server)
       
       recv_pkt_proc_set( pkts )
       @ready = false
@@ -120,29 +124,32 @@ module DIY
     end
     
     def client_send(client, pkts)
-      if @before_send
-        pkts = pkts.collect do |pkt| 
-          content = pkt.content
-          begin
-            pkt.content = @before_send.call(content)
-          rescue Exception => e
-            DIY::Logger.warn("UserError Catch: " + error = BeforeSendCallError.new(e) )
-            error.backtrace.each do |msg|
-              DIY::Logger.info(msg)
-            end
-            raise error
-          end
-          pkt
-        end
-      end
+      #~ pkt_contents = pkts.collect { |pkt| pkt.content }
       begin
         client.inject(pkts)
       rescue FFI::PCap::LibError =>e
-        DIY::Logger.warn("SendPacketError Catch: " + e )
+        DIY::Logger.info("SendPacketError Catch: " + e )
         raise e
       end
     end
     
+    def before_send_call(pkts, client_flag)
+      return unless @before_send
+      pkts.delete_if do |pkt|
+        begin
+          ret = @before_send.call( pkt, client_flag )
+        rescue Exception => e
+          DIY::Logger.warn("UserError Catch: " + error = BeforeSendCallError.new(e) )
+          error.backtrace.each do |msg|
+            DIY::Logger.info(msg)
+          end
+          raise error
+        end
+        ! ret
+      end
+      pkts
+    end
+    
     def before_send(&block)
       @before_send = block
     end
@@ -161,15 +168,17 @@ module DIY
     end
     
     def offline_result
-      sprintf "%4d files, %8d packets", @offline.files_size, @offline.now_size
+      sprintf "%4d files, running %8d packets", @offline.files_size, @offline.now_size
     end
     
     def wait_recv_ok(pkts)
-      wait_until(@timeout ||= 10) do
-        if @error_flag
-          raise @error_flag
+      loop do 
+        now_size = pkts.size
+        break if now_size == 0
+        wait_until(@timeout ||= 10) do
+          raise @error_flag if @error_flag
+          pkts.size < now_size
         end
-        pkts.empty?
       end
     end
     

data/lib/diy/live.rb

@@ -26,7 +26,8 @@ module DIY
           next unless pkt
           block.call(this, pkt)
         end
-        sleep 0.1
+        block.call(nil, nil) # at least every 0.01 min do it. 
+        sleep 0.01
       end
       DIY::Logger.debug "stopped loop recv..."
     end

data/lib/diy/version.rb

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

data/lib/diy/worker.rb

@@ -31,9 +31,17 @@ module DIY
         DIY::Logger.info "start thread recving pkt..."
         @live.loop do |this, pkt|
           if ! @start
+            DIY::Logger.debug "looprecv stop..." unless @recv_stop_flag
             @recv_stop_flag = true
             next
           end
+          
+          if @start
+            DIY::Logger.debug "looprecv start..." if @recv_stop_flag
+            @recv_stop_flag = false
+          end
+          
+          next unless pkt
           @queue.push(pkt.body)
         end
         DIY::Logger.debug "worker: stopped loop recv"
@@ -45,15 +53,22 @@ module DIY
       @callback_t = Thread.new do 
         #~ DIY::Logger.info "start thread callbacking pkt..."
         while @running do
+          if ! @start
+            DIY::Logger.debug "callback stop..." unless @callback_stop_flag
+            @callback_stop_flag = true
+            sleep 0.01
+            next
+          end 
+
+          if @start
+            DIY::Logger.debug "callback start..." if @callback_stop_flag
+            @callback_stop_flag = false
+          end
+          
           begin
             pkt = @queue.pop
             #~ DIY::Logger.info "callback: #{pkt}"
             
-            if ! @start
-              @callback_stop_flag = true
-              next
-            end
-            
             if @block and pkt
               @block.call(pkt)
             end
@@ -81,7 +96,7 @@ module DIY
     # 停止收发
     def terminal
       DIY::Logger.info("stop recv pkt")
-      pause
+      stopping
     end
     
     # 停止线程
@@ -107,9 +122,11 @@ module DIY
       pause
       while ! paused?
       end
+      DIY::Logger.debug "stop success"
     end
     
     def pause
+      DIY::Logger.debug "pausing..."
       @start = false
       @recv_stop_flag = false
       @callback_stop_flag = false
@@ -118,7 +135,15 @@ module DIY
     end
     
     def start
+      DIY::Logger.debug "starting..."
       @start = true
+      while ! start?
+      end
+      DIY::Logger.debug "start success"
+    end
+    
+    def start?
+      @start and ! recv_stop? and ! callback_stop?
     end
     
     def paused?

data/spec/controller_spec.rb

@@ -41,9 +41,11 @@ describe "Controller" do
     builder = DIY::Builder.new do
       pcapfiles "helper/http.pcap"
       use DIY::SimpleStrategy.new
-      timeout 10
+      timeout 1
     end
+    #~ builder.run
     lambda { builder.run }.should_not raise_error  
+    builder.instance_variable_get("@controller").instance_variable_get("@fail_count").should == 0
   end
   
   it "#run none_hope_skip" do
@@ -62,9 +64,10 @@ describe "Controller" do
       pcapfiles "helper/http.pcap"
       use hope_skip
       use DIY::SimpleStrategy.new
-      timeout 10
+      timeout 2
     end
     lambda { builder.run }.should_not raise_error    
+    builder.instance_variable_get("@controller").instance_variable_get("@fail_count").should == 0
   end
     
   it "#run stragety error" do
@@ -79,9 +82,10 @@ describe "Controller" do
     builder = DIY::Builder.new do
       pcapfiles "helper/http.pcap"
       use wrongUserStragety
-      timeout 10
+      timeout 1
     end
     lambda { builder.run }.should_not raise_error
+    builder.instance_variable_get("@controller").instance_variable_get("@fail_count").should == 1
   end
   
   it "#run before_send error" do
@@ -93,17 +97,21 @@ describe "Controller" do
       pcapfiles "helper/http.pcap"
     end
     lambda { build2.run }.should_not raise_error
+    build2.instance_variable_get("@controller").instance_variable_get("@fail_count").should == 1
   end
   
   it "#run big packet " do
     sleep 1
     build2 = DIY::Builder.new do
-      before_send do |pkt|
+      before_send do |pkt, flag|
         new_pkt = "a" * 10000
+        pkt.content = new_pkt
+        true
       end
       pcapfiles "helper/http.pcap"
     end
     lambda { build2.run }.should_not raise_error  
+    build2.instance_variable_get("@controller").instance_variable_get("@fail_count").should == 1
   end
   
   it "#run stragety fail" do
@@ -120,6 +128,7 @@ describe "Controller" do
       pcapfiles "helper/http.pcap"
     end
     lambda { build2.run }.should_not raise_error  
+    build2.instance_variable_get("@controller").instance_variable_get("@fail_count").should == 1
   end
   
   it "#run with filter" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: DIY-pcap
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 8
-  version: 0.3.8
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - yafei Lee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-29 00:00:00 Z
+date: 2012-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi-pcap