eventmachine 1.0.0.beta.4 → 1.0.0.rc.1

data/ext/project.h

@@ -82,7 +82,8 @@ typedef int SOCKET;
 
 #ifdef OS_WIN32
 // 21Sep09: windows limits select() to 64 sockets by default, we increase it to 1024 here (before including winsock2.h)
-#define FD_SETSIZE 1024
+// 18Jun12: fd_setsize must be changed in the ruby binary (not in this extension). redefining it also causes segvs, see eventmachine/eventmachine#333
+//#define FD_SETSIZE 1024
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

data/ext/rubymain.cpp

@@ -507,7 +507,7 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 			rb_raise (EM_eConnectionError, "no connection");
 		return ULONG2NUM (f);
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
 	return Qnil;
 }
@@ -528,7 +528,7 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 			rb_raise (EM_eConnectionError, "no connection");
 		return ULONG2NUM (f);
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
 	return Qnil;
 }
@@ -615,7 +615,7 @@ static VALUE t_set_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optna
 	}
 
 
-	if (setsockopt(fd, level, option, v, len) < 0)
+	if (setsockopt(fd, level, option, (char *)v, len) < 0)
 		rb_sys_fail("setsockopt");
 
 	return INT2FIX(0);
@@ -686,6 +686,15 @@ static VALUE t_paused_p (VALUE self, VALUE signature)
 	return evma_is_paused(NUM2ULONG (signature)) ? Qtrue : Qfalse;
 }
 
+/*********************
+t_num_close_scheduled
+*********************/
+
+static VALUE t_num_close_scheduled (VALUE self)
+{
+	return INT2FIX(evma_num_close_scheduled());
+}
+
 /*****************
 t_open_udp_socket
 *****************/
@@ -839,7 +848,7 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
 	try {
 		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eUnsupported, e.what());
+		rb_raise (EM_eUnsupported, "%s", e.what());
 	}
 	return Qnil;
 }
@@ -865,7 +874,7 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
 	try {
 		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eUnsupported, e.what());
+		rb_raise (EM_eUnsupported, "%s", e.what());
 	}
 	return Qnil;
 }
@@ -1065,7 +1074,7 @@ static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize, VAL
 	try {
 		evma_start_proxy(NUM2ULONG (from), NUM2ULONG (to), NUM2ULONG(bufsize), NUM2ULONG(length));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
 	return Qnil;
 }
@@ -1080,11 +1089,49 @@ static VALUE t_stop_proxy (VALUE self, VALUE from)
 	try{
 		evma_stop_proxy(NUM2ULONG (from));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
 	return Qnil;
 }
 
+/***************
+t_proxied_bytes
+****************/
+
+static VALUE t_proxied_bytes (VALUE self, VALUE from)
+{
+	try{
+		return ULONG2NUM(evma_proxied_bytes(NUM2ULONG (from)));
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, "%s", e.what());
+	}
+	return Qnil;
+}
+
+/***************
+t_get_idle_time
+****************/
+
+static VALUE t_get_idle_time (VALUE self, VALUE from)
+{
+	try{
+		uint64_t current_time = evma_get_current_loop_time();
+		uint64_t time = evma_get_last_activity_time(NUM2ULONG (from));
+		if (current_time != 0 && time != 0) {
+			if (time >= current_time)
+				return ULONG2NUM(0);
+			else {
+				uint64_t diff = current_time - time;
+				float seconds = diff / (1000.0*1000.0);
+				return rb_float_new(seconds);
+			}
+			return Qnil;
+		}
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, "%s", e.what());
+	}
+	return Qnil;
+}
 
 /************************
 t_get_heartbeat_interval
@@ -1180,9 +1227,11 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "pause_connection", (VALUE (*)(...))t_pause, 1);
 	rb_define_module_function (EmModule, "resume_connection", (VALUE (*)(...))t_resume, 1);
 	rb_define_module_function (EmModule, "connection_paused?", (VALUE (*)(...))t_paused_p, 1);
+	rb_define_module_function (EmModule, "num_close_scheduled", (VALUE (*)(...))t_num_close_scheduled, 0);
 
 	rb_define_module_function (EmModule, "start_proxy", (VALUE (*)(...))t_start_proxy, 4);
 	rb_define_module_function (EmModule, "stop_proxy", (VALUE (*)(...))t_stop_proxy, 1);
+	rb_define_module_function (EmModule, "get_proxied_bytes", (VALUE (*)(...))t_proxied_bytes, 1);
 
 	rb_define_module_function (EmModule, "watch_filename", (VALUE (*)(...))t_watch_filename, 1);
 	rb_define_module_function (EmModule, "unwatch_filename", (VALUE (*)(...))t_unwatch_filename, 1);
@@ -1206,6 +1255,7 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "send_file_data", (VALUE(*)(...))t_send_file_data, 2);
 	rb_define_module_function (EmModule, "get_heartbeat_interval", (VALUE(*)(...))t_get_heartbeat_interval, 0);
 	rb_define_module_function (EmModule, "set_heartbeat_interval", (VALUE(*)(...))t_set_heartbeat_interval, 1);
+	rb_define_module_function (EmModule, "get_idle_time", (VALUE(*)(...))t_get_idle_time, 1);
 
 	rb_define_module_function (EmModule, "get_peername", (VALUE(*)(...))t_get_peername, 1);
 	rb_define_module_function (EmModule, "get_sockname", (VALUE(*)(...))t_get_sockname, 1);

data/ext/ssl.cpp

@@ -137,7 +137,7 @@ SslContext_t::SslContext_t (bool is_server, const string &privkeyfile, const str
 		bLibraryInitialized = true;
 		SSL_library_init();
 		OpenSSL_add_ssl_algorithms();
-	        OpenSSL_add_all_algorithms();
+		OpenSSL_add_all_algorithms();
 		SSL_load_error_strings();
 		ERR_load_crypto_strings();
 
@@ -151,6 +151,9 @@ SslContext_t::SslContext_t (bool is_server, const string &privkeyfile, const str
 
 	SSL_CTX_set_options (pCtx, SSL_OP_ALL);
 	//SSL_CTX_set_options (pCtx, (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3));
+#ifdef SSL_MODE_RELEASE_BUFFERS
+	SSL_CTX_set_mode (pCtx, SSL_MODE_RELEASE_BUFFERS);
+#endif
 
 	if (is_server) {
 		// The SSL_CTX calls here do NOT allocate memory.

data/java/src/com/rubyeventmachine/EmReactor.java

@@ -524,6 +524,10 @@ public class EmReactor {
 		return Connections.get(sig).getPeerName();
 	}
 
+	public Object[] getSockName (long sig) {
+		return Connections.get(sig).getSockName();
+	}
+
 	public long attachChannel (SocketChannel sc, boolean watch_mode) {
 		long b = createBinding();
 

data/java/src/com/rubyeventmachine/EventableChannel.java

@@ -60,6 +60,7 @@ public interface EventableChannel {
 	public void setCommInactivityTimeout (long seconds);
 
 	public Object[] getPeerName();
+	public Object[] getSockName();
 
 	public boolean isWatchOnly();
 

data/java/src/com/rubyeventmachine/EventableDatagramChannel.java

@@ -183,6 +183,12 @@ public class EventableDatagramChannel implements EventableChannel {
 		}
 	}
 
+	public Object[] getSockName () {
+		DatagramSocket socket = channel.socket();
+		return new Object[]{ socket.getLocalPort(),
+							 socket.getLocalAddress().getHostAddress() };
+	}
+
 	public boolean isWatchOnly() { return false; }
 	public boolean isNotifyReadable() { return false; }
 	public boolean isNotifyWritable() { return false; }

data/java/src/com/rubyeventmachine/EventableSocketChannel.java

@@ -302,6 +302,12 @@ public class EventableSocketChannel implements EventableChannel {
 		return new Object[]{ sock.getPort(), sock.getInetAddress().getHostAddress() };
 	}
 
+	public Object[] getSockName () {
+		Socket sock = channel.socket();
+		return new Object[]{ sock.getLocalPort(),
+							 sock.getLocalAddress().getHostAddress() };
+	}
+
 	public void setWatchOnly() {
 		bWatchOnly = true;
 		updateEvents();

data/lib/em/connection.rb

@@ -238,6 +238,12 @@ module EventMachine
       EventMachine::disable_proxy(self)
     end
 
+    # The number of bytes proxied to another connection. Reset to zero when
+    # EventMachine::Connection#proxy_incoming_to is called, and incremented whenever data is proxied.
+    def get_proxied_bytes
+      EventMachine::get_proxied_bytes(@signature)
+    end
+
     # EventMachine::Connection#close_connection is called only by user code, and never
     # by the event loop. You may call this method against a connection object in any
     # callback handler, whether or not the callback was made against the connection
@@ -570,6 +576,11 @@ module EventMachine
       EventMachine::get_subprocess_status @signature
     end
 
+    # The number of seconds since the last send/receive activity on this connection.
+    def get_idle_time
+      EventMachine::get_idle_time @signature
+    end
+
     # comm_inactivity_timeout returns the current value (float in seconds) of the inactivity-timeout
     # property of network-connection and datagram-socket objects. A nonzero value
     # indicates that the connection or socket will automatically be closed if no read or write

data/lib/em/pool.rb

@@ -122,7 +122,10 @@ module EventMachine
 
     def failure resource
       if @on_error
+        @contents.delete resource
         @on_error.call resource
+        # Prevent users from calling a leak.
+        @removed.delete resource
       else
         requeue resource
       end
@@ -140,7 +143,9 @@ module EventMachine
       else
         raise ArgumentError, "deferrable expected from work"
       end
+    rescue Exception
+      failure resource
+      raise
     end
-
   end
-end
+end

data/lib/em/protocols/smtpclient.rb

@@ -31,38 +31,38 @@ module EventMachine
     # Simple SMTP client
     #
     # @example
-    #  email = EM::Protocols::SmtpClient.send(
-    #    :domain=>"example.com",
-    #    :host=>'localhost',
-    #    :port=>25, # optional, defaults 25
-    #    :starttls=>true, # use ssl
-    #    :from=>"sender@example.com",
-    #    :to=> ["to_1@example.com", "to_2@example.com"],
-    #    :header=> {"Subject" => "This is a subject line"},
-    #    :body=> "This is the body of the email"
-    #  )
-    #  email.callback{
-    #    puts 'Email sent!'
-    #  }
-    #  email.errback{ |e|
-    #    puts 'Email failed!'
-    #  }
+    #   email = EM::Protocols::SmtpClient.send(
+    #     :domain=>"example.com",
+    #     :host=>'localhost',
+    #     :port=>25, # optional, defaults 25
+    #     :starttls=>true, # use ssl
+    #     :from=>"sender@example.com",
+    #     :to=> ["to_1@example.com", "to_2@example.com"],
+    #     :header=> {"Subject" => "This is a subject line"},
+    #     :body=> "This is the body of the email"
+    #   )
+    #   email.callback{
+    #     puts 'Email sent!'
+    #   }
+    #   email.errback{ |e|
+    #     puts 'Email failed!'
+    #   }
     #
     # Sending generated emails (using mailfactory)
     #
-    #  mail = MailFactory.new
-    #  mail.to = 'someone@site.co'
-    #  mail.from = 'me@site.com'
-    #  mail.subject = 'hi!'
-    #  mail.text = 'hello world'
-    #  mail.html = '<h1>hello world</h1>'
+    #   mail = MailFactory.new
+    #   mail.to = 'someone@site.co'
+    #   mail.from = 'me@site.com'
+    #   mail.subject = 'hi!'
+    #   mail.text = 'hello world'
+    #   mail.html = '<h1>hello world</h1>'
     #
-    #  email = EM::P::SmtpClient.send(
-    #    :domain=>'site.com',
-    #    :from=>mail.from,
-    #    :to=>mail.to,
-    #    :content=>"#{mail.to_s}\r\n.\r\n"
-    #  )
+    #   email = EM::P::SmtpClient.send(
+    #     :domain=>'site.com',
+    #     :from=>mail.from,
+    #     :to=>mail.to,
+    #     :content=>"#{mail.to_s}\r\n.\r\n"
+    #   )
     #
     class SmtpClient < Connection
       include EventMachine::Deferrable

data/lib/em/threaded_resource.rb

@@ -29,7 +29,7 @@ module EventMachine
   #
   #    # If we don't care about the result:
   #    pool.perform do |dispatcher|
-  #      # The following blcok executes inside a dedicated thread, and should not
+  #      # The following block executes inside a dedicated thread, and should not
   #      # access EventMachine things:
   #      dispatcher.dispatch do |cassandra|
   #        cassandra.insert(:Things, '10', 'stuff' => 'things')

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.0.beta.4"
+  VERSION = "1.0.0.rc.1"
 end

data/lib/eventmachine.rb

@@ -82,7 +82,8 @@ module EventMachine
   @reactor_running = false
   @next_tick_queue = []
   @tails = []
-  @threadpool = nil
+  @threadpool = @threadqueue = @resultqueue = nil
+  @all_threads_spawned = false
 
   # System errnos
   # @private
@@ -155,7 +156,13 @@ module EventMachine
     # will start without release_machine being called and will immediately throw
 
     #
-
+    if reactor_running? and @reactor_pid != Process.pid
+      # Reactor was started in a different parent, meaning we have forked.
+      # Clean up reactor state so a new reactor boots up in this child.
+      stop_event_loop
+      release_machine
+      @reactor_running = false
+    end
 
     tail and @tails.unshift(tail)
 
@@ -169,6 +176,7 @@ module EventMachine
       @next_tick_queue ||= []
       @tails ||= []
       begin
+        @reactor_pid = Process.pid
         @reactor_running = true
         initialize_event_machine
         (b = blk || block) and add_timer(0, b)
@@ -201,6 +209,7 @@ module EventMachine
             @threadqueue = nil
             @resultqueue = nil
             @threadpool = nil
+            @all_threads_spawned = false
           end
 
           @next_tick_queue = []
@@ -252,7 +261,7 @@ module EventMachine
       if self.reactor_running?
         self.stop_event_loop
         self.release_machine
-        self.instance_variable_set( '@reactor_running', false )
+        @reactor_running = false
       end
       self.run block
     end
@@ -425,7 +434,8 @@ module EventMachine
   # that you must define. When the network server that is started by
   # start_server accepts a new connection, it instantiates a new
   # object of an anonymous class that is inherited from {EventMachine::Connection},
-  # *into which your handler module have been included*.
+  # *into which your handler module have been included*. Arguments passed into start_server
+  # after the class name are passed into the constructor during the instantiation.
   #
   # Your handler module may override any of the methods in {EventMachine::Connection},
   # such as {EventMachine::Connection#receive_data}, in order to implement the specific behavior
@@ -736,6 +746,7 @@ module EventMachine
     c = klass.new s, *args
 
     c.instance_variable_set(:@io, io)
+    c.instance_variable_set(:@watch_mode, watch_mode)
     c.instance_variable_set(:@fd, fd)
 
     @conns[s] = c
@@ -761,7 +772,11 @@ module EventMachine
     #raise "still connected" if @conns.has_key?(handler.signature)
     return handler if @conns.has_key?(handler.signature)
 
-    s = connect_server server, port
+    s = if port
+          connect_server server, port
+        else
+          connect_unix_server server
+        end
     handler.signature = s
     @conns[s] = handler
     block_given? and yield handler
@@ -936,10 +951,21 @@ module EventMachine
       cback.call result if cback
     end
 
-    @next_tick_mutex.synchronize do
-      jobs, @next_tick_queue = @next_tick_queue, []
-      jobs
-    end.each { |j| j.call }
+    # Capture the size at the start of this tick...
+    size = @next_tick_mutex.synchronize { @next_tick_queue.size }
+    size.times do |i|
+      callback = @next_tick_mutex.synchronize { @next_tick_queue.shift }
+      begin
+        callback.call
+      ensure
+        # This is a little nasty. The problem is, if an exception occurs during
+        # the callback, then we need to send a signal to the reactor to actually
+        # do some work during the next_tick. The only mechanism we have from the
+        # ruby side is next_tick itself, although ideally, we'd just drop a byte
+        # on the loopback descriptor.
+        EM.next_tick {} if $!
+      end
+    end
   end
 
 
@@ -991,7 +1017,6 @@ module EventMachine
     # has no constructor.
 
     unless @threadpool
-      require 'thread'
       @threadpool = []
       @threadqueue = ::Queue.new
       @resultqueue = ::Queue.new
@@ -1016,6 +1041,19 @@ module EventMachine
       end
       @threadpool << thread
     end
+    @all_threads_spawned = true
+  end
+
+  ##
+  # Returns +true+ if all deferred actions are done executing and their
+  # callbacks have been fired.
+  #
+  def self.defers_finished?
+    return false if @threadpool and !@all_threads_spawned
+    return false if @threadqueue and not @threadqueue.empty?
+    return false if @resultqueue and not @resultqueue.empty?
+    return false if @threadpool and @threadqueue.num_waiting != @threadpool.size
+    return true
   end
 
   class << self
@@ -1391,11 +1429,19 @@ module EventMachine
     if opcode == ConnectionUnbound
       if c = @conns.delete( conn_binding )
         begin
-          if c.original_method(:unbind).arity == 1
+          if c.original_method(:unbind).arity != 0
             c.unbind(data == 0 ? nil : EventMachine::ERRNOS[data])
           else
             c.unbind
           end
+          # If this is an attached (but not watched) connection, close the underlying io object.
+          if c.instance_variable_defined?(:@io) and !c.instance_variable_get(:@watch_mode)
+            io = c.instance_variable_get(:@io)
+            begin
+              io.close
+            rescue Errno::EBADF, IOError
+            end
+          end
         rescue
           @wrapped_exception = $!
           stop