p2p2 0.8.1 → 0.8.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/p2p2/head.rb +2 -2
- data/lib/p2p2/p1.rb +11 -13
- data/lib/p2p2/p2.rb +7 -8
- data/lib/p2p2/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '0727388a18560d4da46cca837f3cce09d3869566a27943289e48f58bc04f2eeb'
|
4
|
+
data.tar.gz: abc0bcc8ae2017a985c451a4c4d2f18172e888d2d1761b0407535fc50b240fec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5d1820637dbec1a55279907488b4177f5058db51c93e27c0550fbd7d8c6159c50aa4c6ff443ee7aa00f4bdca4fda11c8bb4ddce268e9b9dc4e6207e3b3f49aca
|
7
|
+
data.tar.gz: f1561b691c0e12eafe5b22afc640f196e91d81b5b64a04fc2b188dd389aa75f785af3e8d750dc42ed565e9ac80dd9c8798f1ef06d4087e8051c11cdec6889568
|
data/lib/p2p2/head.rb
CHANGED
data/lib/p2p2/p1.rb
CHANGED
@@ -101,23 +101,22 @@ module P2p2
|
|
101
101
|
# read ctlr
|
102
102
|
#
|
103
103
|
def read_ctlr( ctlr )
|
104
|
-
case ctlr.read( 1 )
|
105
|
-
when
|
104
|
+
case ctlr.read( 1 ).unpack( 'C' ).first
|
105
|
+
when CTL_CLOSE
|
106
106
|
sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
|
107
107
|
sock = @socks[ sock_id ]
|
108
108
|
|
109
109
|
if sock
|
110
|
-
puts "
|
110
|
+
puts "ctlr close #{ sock_id } #{ Time.new }"
|
111
111
|
add_closing( sock )
|
112
112
|
end
|
113
113
|
when CTL_RESUME
|
114
|
-
|
115
|
-
|
116
|
-
puts "resume #{ p1_id } #{ Time.new }"
|
117
|
-
p1 = @socks[ p1_id ]
|
114
|
+
sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
|
115
|
+
sock = @socks[ sock_id ]
|
118
116
|
|
119
|
-
if
|
120
|
-
|
117
|
+
if sock
|
118
|
+
puts "ctlr resume #{ sock_id } #{ Time.new }"
|
119
|
+
add_write( sock )
|
121
120
|
end
|
122
121
|
end
|
123
122
|
end
|
@@ -356,7 +355,7 @@ module P2p2
|
|
356
355
|
shadow_id = data[ 9, 8 ].unpack( 'Q>' ).first
|
357
356
|
info[ :fin2s ].delete( shadow_id )
|
358
357
|
when P2_FIN
|
359
|
-
puts "p2 fin #{ Time.new }"
|
358
|
+
puts "recv p2 fin #{ Time.new }"
|
360
359
|
add_closing( p1 )
|
361
360
|
end
|
362
361
|
|
@@ -607,8 +606,7 @@ module P2p2
|
|
607
606
|
|
608
607
|
if p1_info[ :p2_addr ].nil? || ( Time.new - p1_info[ :last_coming_at ] > EXPIRE_AFTER )
|
609
608
|
@mutex.synchronize do
|
610
|
-
|
611
|
-
@ctlw.write( [ CTL_CLOSE_SOCK, [ p1.object_id ].pack( 'Q>' ) ].join )
|
609
|
+
@ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
|
612
610
|
end
|
613
611
|
else
|
614
612
|
ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
|
@@ -652,7 +650,7 @@ module P2p2
|
|
652
650
|
|
653
651
|
if p1_info[ :paused ] && ( p1_info[ :shadow_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
|
654
652
|
@mutex.synchronize do
|
655
|
-
@ctlw.write( [ CTL_RESUME,
|
653
|
+
@ctlw.write( [ CTL_RESUME, p1.object_id ].pack( 'CQ>' ) )
|
656
654
|
p1_info[ :paused ] = false
|
657
655
|
end
|
658
656
|
end
|
data/lib/p2p2/p2.rb
CHANGED
@@ -110,16 +110,16 @@ module P2p2
|
|
110
110
|
sock = @socks[ sock_id ]
|
111
111
|
|
112
112
|
if sock
|
113
|
+
puts "ctlr close #{ sock_id } #{ Time.new }"
|
113
114
|
add_closing( sock )
|
114
115
|
end
|
115
116
|
when CTL_RESUME
|
116
|
-
|
117
|
-
|
118
|
-
puts "resume #{ p2_id } #{ Time.new }"
|
119
|
-
p2 = @socks[ p2_id ]
|
117
|
+
sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
|
118
|
+
sock = @socks[ sock_id ]
|
120
119
|
|
121
|
-
if
|
122
|
-
|
120
|
+
if sock
|
121
|
+
puts "ctlr resume #{ sock_id } #{ Time.new }"
|
122
|
+
add_write( sock )
|
123
123
|
end
|
124
124
|
end
|
125
125
|
end
|
@@ -354,7 +354,7 @@ module P2p2
|
|
354
354
|
app_id = data[ 9, 8 ].unpack( 'Q>' ).first
|
355
355
|
info[ :fin2s ].delete( app_id )
|
356
356
|
when P1_FIN
|
357
|
-
raise "p1 fin #{ Time.new }"
|
357
|
+
raise "recv p1 fin #{ Time.new }"
|
358
358
|
end
|
359
359
|
|
360
360
|
return
|
@@ -615,7 +615,6 @@ module P2p2
|
|
615
615
|
|
616
616
|
if p2_info[ :p1_addr ].nil? || ( Time.new - p2_info[ :last_coming_at ] > EXPIRE_AFTER )
|
617
617
|
@mutex.synchronize do
|
618
|
-
puts "expire p2 #{ p2.object_id } #{ Time.new }"
|
619
618
|
@ctlw.write( [ CTL_CLOSE_SOCK, [ p2.object_id ].pack( 'Q>' ) ].join )
|
620
619
|
end
|
621
620
|
else
|
data/lib/p2p2/version.rb
CHANGED