p2p2 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1973bcbd5f9620457f208e44cd08ae4cf3fbc07039175e8b3fe9a583a08b638
-  data.tar.gz: 259a151940d2eaf37d9b1e37a8be36cf90a3f1f82930cc0876fba3b42e4957bf
+  metadata.gz: '0727388a18560d4da46cca837f3cce09d3869566a27943289e48f58bc04f2eeb'
+  data.tar.gz: abc0bcc8ae2017a985c451a4c4d2f18172e888d2d1761b0407535fc50b240fec
 SHA512:
-  metadata.gz: 680631e11a05fd28156b52a8a08f63ef9511e26a701a72548c1f1eb6f106024b1ed3c0a1584fc15c96d83115f2db34f08e98b11d21042d9f93ea06d37eb0c126
-  data.tar.gz: 114000b65c1fb31e6e4a3b2d7e986b0723ba81bc0db63d2f39d9d2d0cb01928acf258bf990ff026aff623b89923d4053f7ac1dbf7239fd5982ea68069de32649
+  metadata.gz: 5d1820637dbec1a55279907488b4177f5058db51c93e27c0550fbd7d8c6159c50aa4c6ff443ee7aa00f4bdca4fda11c8bb4ddce268e9b9dc4e6207e3b3f49aca
+  data.tar.gz: f1561b691c0e12eafe5b22afc640f196e91d81b5b64a04fc2b188dd389aa75f785af3e8d750dc42ed565e9ac80dd9c8798f1ef06d4087e8051c11cdec6889568

data/lib/p2p2/head.rb

@@ -20,6 +20,6 @@ module P2p2
   GOT_FIN2              = 11
   P1_FIN                = 12
   P2_FIN                = 13
-  CTL_CLOSE_SOCK        = [ 1 ].pack( 'C' )
-  CTL_RESUME            = [ 2 ].pack( 'C' )
+  CTL_CLOSE             = 1
+  CTL_RESUME            = 2
 end

data/lib/p2p2/p1.rb

@@ -101,23 +101,22 @@ module P2p2
     # read ctlr
     #
     def read_ctlr( ctlr )
-      case ctlr.read( 1 )
-      when CTL_CLOSE_SOCK
+      case ctlr.read( 1 ).unpack( 'C' ).first
+      when CTL_CLOSE
         sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
         sock = @socks[ sock_id ]
 
         if sock
-          puts "expire p1 #{ sock_id } #{ Time.new }"
+          puts "ctlr close #{ sock_id } #{ Time.new }"
           add_closing( sock )
         end
       when CTL_RESUME
-        p1_id = ctlr.read( 8 ).unpack( 'Q>' ).first
-
-        puts "resume #{ p1_id } #{ Time.new }"
-        p1 = @socks[ p1_id ]
+        sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
+        sock = @socks[ sock_id ]
 
-        if p1
-          add_write( p1 )
+        if sock
+          puts "ctlr resume #{ sock_id } #{ Time.new }"
+          add_write( sock )
         end
       end
     end
@@ -356,7 +355,7 @@ module P2p2
           shadow_id = data[ 9, 8 ].unpack( 'Q>' ).first
           info[ :fin2s ].delete( shadow_id )
         when P2_FIN
-          puts "p2 fin #{ Time.new }"
+          puts "recv p2 fin #{ Time.new }"
           add_closing( p1 )
         end
 
@@ -607,8 +606,7 @@ module P2p2
 
           if p1_info[ :p2_addr ].nil? || ( Time.new - p1_info[ :last_coming_at ] > EXPIRE_AFTER )
             @mutex.synchronize do
-              puts "expire p1 #{ p1.object_id } #{ Time.new }"
-              @ctlw.write( [ CTL_CLOSE_SOCK, [ p1.object_id ].pack( 'Q>' ) ].join )
+              @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
             end
           else
             ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
@@ -652,7 +650,7 @@ module P2p2
 
           if p1_info[ :paused ] && ( p1_info[ :shadow_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
             @mutex.synchronize do
-              @ctlw.write( [ CTL_RESUME, [ p1.object_id ].pack( 'Q>' ) ].join )
+              @ctlw.write( [ CTL_RESUME, p1.object_id ].pack( 'CQ>' ) )
               p1_info[ :paused ] = false
             end
           end

data/lib/p2p2/p2.rb

@@ -110,16 +110,16 @@ module P2p2
         sock = @socks[ sock_id ]
 
         if sock
+          puts "ctlr close #{ sock_id } #{ Time.new }"
           add_closing( sock )
         end
       when CTL_RESUME
-        p2_id = ctlr.read( 8 ).unpack( 'Q>' ).first
-
-        puts "resume #{ p2_id } #{ Time.new }"
-        p2 = @socks[ p2_id ]
+        sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
+        sock = @socks[ sock_id ]
 
-        if p2
-          add_write( p2 )
+        if sock
+          puts "ctlr resume #{ sock_id } #{ Time.new }"
+          add_write( sock )
         end
       end
     end
@@ -354,7 +354,7 @@ module P2p2
           app_id = data[ 9, 8 ].unpack( 'Q>' ).first
           info[ :fin2s ].delete( app_id )
         when P1_FIN
-          raise "p1 fin #{ Time.new }"
+          raise "recv p1 fin #{ Time.new }"
         end
 
         return
@@ -615,7 +615,6 @@ module P2p2
 
           if p2_info[ :p1_addr ].nil? || ( Time.new - p2_info[ :last_coming_at ] > EXPIRE_AFTER )
             @mutex.synchronize do
-              puts "expire p2 #{ p2.object_id } #{ Time.new }"
               @ctlw.write( [ CTL_CLOSE_SOCK, [ p2.object_id ].pack( 'Q>' ) ].join )
             end
           else

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - takafan