Changeset 424
- Timestamp:
- 07/16/07 21:22:03 (1 year ago)
- Files:
-
- experiments/jruby-1/src/com/rubyeventmachine/EM.java (modified) (7 diffs)
- version_0/lib/jeventmachine.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
experiments/jruby-1/src/com/rubyeventmachine/EM.java
r423 r424 35 35 import java.net.*; 36 36 import java.util.concurrent.atomic.*; 37 import javax.net.ssl.*; 37 38 38 39 public class EM { … … 113 114 EventableChannel ec = new EventableChannel (sn, b, mySelector); 114 115 Connections.put(b, ec); 115 //eventCallback ((String)k.attachment(), EM_CONNECTION_ACCEPTED, b, b.length());116 116 eventCallback ((String)k.attachment(), EM_CONNECTION_ACCEPTED, ByteBuffer.wrap(b.getBytes())); 117 117 } … … 124 124 if (r > 0) { 125 125 bb.flip(); 126 //eventCallback (((EventableChannel)k.attachment()).getBinding(), EM_CONNECTION_READ, new String(bb.array(), 0, bb.limit()), bb.limit());127 126 eventCallback (((EventableChannel)k.attachment()).getBinding(), EM_CONNECTION_READ, bb); 128 127 } 129 128 else { 130 129 String b = ((EventableChannel)k.attachment()).getBinding(); 131 //eventCallback (b, EM_CONNECTION_UNBOUND, "", 0); 132 eventCallback (b, EM_CONNECTION_UNBOUND, EmptyByteBuffer); // TODO, have this BB around somewhere, don't generate garbage. 130 eventCallback (b, EM_CONNECTION_UNBOUND, EmptyByteBuffer); 133 131 Connections.remove(b); 134 132 sn.close(); … … 148 146 EventableChannel ec = (EventableChannel)k.attachment(); 149 147 if (ec.finishConnecting()) { 150 //eventCallback (ec.getBinding(), EM_CONNECTION_COMPLETED, "", 0);151 148 eventCallback (ec.getBinding(), EM_CONNECTION_COMPLETED, EmptyByteBuffer); 152 149 } … … 154 151 Connections.remove (ec.getBinding()); 155 152 k.channel().close(); 156 //eventCallback (ec.getBinding(), EM_CONNECTION_UNBOUND, "", 0);157 153 eventCallback (ec.getBinding(), EM_CONNECTION_UNBOUND, EmptyByteBuffer); 158 154 } … … 184 180 bRunReactor = false; 185 181 signalLoopbreak(); 186 // TODO, signal the loopbreaker.187 182 } 188 183 … … 194 189 break; 195 190 String s = Timers.remove(k); 196 //eventCallback ("", 100, s, s.length());197 191 eventCallback ("", EM_TIMER_FIRED, ByteBuffer.wrap(s.getBytes())); 198 192 } version_0/lib/jeventmachine.rb
r420 r424 70 70 @em.closeConnection sig, after_writing 71 71 end 72 def self.start_tls sig 73 @em.startTls sig 74 end 72 75 end 73 76
