eventmachine 1.0.0.beta.4-java → 1.0.0-java

data/ext/fastfilereader/extconf.rb

@@ -17,7 +17,7 @@ add_define 'BUILD_FOR_RUBY'
 # Minor platform details between *nix and Windows:
 
 if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
-  GNU_CHAIN = $1 == 'mingw'
+  GNU_CHAIN = ENV['CROSS_COMPILING'] or $1 == 'mingw'
   OS_WIN32 = true
   add_define "OS_WIN32"
 else
@@ -26,6 +26,15 @@ else
   add_define 'OS_UNIX'
 end
 
+# Adjust number of file descriptors (FD) on Windows
+
+if RbConfig::CONFIG["host_os"] =~ /mingw/
+  found = RbConfig::CONFIG.values_at("CFLAGS", "CPPFLAGS").
+    any? { |v| v.include?("FD_SETSIZE") }
+
+  add_define "FD_SETSIZE=32767" unless found
+end
+
 # Main platform invariances:
 
 case RUBY_PLATFORM
@@ -77,9 +86,18 @@ when /aix/
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared -Wl,-G"
 
+when /cygwin/
+  # For rubies built with Cygwin, CXX may be set to CC, which is just
+  # a wrapper for gcc.
+  # This will compile, but it will not link to the C++ std library.
+  # Explicitly set CXX to use g++.
+  CONFIG['CXX'] = "g++"
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) -shared"
+
 else
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 end
 
-create_makefile "fastfilereaderext"
+create_makefile "fastfilereaderext"

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

@@ -233,7 +233,7 @@ static VALUE t_add_oneshot_timer (VALUE self, VALUE interval)
 {
 	const unsigned long f = evma_install_oneshot_timer (FIX2INT (interval));
 	if (!f)
-		rb_raise (rb_eRuntimeError, "ran out of timers; use #set_max_timers to increase limit");
+		rb_raise (rb_eRuntimeError, "%s", "ran out of timers; use #set_max_timers to increase limit");
 	return ULONG2NUM (f);
 }
 
@@ -246,7 +246,7 @@ static VALUE t_start_server (VALUE self, VALUE server, VALUE port)
 {
 	const unsigned long f = evma_create_tcp_server (StringValuePtr(server), FIX2INT(port));
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no acceptor (port is in use or requires root privileges)");
+		rb_raise (rb_eRuntimeError, "%s", "no acceptor (port is in use or requires root privileges)");
 	return ULONG2NUM (f);
 }
 
@@ -269,7 +269,7 @@ static VALUE t_start_unix_server (VALUE self, VALUE filename)
 {
 	const unsigned long f = evma_create_unix_domain_server (StringValuePtr(filename));
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no unix-domain acceptor");
+		rb_raise (rb_eRuntimeError, "%s", "no unix-domain acceptor");
 	return ULONG2NUM (f);
 }
 
@@ -504,10 +504,10 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 	try {
 		const unsigned long f = evma_connect_to_server (NULL, 0, StringValuePtr(server), NUM2INT(port));
 		if (!f)
-			rb_raise (EM_eConnectionError, "no connection");
+			rb_raise (EM_eConnectionError, "%s", "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;
 }
@@ -525,10 +525,10 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 	try {
 		const unsigned long f = evma_connect_to_server (StringValuePtr(bind_addr), NUM2INT(bind_port), StringValuePtr(server), NUM2INT(port));
 		if (!f)
-			rb_raise (EM_eConnectionError, "no connection");
+			rb_raise (EM_eConnectionError, "%s", "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;
 }
@@ -541,7 +541,7 @@ static VALUE t_connect_unix_server (VALUE self, VALUE serversocket)
 {
 	const unsigned long f = evma_connect_to_unix_server (StringValuePtr(serversocket));
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no connection");
+		rb_raise (rb_eRuntimeError, "%s", "no connection");
 	return ULONG2NUM (f);
 }
 
@@ -553,7 +553,7 @@ static VALUE t_attach_fd (VALUE self, VALUE file_descriptor, VALUE watch_mode)
 {
 	const unsigned long f = evma_attach_fd (NUM2INT(file_descriptor), watch_mode == Qtrue);
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no connection");
+		rb_raise (rb_eRuntimeError, "%s", "no connection");
 	return ULONG2NUM (f);
 }
 
@@ -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
 *****************/
@@ -694,7 +703,7 @@ static VALUE t_open_udp_socket (VALUE self, VALUE server, VALUE port)
 {
 	const unsigned long f = evma_open_datagram_socket (StringValuePtr(server), FIX2INT(port));
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no datagram socket");
+		rb_raise (rb_eRuntimeError, "%s", "no datagram socket");
 	return ULONG2NUM (f);
 }
 
@@ -796,7 +805,7 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 		int len = RARRAY (cmd)->len;
 	#endif
 	if (len >= 2048)
-		rb_raise (rb_eRuntimeError, "too many arguments to popen");
+		rb_raise (rb_eRuntimeError, "%s", "too many arguments to popen");
 	char *strings [2048];
 	for (int i=0; i < len; i++) {
 		VALUE ix = INT2FIX (i);
@@ -825,7 +834,7 @@ static VALUE t_read_keyboard (VALUE self)
 {
 	const unsigned long f = evma_open_keyboard();
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no keyboard reader");
+		rb_raise (rb_eRuntimeError, "%s", "no keyboard reader");
 	return ULONG2NUM (f);
 }
 
@@ -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;
 }
@@ -912,7 +921,7 @@ t__epoll_set
 static VALUE t__epoll_set (VALUE self, VALUE val)
 {
 	if (t__epoll_p(self) == Qfalse)
-		rb_raise (EM_eUnsupported, "epoll is not supported on this platform");
+		rb_raise (EM_eUnsupported, "%s", "epoll is not supported on this platform");
 
 	evma_set_epoll (val == Qtrue ? 1 : 0);
 	return val;
@@ -949,7 +958,7 @@ t__kqueue_set
 static VALUE t__kqueue_set (VALUE self, VALUE val)
 {
 	if (t__kqueue_p(self) == Qfalse)
-		rb_raise (EM_eUnsupported, "kqueue is not supported on this platform");
+		rb_raise (EM_eUnsupported, "%s", "kqueue is not supported on this platform");
 
 	evma_set_kqueue (val == Qtrue ? 1 : 0);
 	return val;
@@ -987,7 +996,7 @@ static VALUE t_send_file_data (VALUE self, VALUE signature, VALUE filename)
 
 	int b = evma_send_file_data_to_connection (NUM2ULONG (signature), StringValuePtr(filename));
 	if (b == -1)
-		rb_raise(rb_eRuntimeError, "File too large.  send_file_data() supports files under 32k.");
+		rb_raise(rb_eRuntimeError, "%s", "File too large.  send_file_data() supports files under 32k.");
 	if (b > 0) {
 		char *err = strerror (b);
 		char buf[1024];
@@ -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