eventmachine 1.0.4 → 1.0.5

data/.travis.yml

@@ -1,5 +1,9 @@
-script: rake compile test
+script: bundle exec rake compile test
+env:
+  global:
+    - TESTOPTS=-v
 language: ruby
+sudo: false
 rvm:
   - 1.8.7
   - 1.9.3
@@ -8,3 +12,10 @@ rvm:
   - 2.2
   - rbx
   - jruby
+matrix:
+  allow_failures:
+    - rvm: rbx
+    - rvm: jruby
+  include:
+    - rvm: 2.0.0
+      os: osx

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.0.5 (February 2, 2015)
+* use monotonic clocks on Linux, OS X, Solaris, and Windows [#563]
+* use the rb_fd_* API to get autosized fd_sets [#502]
+* add basic tests that the DNS resolver isn't leaking timers [#571]
+* update to test-unit 2.x and improve various unit tests [#551]
+* remove EventMachine_t::Popen code marked by ifdef OBSOLETE [#551]
+* ruby 2.0 may fail at Queue.pop, so rescue and complain to $stderr [#551]
+* set file handle to INVALID_HANDLE_VALUE after closing the file [#565]
+* use `defined?` instead of rescuing NameError for flow control [#535]
+* fix closing files and sockets on Windows [#564]
+* fix file uploads in Windows [#562]
+* catch failure to fork [#539]
+* use chunks for SSL write [#545]
+
 ## 1.0.4 (December 19, 2014)
 * add starttls_options to smtp server [#552]
 * fix closesocket on windows [#497]

data/eventmachine.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
 
+  s.add_development_dependency 'test-unit', '~> 2.0'
   s.add_development_dependency 'rake-compiler', '~> 0.8.3'
   s.add_development_dependency 'yard', ">= 0.8.5.2"
   s.add_development_dependency 'bluecloth' unless RUBY_PLATFORM =~ /java/

data/ext/cmain.cpp

@@ -762,8 +762,11 @@ extern "C" int evma_send_file_data_to_connection (const unsigned long binding, c
 
 	ensure_eventmachine("evma_send_file_data_to_connection");
 
+#if defined(OS_WIN32)
+	int Fd = open (filename, O_RDONLY|O_BINARY);
+#else
 	int Fd = open (filename, O_RDONLY);
-
+#endif
 	if (Fd < 0)
 		return errno;
 	// From here on, all early returns MUST close Fd.
@@ -785,7 +788,6 @@ extern "C" int evma_send_file_data_to_connection (const unsigned long binding, c
 		return -1;
 	}
 
-
 	r = read (Fd, data, filesize);
 	if (r != filesize) {
 		int e = errno;

data/ext/ed.cpp

@@ -566,11 +566,25 @@ int ConnectionDescriptor::SendOutboundData (const char *data, int length)
 	#ifdef WITH_SSL
 	if (SslBox) {
 		if (length > 0) {
-			int w = SslBox->PutPlaintext (data, length);
-			if (w < 0)
-				ScheduleClose (false);
-			else
-				_DispatchCiphertext();
+			int writed = 0;
+			char *p = (char*)data;
+
+			while (writed < length) {
+				int to_write = SSLBOX_INPUT_CHUNKSIZE;
+				int remaining = length - writed;
+
+				if (remaining < SSLBOX_INPUT_CHUNKSIZE)
+					to_write = remaining;
+
+				int w = SslBox->PutPlaintext (p, to_write);
+				if (w < 0) {
+					ScheduleClose (false);
+				}else
+					_DispatchCiphertext();
+
+				p += to_write;
+				writed += to_write;
+			}
 		}
 		// TODO: What's the correct return value?
 		return 1; // That's a wild guess, almost certainly wrong.
@@ -602,7 +616,6 @@ int ConnectionDescriptor::_SendRawOutboundData (const char *data, int length)
 
 	if (IsCloseScheduled())
 		return 0;
-
 	// 25Mar10: Ignore 0 length packets as they are not meaningful in TCP (as opposed to UDP)
 	// and can cause the assert(nbytes>0) to fail when OutboundPages has a bunch of 0 length pages.
 	if (length == 0)
@@ -1226,7 +1239,7 @@ void ConnectionDescriptor::_DispatchCiphertext()
 	assert (SslBox);
 
 
-	char BigBuf [2048];
+	char BigBuf [SSLBOX_OUTPUT_CHUNKSIZE];
 	bool did_work;
 
 	do {

data/ext/em.cpp

@@ -85,6 +85,11 @@ EventMachine_t::EventMachine_t (EMCallback event_callback):
 	Quantum.tv_sec = 0;
 	Quantum.tv_usec = 90000;
 
+	/* Initialize monotonic timekeeping on OS X before the first call to GetRealTime */
+	#ifdef OS_DARWIN
+	(void) mach_timebase_info(&mach_timebase);
+	#endif
+
 	// Make sure the current loop time is sane, in case we do any initializations of
 	// objects before we start running.
 	_UpdateTime();
@@ -352,16 +357,49 @@ void EventMachine_t::_UpdateTime()
 EventMachine_t::GetRealTime
 ***************************/
 
+// Two great writeups of cross-platform monotonic time are at:
+// http://www.python.org/dev/peps/pep-0418
+// http://nadeausoftware.com/articles/2012/04/c_c_tip_how_measure_elapsed_real_time_benchmarking
+// Uncomment the #pragma messages to confirm which compile-time option was used
 uint64_t EventMachine_t::GetRealTime()
 {
 	uint64_t current_time;
 
-	#if defined(OS_UNIX)
+	#if defined(HAVE_CONST_CLOCK_MONOTONIC_RAW)
+	// #pragma message "GetRealTime: clock_gettime CLOCK_MONOTONIC_RAW"
+	// Linux 2.6.28 and above
+	struct timespec tv;
+	clock_gettime (CLOCK_MONOTONIC_RAW, &tv);
+	current_time = (((uint64_t)(tv.tv_sec)) * 1000000LL) + ((uint64_t)((tv.tv_nsec)/1000));
+
+	#elif defined(HAVE_CONST_CLOCK_MONOTONIC)
+	// #pragma message "GetRealTime: clock_gettime CLOCK_MONOTONIC"
+	// Linux, FreeBSD 5.0 and above, Solaris 8 and above, OpenBSD, NetBSD, DragonflyBSD
+	struct timespec tv;
+	clock_gettime (CLOCK_MONOTONIC, &tv);
+	current_time = (((uint64_t)(tv.tv_sec)) * 1000000LL) + ((uint64_t)((tv.tv_nsec)/1000));
+
+	#elif defined(HAVE_GETHRTIME)
+	// #pragma message "GetRealTime: gethrtime"
+	// Solaris and HP-UX
+	current_time = (uint64_t)gethrtime() / 1000;
+
+	#elif defined(OS_DARWIN)
+	// #pragma message "GetRealTime: mach_absolute_time"
+	// Mac OS X
+	// https://developer.apple.com/library/mac/qa/qa1398/_index.html
+	current_time = mach_absolute_time() * mach_timebase.numer / mach_timebase.denom / 1000;
+
+	#elif defined(OS_UNIX)
+	// #pragma message "GetRealTime: gettimeofday"
+	// Unix fallback
 	struct timeval tv;
 	gettimeofday (&tv, NULL);
 	current_time = (((uint64_t)(tv.tv_sec)) * 1000000LL) + ((uint64_t)(tv.tv_usec));
 
 	#elif defined(OS_WIN32)
+	// #pragma message "GetRealTime: GetTickCount"
+	// Future improvement: use GetTickCount64 in Windows Vista / Server 2008
 	unsigned tick = GetTickCount();
 	if (tick < LastTickCount)
 		TickCountTickover += 1;
@@ -370,6 +408,8 @@ uint64_t EventMachine_t::GetRealTime()
 	current_time *= 1000; // convert to microseconds
 
 	#else
+	// #pragma message "GetRealTime: time"
+	// Universal fallback
 	current_time = (uint64_t)time(NULL) * 1000000LL;
 	#endif
 
@@ -536,12 +576,12 @@ void EventMachine_t::_RunEpollOnce()
 	#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
 	if ((ret = rb_wait_for_single_fd(epfd, RB_WAITFD_IN|RB_WAITFD_PRI, &tv)) < 1) {
 	#else
-	fd_set fdreads;
+	rb_fdset_t fdreads;
 
-	FD_ZERO(&fdreads);
-	FD_SET(epfd, &fdreads);
+	rb_fd_init(&fdreads);
+	rb_fd_set(epfd, &fdreads);
 
-	if ((ret = rb_thread_select(epfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+	if ((ret = rb_thread_fd_select(epfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
 	#endif
 		if (ret == -1) {
 			assert(errno != EINVAL);
@@ -613,12 +653,12 @@ void EventMachine_t::_RunKqueueOnce()
 	#ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
 	if ((ret = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN|RB_WAITFD_PRI, &tv)) < 1) {
 	#else
-	fd_set fdreads;
+	rb_fdset_t fdreads;
 
-	FD_ZERO(&fdreads);
-	FD_SET(kqfd, &fdreads);
+	rb_fd_init(&fdreads);
+	rb_fd_set(kqfd, &fdreads);
 
-	if ((ret = rb_thread_select(kqfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+	if ((ret = rb_thread_fd_select(kqfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
 	#endif
 		if (ret == -1) {
 			assert(errno != EINVAL);
@@ -806,9 +846,9 @@ SelectData_t::SelectData_t
 SelectData_t::SelectData_t()
 {
 	maxsocket = 0;
-	FD_ZERO (&fdreads);
-	FD_ZERO (&fdwrites);
-	FD_ZERO (&fderrors);
+	rb_fd_init (&fdreads);
+	rb_fd_init (&fdwrites);
+	rb_fd_init (&fderrors);
 }
 
 
@@ -821,7 +861,7 @@ _SelectDataSelect
 static VALUE _SelectDataSelect (void *v)
 {
 	SelectData_t *sd = (SelectData_t*)v;
-	sd->nSockets = select (sd->maxsocket+1, &(sd->fdreads), &(sd->fdwrites), &(sd->fderrors), &(sd->tv));
+	sd->nSockets = rb_fd_select (sd->maxsocket+1, &(sd->fdreads), &(sd->fdwrites), &(sd->fderrors), &(sd->tv));
 	return Qnil;
 }
 #endif
@@ -863,9 +903,9 @@ void EventMachine_t::_RunSelectOnce()
 
 	SelectData_t SelectData;
 	/*
-	fd_set fdreads, fdwrites;
-	FD_ZERO (&fdreads);
-	FD_ZERO (&fdwrites);
+	rb_fdset_t fdreads, fdwrites;
+	rb_fd_init (&fdreads);
+	rb_fd_init (&fdwrites);
 
 	int maxsocket = 0;
 	*/
@@ -875,7 +915,7 @@ void EventMachine_t::_RunSelectOnce()
 	// running on localhost with a randomly-chosen port. (*Puke*)
 	// Windows has a version of the Unix pipe() library function, but it doesn't
 	// give you back descriptors that are selectable.
-	FD_SET (LoopBreakerReader, &(SelectData.fdreads));
+	rb_fd_set (LoopBreakerReader, &(SelectData.fdreads));
 	if (SelectData.maxsocket < LoopBreakerReader)
 		SelectData.maxsocket = LoopBreakerReader;
 
@@ -890,15 +930,15 @@ void EventMachine_t::_RunSelectOnce()
 		assert (sd != INVALID_SOCKET);
 
 		if (ed->SelectForRead())
-			FD_SET (sd, &(SelectData.fdreads));
+			rb_fd_set (sd, &(SelectData.fdreads));
 		if (ed->SelectForWrite())
-			FD_SET (sd, &(SelectData.fdwrites));
+			rb_fd_set (sd, &(SelectData.fdwrites));
 
 		#ifdef OS_WIN32
 		/* 21Sep09: on windows, a non-blocking connect() that fails does not come up as writable.
 		   Instead, it is added to the error set. See http://www.mail-archive.com/openssl-users@openssl.org/msg58500.html
 		*/
-		FD_SET (sd, &(SelectData.fderrors));
+		rb_fd_set (sd, &(SelectData.fderrors));
 		#endif
 
 		if (SelectData.maxsocket < sd)
@@ -933,15 +973,15 @@ void EventMachine_t::_RunSelectOnce()
 					continue;
 				assert (sd != INVALID_SOCKET);
 
-				if (FD_ISSET (sd, &(SelectData.fdwrites)))
+				if (rb_fd_isset (sd, &(SelectData.fdwrites)))
 					ed->Write();
-				if (FD_ISSET (sd, &(SelectData.fdreads)))
+				if (rb_fd_isset (sd, &(SelectData.fdreads)))
 					ed->Read();
-				if (FD_ISSET (sd, &(SelectData.fderrors)))
+				if (rb_fd_isset (sd, &(SelectData.fderrors)))
 					ed->HandleError();
 			}
 
-			if (FD_ISSET (LoopBreakerReader, &(SelectData.fdreads)))
+			if (rb_fd_isset (LoopBreakerReader, &(SelectData.fdreads)))
 				_ReadLoopBreaker();
 		}
 		else if (s < 0) {
@@ -979,11 +1019,11 @@ void EventMachine_t::_CleanBadDescriptors()
 		tv.tv_sec = 0;
 		tv.tv_usec = 0;
 
-		fd_set fds;
-		FD_ZERO(&fds);
-		FD_SET(sd, &fds);
+		rb_fdset_t fds;
+		rb_fd_init(&fds);
+		rb_fd_set(sd, &fds);
 
-		int ret = select(sd + 1, &fds, NULL, NULL, &tv);
+		int ret = rb_fd_select(sd + 1, &fds, NULL, NULL, &tv);
 
 		if (ret == -1) {
 			if (errno == EBADF)
@@ -1923,47 +1963,6 @@ const unsigned long EventMachine_t::AttachSD (int sd_accept)
 }
 
 
-/*********************
-EventMachine_t::Popen
-*********************/
-#if OBSOLETE
-const char *EventMachine_t::Popen (const char *cmd, const char *mode)
-{
-	#ifdef OS_WIN32
-	throw std::runtime_error ("popen is currently unavailable on this platform");
-	#endif
-
-	// The whole rest of this function is only compiled on Unix systems.
-	// Eventually we need this functionality (or a full-duplex equivalent) on Windows.
-	#ifdef OS_UNIX
-	const char *output_binding = NULL;
-
-	FILE *fp = popen (cmd, mode);
-	if (!fp)
-		return NULL;
-
-	// From here, all early returns must pclose the stream.
-
-	// According to the pipe(2) manpage, descriptors returned from pipe have both
-	// CLOEXEC and NONBLOCK clear. Do NOT set CLOEXEC. DO set nonblocking.
-	if (!SetSocketNonblocking (fileno (fp))) {
-		pclose (fp);
-		return NULL;
-	}
-
-	{ // Looking good.
-		PipeDescriptor *pd = new PipeDescriptor (fp, this);
-		if (!pd)
-			throw std::runtime_error ("unable to allocate pipe");
-		Add (pd);
-		output_binding = pd->GetBinding();
-	}
-
-	return output_binding;
-	#endif
-}
-#endif // OBSOLETE
-
 /**************************
 EventMachine_t::Socketpair
 **************************/

data/ext/em.h

@@ -22,12 +22,7 @@ See the file COPYING for complete licensing information.
 
 #ifdef BUILD_FOR_RUBY
   #include <ruby.h>
-
-  #ifdef HAVE_RB_THREAD_FD_SELECT
-    #define EmSelect rb_thread_fd_select
-  #else
-    #define EmSelect rb_thread_select
-  #endif
+  #define EmSelect rb_thread_fd_select
 
   #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
    #include <ruby/thread.h>
@@ -66,7 +61,31 @@ See the file COPYING for complete licensing information.
     #define RSTRING_LENINT(str) RSTRING_LEN(str)
   #endif
 #else
-  #define EmSelect select
+  #define EmSelect rb_fd_select
+#endif
+
+#ifndef rb_fd_max
+#define fd_check(n) (((n) < FD_SETSIZE) ? 1 : 0*fprintf(stderr, "fd %d too large for select\n", (n)))
+// These definitions are cribbed from include/ruby/intern.h in Ruby 1.9.3,
+// with this change: any macros that read or write the nth element of an
+// fdset first call fd_check to make sure n is in bounds.
+typedef fd_set rb_fdset_t;
+#define rb_fd_zero(f) FD_ZERO(f)
+#define rb_fd_set(n, f) do { if (fd_check(n)) FD_SET((n), (f)); } while(0)
+#define rb_fd_clr(n, f) do { if (fd_check(n)) FD_CLR((n), (f)); } while(0)
+#define rb_fd_isset(n, f) (fd_check(n) ? FD_ISSET((n), (f)) : 0)
+#define rb_fd_copy(d, s, n) (*(d) = *(s))
+#define rb_fd_dup(d, s) (*(d) = *(s))
+#define rb_fd_resize(n, f)  ((void)(f))
+#define rb_fd_ptr(f)  (f)
+#define rb_fd_init(f) FD_ZERO(f)
+#define rb_fd_init_copy(d, s) (*(d) = *(s))
+#define rb_fd_term(f) ((void)(f))
+#define rb_fd_max(f)  FD_SETSIZE
+#define rb_fd_select(n, rfds, wfds, efds, timeout)  \
+  select(fd_check((n)-1) ? (n) : FD_SETSIZE, (rfds), (wfds), (efds), (timeout))
+#define rb_thread_fd_select(n, rfds, wfds, efds, timeout)  \
+  rb_thread_select(fd_check((n)-1) ? (n) : FD_SETSIZE, (rfds), (wfds), (efds), (timeout))
 #endif
 
 class EventableDescriptor;
@@ -213,6 +232,10 @@ class EventMachine_t
 		unsigned LastTickCount;
 		#endif
 
+		#ifdef OS_DARWIN
+		mach_timebase_info_data_t mach_timebase;
+		#endif
+
 	private:
 		bool bTerminateSignalReceived;
 
@@ -243,9 +266,9 @@ struct SelectData_t
 	int _Select();
 
 	int maxsocket;
-	fd_set fdreads;
-	fd_set fdwrites;
-	fd_set fderrors;
+	rb_fdset_t fdreads;
+	rb_fdset_t fdwrites;
+	rb_fdset_t fderrors;
 	timeval tv;
 	int nSockets;
 };

data/ext/extconf.rb

@@ -42,7 +42,7 @@ end
 if ENV['CROSS_COMPILING']
   openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.1i")
   openssl_dir = File.expand_path("~/.rake-compiler/builds/openssl-#{openssl_version}/")
-  if File.exists?(openssl_dir)
+  if File.exist?(openssl_dir)
     FileUtils.mkdir_p Dir.pwd+"/openssl/"
     FileUtils.cp Dir[openssl_dir+"/include/openssl/*.h"], Dir.pwd+"/openssl/", :verbose => true
     FileUtils.cp Dir[openssl_dir+"/lib*.a"], Dir.pwd, :verbose => true
@@ -139,6 +139,8 @@ when /openbsd/
   CONFIG['LDSHAREDXX'] = "$(CXX) -shared -lstdc++ -fPIC"
 
 when /darwin/
+  add_define 'OS_DARWIN'
+
   # on Unix we need a g++ link, not gcc.
   # Ff line contributed by Daniel Harple.
   CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
@@ -166,6 +168,14 @@ else
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 end
 
+# Platform-specific time functions
+if have_func('clock_gettime')
+  # clock_gettime is POSIX, but the monotonic clocks are not
+  have_const('CLOCK_MONOTONIC_RAW', 'time.h') # Linux
+  have_const('CLOCK_MONOTONIC', 'time.h') # Linux, Solaris, BSDs
+else
+  have_func('gethrtime') # Older Solaris and HP-UX
+end
 
 # solaris c++ compiler doesn't have make_pair()
 TRY_LINK.sub!('$(CC)', '$(CXX)')

data/ext/fastfilereader/mapper.cpp

@@ -195,7 +195,7 @@ void Mapper_t::Close()
 	}
 	if (hFile != INVALID_HANDLE_VALUE) {
 		CloseHandle (hFile);
-		hMapping = INVALID_HANDLE_VALUE;
+		hFile = INVALID_HANDLE_VALUE;
 	}
 }
 

data/ext/project.h

@@ -78,6 +78,11 @@ typedef int SOCKET;
 #endif
 #endif /* _AIX */
 
+#ifdef OS_DARWIN
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+#endif /* OS_DARWIN */
+
 #endif /* OS_UNIX */
 
 #ifdef OS_WIN32
@@ -85,7 +90,9 @@ typedef int SOCKET;
 // 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
 
+// WIN32_LEAN_AND_MEAN excludes APIs such as Cryptography, DDE, RPC, Shell, and Windows Sockets.
 #define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -93,13 +100,10 @@ typedef int SOCKET;
 #include <fcntl.h>
 #include <assert.h>
 
-#define close closesocket
-
-typedef int socklen_t;
-#ifndef _PID_T_
-#define _PID_T_
-typedef int pid_t;
-#endif /* _PID_T_ */
+// Use the Win32 wrapper library that Ruby owns to be able to close sockets with the close() function
+#define RUBY_EXPORT
+#include <ruby/defines.h>
+#include <ruby/win32.h>
 #endif /* OS_WIN32 */
 
 #if !defined(_MSC_VER) || _MSC_VER > 1500

data/ext/rubymain.cpp

@@ -833,7 +833,12 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 	}
 	strings[len] = NULL;
 
-	const unsigned long f = evma_popen (strings);
+	unsigned long f = 0;
+	try {
+		f = evma_popen (strings);
+	} catch (std::runtime_error e) {
+		f = 0; // raise exception below
+	}
 	if (!f) {
 		char *err = strerror (errno);
 		char buf[100];

data/ext/ssl.cpp

@@ -392,13 +392,16 @@ int SslBox_t::PutPlaintext (const char *buf, int bufsize)
 
 	bool fatal = false;
 	bool did_work = false;
+	int pending =  BIO_pending(pbioWrite);
 
-	while (OutboundQ.HasPages()) {
+	while (OutboundQ.HasPages() && pending < SSLBOX_WRITE_BUFFER_SIZE) {
 		const char *page;
 		int length;
 		OutboundQ.Front (&page, &length);
 		assert (page && (length > 0));
 		int n = SSL_write (pSSL, page, length);
+		pending =  BIO_pending(pbioWrite);
+
 		if (n > 0) {
 			did_work = true;
 			OutboundQ.PopFront();

data/ext/ssl.h

@@ -54,6 +54,10 @@ class SslContext_t
 class SslBox_t
 **************/
 
+#define SSLBOX_INPUT_CHUNKSIZE 2019
+#define SSLBOX_OUTPUT_CHUNKSIZE 2048
+#define SSLBOX_WRITE_BUFFER_SIZE 8192 // (SSLBOX_OUTPUT_CHUNKSIZE * 4)
+
 class SslBox_t
 {
 	public:

data/lib/em/connection.rb

@@ -409,7 +409,7 @@ module EventMachine
       [priv_key, cert_chain].each do |file|
         next if file.nil? or file.empty?
         raise FileNotFoundException,
-        "Could not find #{file} for start_tls" unless File.exists? file
+        "Could not find #{file} for start_tls" unless File.exist? file
       end
 
       EventMachine::set_tls_parms(@signature, priv_key || '', cert_chain || '', verify_peer)

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/eventmachine.rb

@@ -1042,7 +1042,12 @@ module EventMachine
       thread = Thread.new do
         Thread.current.abort_on_exception = true
         while true
-          op, cback = *@threadqueue.pop
+          begin
+            op, cback = *@threadqueue.pop
+          rescue ThreadError
+            $stderr.puts $!.message
+            break # Ruby 2.0 may fail at Queue.pop
+          end
           result = op.call
           @resultqueue << [result, cback]
           EventMachine.signal_loopbreak
@@ -1521,9 +1526,9 @@ module EventMachine
       raise ArgumentError, "must provide module or subclass of #{klass.name}" unless klass >= handler
       handler
     elsif handler
-      begin
+      if defined?(handler::EM_CONNECTION_CLASS)
         handler::EM_CONNECTION_CLASS
-      rescue NameError
+      else
         handler::const_set(:EM_CONNECTION_CLASS, Class.new(klass) {include handler})
       end
     else

data/rakelib/package.rake

@@ -65,7 +65,7 @@ end
   require "\#{$1}/#{File.basename(t.name, '.rb')}"
       eoruby
     end
-    at_exit{ FileUtils.rm t.name if File.exists?(t.name) }
+    at_exit{ FileUtils.rm t.name if File.exist?(t.name) }
   end
 end
 

data/tests/test_attach.rb

@@ -67,6 +67,7 @@ class TestAttach < Test::Unit::TestCase
   end
 
   def test_attach_server
+    omit_if(jruby?)
     $before = TCPServer.new("127.0.0.1", @port)
     sig     = nil
     EM.run {

data/tests/test_basic.rb

@@ -179,18 +179,15 @@ class TestBasic < Test::Unit::TestCase
     assert x
   end
 
-  if EM.respond_to? :set_heartbeat_interval
-    def test_set_heartbeat_interval
-      interval = 0.5
-      EM.run {
-        EM.set_heartbeat_interval interval
-        $interval = EM.get_heartbeat_interval
-        EM.stop
-      }
-      assert_equal(interval, $interval)
-    end
-  else
-    warn "EM.set_heartbeat_interval not implemented, skipping a test in #{__FILE__}"
+  def test_set_heartbeat_interval
+    omit_if(jruby?)
+    interval = 0.5
+    EM.run {
+      EM.set_heartbeat_interval interval
+      $interval = EM.get_heartbeat_interval
+      EM.stop
+    }
+    assert_equal(interval, $interval)
   end
   
   module PostInitRaiser
@@ -226,6 +223,7 @@ class TestBasic < Test::Unit::TestCase
   end
   
   def test_schedule_close
+    omit_if(jruby?)
     localhost, port = '127.0.0.1', 9000
     timer_ran = false
     num_close_scheduled = nil
@@ -247,22 +245,21 @@ class TestBasic < Test::Unit::TestCase
   end
 
   def test_fork_safe
-    return unless cpid = fork { exit! } rescue false
+    omit_if(jruby?)
 
     read, write = IO.pipe
     EM.run do
-      cpid = fork do
+      fork do
         write.puts "forked"
         EM.run do
           EM.next_tick do
             write.puts "EM ran"
-            exit!
+            EM.stop
           end
         end
       end
       EM.stop
     end
-    Process.waitall
     assert_equal "forked\n", read.readline
     assert_equal "EM ran\n", read.readline
   ensure

data/tests/test_connection_count.rb

@@ -43,6 +43,7 @@ class TestConnectionCount < Test::Unit::TestCase
   end
 
   def test_num_close_scheduled
+    omit_if(jruby?)
     EM.run {
       assert_equal(0, EM.num_close_scheduled)
       EM.connect("127.0.0.1", 9999, DoubleCloseClient) # nothing listening on 9999

data/tests/test_epoll.rb

@@ -25,19 +25,16 @@ class TestEpoll < Test::Unit::TestCase
   end
 
 
-  if windows? || jruby?
-    warn "EM.set_descriptor_table_size not implemented, skipping test in #{__FILE__}"
-  else
-    # We can set the rlimit/nofile of a process but we can only set it
-    # higher if we're running as root.
-    # On most systems, the default value is 1024.
-    def test_rlimit
-      unless EM.set_descriptor_table_size >= 1024
-        a = EM.set_descriptor_table_size
-        assert( a <= 1024 )
-        a = EM.set_descriptor_table_size( 1024 )
-        assert( a == 1024 )
-      end
+  # We can set the rlimit/nofile of a process but we can only set it
+  # higher if we're running as root.
+  # On most systems, the default value is 1024.
+  def test_rlimit
+    omit_if(windows? || jruby?)
+    unless EM.set_descriptor_table_size >= 1024
+      a = EM.set_descriptor_table_size
+      assert( a <= 1024 )
+      a = EM.set_descriptor_table_size( 1024 )
+      assert( a == 1024 )
     end
   end
 
@@ -97,7 +94,7 @@ class TestEpoll < Test::Unit::TestCase
     assert_equal( "abcdefghij", $out )
   end
 
-  # XXX this test fails randomly..
+  # XXX this test fails randomly...
   def _test_unix_domain
     fn = "/tmp/xxx.chain"
     EM.epoll

data/tests/test_iterator.rb

@@ -18,7 +18,7 @@ class TestIterator < Test::Unit::TestCase
       }, proc {EM.stop})
     }
     assert_equal(10, items.keys.size)
-    assert_equal((list).to_a, items.values.flatten)
+    assert_equal(list.to_a.sort, items.values.flatten.sort)
   end
 
   def test_concurrency_bigger_than_list_size
@@ -33,7 +33,7 @@ class TestIterator < Test::Unit::TestCase
       }, proc {EM.stop})
     }
     assert_equal(1, items.keys.size)
-    assert_equal((list).to_a, items.values.flatten)
+    assert_equal(list.to_a.sort, items.values.flatten.sort)
   end
 
 
@@ -56,7 +56,7 @@ class TestIterator < Test::Unit::TestCase
       }
     }
     assert_equal(9, items.keys.size)
-    assert_equal((list).to_a, items.values.flatten)
+    assert_equal(list.to_a.sort, items.values.flatten.sort)
   end
 
   def test_map
@@ -65,7 +65,7 @@ class TestIterator < Test::Unit::TestCase
       EM::Iterator.new(list).map(proc{ |num,iter|
         EM.add_timer(0.01){ iter.return(num) }
       }, proc{ |results|
-        assert_equal((list).to_a.size, results.size)
+        assert_equal(list.to_a.size, results.size)
        EM.stop
       })
     }
@@ -80,7 +80,7 @@ class TestIterator < Test::Unit::TestCase
           iter.return(hash)
         }
       }, proc{ |results|
-        assert_equal(results.keys, list)
+        assert_equal(results.keys.sort, list.sort)
         EM.stop
       })
     }
@@ -94,4 +94,4 @@ class TestIterator < Test::Unit::TestCase
       EM.stop
     }
   end
-end
+end

data/tests/test_kb.rb

@@ -2,33 +2,27 @@ require 'em_test_helper'
 
 class TestKeyboardEvents < Test::Unit::TestCase
 
-  if !jruby?
-    module KbHandler
-      include EM::Protocols::LineText2
-      def receive_line d
-        EM::stop if d == "STOP"
-      end
+  module KbHandler
+    include EM::Protocols::LineText2
+    def receive_line d
+      EM::stop if d == "STOP"
     end
+  end
 
-    # This test doesn't actually do anything useful but is here to
-    # illustrate the usage. If you removed the timer and ran this test
-    # by itself on a console, and then typed into the console, it would
-    # work.
-    # I don't know how to get the test harness to simulate actual keystrokes.
-    # When someone figures that out, then we can make this a real test.
-    #
-    def test_kb
-      EM.run {
-        EM.open_keyboard KbHandler
-        EM::Timer.new(1) { EM.stop }
-      } if $stdout.tty? # don't run the test unless it stands a chance of validity.
-    end
-  else
-    warn "EM.open_keyboard not implemented, skipping tests in #{__FILE__}"
-
-    # Because some rubies will complain if a TestCase class has no tests
-    def test_em_open_keyboard_unsupported
-      assert true
+  # This test doesn't actually do anything useful but is here to
+  # illustrate the usage. If you removed the timer and ran this test
+  # by itself on a console, and then typed into the console, it would
+  # work.
+  # I don't know how to get the test harness to simulate actual keystrokes.
+  # When someone figures that out, then we can make this a real test.
+  #
+  def test_kb
+    omit_if(jruby?)
+    omit_if(!$stdout.tty?) # don't run the test unless it stands a chance of validity.
+    EM.run do
+      EM.open_keyboard KbHandler
+      EM::Timer.new(1) { EM.stop }
     end
   end
+
 end

data/tests/test_many_fds.rb

@@ -0,0 +1,22 @@
+require 'em_test_helper'
+require 'socket'
+
+class TestManyFDs < Test::Unit::TestCase
+  def setup
+    @port = next_port
+  end
+
+  def test_connection_class_cache
+    mod = Module.new
+    a = nil
+    Process.setrlimit(Process::RLIMIT_NOFILE,4096);
+    EM.run {
+      EM.start_server '127.0.0.1', @port, mod
+      1100.times do
+        a = EM.connect '127.0.0.1', @port, mod
+        assert_kind_of EM::Connection, a
+      end
+      EM.stop
+    }
+  end
+end

data/tests/test_process_watch.rb

@@ -27,6 +27,7 @@ if EM.kqueue?
     end
 
     def test_events
+      omit_if(jruby?)
       EM.run{
         # watch ourselves for a fork notification
         EM.watch_process(Process.pid, ParentProcessWatcher)

data/tests/test_processes.rb

@@ -37,8 +37,8 @@ class TestProcesses < Test::Unit::TestCase
       }
 
       assert( $out.length > 0 )
-      assert_equal($status.exitstatus, 0)
-      assert_equal($status.class, Process::Status)
+      assert_equal(0, $status.exitstatus)
+      assert_kind_of(Process::Status, $status)
     end
 
     def test_em_system_pid
@@ -57,8 +57,8 @@ class TestProcesses < Test::Unit::TestCase
       }
 
       assert( $out.length > 0 )
-      assert_equal($status.exitstatus, 0)
-      assert_equal($status.class, Process::Status)
+      assert_equal(0, $status.exitstatus)
+      assert_kind_of(Process::Status, $status)
     end
 
     def test_em_system_with_two_procs
@@ -111,9 +111,9 @@ class TestProcesses < Test::Unit::TestCase
         end
       end
 
-      EM.run{
-        EM.popen('cat /dev/random', test_client)
-      }
+      EM.run do
+        EM.popen('echo 1', test_client)
+      end
 
       assert_equal 1, c_rx
     end

data/tests/test_resolver.rb

@@ -33,7 +33,7 @@ class TestResolver < Test::Unit::TestCase
       d = EM::DNS::Resolver.resolve "google.com"
       d.errback { assert false }
       d.callback { |r|
-        assert_equal(Array, r.class)
+        assert_kind_of(Array, r)
         assert r.size > 1
         EM.stop
       }
@@ -45,11 +45,37 @@ class TestResolver < Test::Unit::TestCase
       d = EM::DNS::Resolver.resolve "localhost"
       d.errback { assert false }
       d.callback { |r|
-        assert_equal("127.0.0.1", r.first)
-        assert_equal(Array, r.class)
+        assert_include(["127.0.0.1", "::1"], r.first)
+        assert_kind_of(Array, r)
 
         EM.stop
       }
     }
   end
-end
+
+  def test_timer_cleanup
+    EM.run {
+      d = EM::DNS::Resolver.resolve "google.com"
+      d.errback { assert false }
+      d.callback { |r|
+        # This isn't a great test, but it's hard to get more canonical
+        # confirmation that the timer is cancelled
+        assert_nil(EM::DNS::Resolver.socket.instance_variable_get(:@timer))
+
+        EM.stop
+      }
+    }
+  end
+
+  def test_failure_timer_cleanup
+    EM.run {
+      d = EM::DNS::Resolver.resolve "asdfasdf"
+      d.callback { assert false }
+      d.errback {
+        assert_nil(EM::DNS::Resolver.socket.instance_variable_get(:@timer))
+
+        EM.stop
+      }
+    }
+  end
+end

data/tests/test_ssl_args.rb

@@ -45,7 +45,7 @@ class TestSslArgs < Test::Unit::TestCase
   def test_tls_params_file_doesnt_exist
     priv_file, cert_file = 'foo_priv_key', 'bar_cert_file'
     [priv_file, cert_file].all? do |f|
-      assert(!File.exists?(f), "Cert file #{f} seems to exist, and should not for the tests")
+      assert(!File.exist?(f), "Cert file #{f} seems to exist, and should not for the tests")
     end
     
     # associate_callback_target is a pain! (build!)
@@ -75,4 +75,4 @@ class TestSslArgs < Test::Unit::TestCase
       assert(false, 'should not have raised an exception')
     end
   end
-end if EM.ssl?
+end if EM.ssl?

data/tests/test_ssl_methods.rb

@@ -3,7 +3,6 @@ require 'em_test_helper'
 class TestSSLMethods < Test::Unit::TestCase
 
   module ServerHandler
-
     def post_init
       start_tls
     end
@@ -12,11 +11,9 @@ class TestSSLMethods < Test::Unit::TestCase
       $server_called_back = true
       $server_cert_value = get_peer_cert
     end
-
   end
 
   module ClientHandler
-
     def post_init
       start_tls
     end
@@ -26,10 +23,10 @@ class TestSSLMethods < Test::Unit::TestCase
       $client_cert_value = get_peer_cert
       EM.stop_event_loop
     end
-
   end
 
   def test_ssl_methods
+    omit_unless(EM.ssl?)
     $server_called_back, $client_called_back = false, false
     $server_cert_value, $client_cert_value = nil, nil
 
@@ -45,4 +42,4 @@ class TestSSLMethods < Test::Unit::TestCase
     assert($client_cert_value.is_a?(String))
   end
 
-end if EM.ssl?
+end

data/tests/test_ssl_verify.rb

@@ -1,82 +1,80 @@
 require 'em_test_helper'
 
-if EM.ssl?
-  class TestSslVerify < Test::Unit::TestCase
-    def setup
-      $dir = File.dirname(File.expand_path(__FILE__)) + '/'
-      $cert_from_file = File.read($dir+'client.crt')
-    end
+class TestSslVerify < Test::Unit::TestCase
+  def setup
+    $dir = File.dirname(File.expand_path(__FILE__)) + '/'
+    $cert_from_file = File.read($dir+'client.crt')
+  end
 
-    module Client
-      def connection_completed
-        start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
-      end
+  module Client
+    def connection_completed
+      start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
+    end
 
-      def ssl_handshake_completed
-        $client_handshake_completed = true
-        close_connection
-      end
+    def ssl_handshake_completed
+      $client_handshake_completed = true
+      close_connection
+    end
 
-      def unbind
-        EM.stop_event_loop
-      end
+    def unbind
+      EM.stop_event_loop
     end
+  end
 
-    module AcceptServer
-      def post_init
-        start_tls(:verify_peer => true)
-      end
+  module AcceptServer
+    def post_init
+      start_tls(:verify_peer => true)
+    end
 
-      def ssl_verify_peer(cert)
-        $cert_from_server = cert
-        true
-      end
+    def ssl_verify_peer(cert)
+      $cert_from_server = cert
+      true
+    end
 
-      def ssl_handshake_completed
-        $server_handshake_completed = true
-      end
+    def ssl_handshake_completed
+      $server_handshake_completed = true
     end
+  end
 
-    module DenyServer
-      def post_init
-        start_tls(:verify_peer => true)
-      end
+  module DenyServer
+    def post_init
+      start_tls(:verify_peer => true)
+    end
 
-      def ssl_verify_peer(cert)
-        $cert_from_server = cert
-        # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
-        false
-      end
+    def ssl_verify_peer(cert)
+      $cert_from_server = cert
+      # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
+      false
+    end
 
-      def ssl_handshake_completed
-        $server_handshake_completed = true
-      end
+    def ssl_handshake_completed
+      $server_handshake_completed = true
     end
+  end
 
-    def test_accept_server
-      $client_handshake_completed, $server_handshake_completed = false, false
-      EM.run {
-        EM.start_server("127.0.0.1", 16784, AcceptServer)
-        EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
-      }
+  def test_accept_server
+    omit_unless(EM.ssl?)
+    $client_handshake_completed, $server_handshake_completed = false, false
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, AcceptServer)
+      EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
+    }
 
-      assert_equal($cert_from_file, $cert_from_server)
-      assert($client_handshake_completed)
-      assert($server_handshake_completed)
-    end
+    assert_equal($cert_from_file, $cert_from_server)
+    assert($client_handshake_completed)
+    assert($server_handshake_completed)
+  end
 
-    def test_deny_server
-      $client_handshake_completed, $server_handshake_completed = false, false
-      EM.run {
-        EM.start_server("127.0.0.1", 16784, DenyServer)
-        EM.connect("127.0.0.1", 16784, Client)
-      }
+  def test_deny_server
+    omit_unless(EM.ssl?)
+    $client_handshake_completed, $server_handshake_completed = false, false
+    EM.run {
+      EM.start_server("127.0.0.1", 16784, DenyServer)
+      EM.connect("127.0.0.1", 16784, Client)
+    }
 
-      assert_equal($cert_from_file, $cert_from_server)
-      assert(!$client_handshake_completed)
-      assert(!$server_handshake_completed)
-    end
+    assert_equal($cert_from_file, $cert_from_server)
+    assert(!$client_handshake_completed)
+    assert(!$server_handshake_completed)
   end
-else
-  warn "EM built without SSL support, skipping tests in #{__FILE__}"
 end

data/tests/test_threaded_resource.rb

@@ -15,6 +15,10 @@ class TestThreadedResource < Test::Unit::TestCase
 
   def test_dispatch_completion
     EM.run do
+      EM.add_timer(3) do
+        EM.stop
+        fail 'Resource dispatch timed out'
+      end
       completion = resource.dispatch do |o|
         o[:foo] = :bar
         :foo
@@ -23,6 +27,10 @@ class TestThreadedResource < Test::Unit::TestCase
         assert_equal :foo, result
         EM.stop
       end
+      completion.errback do |error|
+        EM.stop
+        fail "Unexpected error: #{error.message}"
+      end
     end
     assert_equal :bar, object[:foo]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +256,7 @@ files:
 - tests/test_line_protocol.rb
 - tests/test_ltp.rb
 - tests/test_ltp2.rb
+- tests/test_many_fds.rb
 - tests/test_next_tick.rb
 - tests/test_object_protocol.rb
 - tests/test_pause.rb
@@ -305,4 +322,3 @@ signing_key:
 specification_version: 3
 summary: Ruby/EventMachine library
 test_files: []
-has_rdoc: