sonixlabs-eventmachine-java 1.0.0.rc.7-java → 1.0.3.1-java

checksums.yaml

@@ -1,15 +1,7 @@
 ---
 SHA1:
-  metadata.gz: !binary |-
-    MTcxNDk5YWVjZDU4NjU2NzgyMzU5ZjBiNGExYmEyN2RiMDEyMDRmYg==
-  data.tar.gz: !binary |-
-    NDA4OGUxMjA1NzA3ZDdmMTJlODQ2MjcyY2VkM2ViMWIxMDA3M2NhOQ==
+  metadata.gz: 196a510820266752167782d31cc8f8b3d3ed7097
+  data.tar.gz: 8a7360f9dcdbf351eeecae1a386371f1de50a879
 SHA512:
-  metadata.gz: !binary |-
-    YmFmMjRmN2MxZWMwNzEzY2Q1NDZlM2EwNDk2M2M5MTAxMmU0OGRkN2E5ZGVk
-    NTk1ZGE0ZjhiNDk0MzMwODI1NWQzMjhkNjEzNGY1YWEyYjg5YTMxMjY5N2E1
-    YjQ4Njg1ZDVlZGRmMzBkMjYzNzI5NzcwYjk2OWU5YzkzMzljYzA=
-  data.tar.gz: !binary |-
-    MWM1NDY3MzY3ZDA5MWVmMjk1ZWJhZmEwY2Q4OTIxMTEzZjY0YWNjYTM4ZWI4
-    ZTI0ODBlYmEzMjI4YWQwZWQ3ZTVjMzBjMWRlOTY0YWExYTlhYTkzN2U2MWQ0
-    M2IxMWQ1YTc2MTk0YjI4NjU0YmFkNjM3NzU0MTIwMjQ0OWMwYjE=
+  metadata.gz: b04803ccb631b97c9f12818d0b9529f0c79a7b0596e7c0f18a9c72e99f12c4e1683e7528b47c531d0b3d510ebf1d9f64338db99b94c8f88b4de44f5255872f44
+  data.tar.gz: 500b5af57cd9247c169938acef5e9c72babda5d60a6c99aadcacd06d1045146f40867846940a93d22cb1c3e7902f5073bc9d71a7b56d07fddca86aa0c3332bd0

data/.travis.yml

@@ -0,0 +1,12 @@
+script: rake compile test
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - jruby
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+## 1.0.4
+* calling pause from receive_data takes effect immediately [#464]
+* reactor_running? returns false after fork [#455]
+* fix infinite loop on double close [edc4d0e6, #441, #445]
+* fix compilation issue on llvm [#433]
+* fix socket error codes on win32 [ff811a81]
+* fix EM.stop latency when timers exist [8b613d05, #426]
+* fix infinite loop when system time changes [1427a2c80, #428]
+* fix crash when callin attach/detach in the same tick [#427]
+* fix compilation issue on solaris [#416]
+
+## 1.0.3 (March 8, 2013)
+* EM.system was broken in 1.0.2 release [#413]
+
+## 1.0.2 (March 8, 2013)
+* binary win32 gems now include fastfilereader shim [#222]
+* fix long-standing connection timeout issues [27fdd5b, igrigorik/em-http-request#222]
+* http and line protocol cleanups [#193, #151]
+* reactor return value cleanup [#225]
+* fix double require from gemspec [#284]
+* fix smtp server reset behavior [#351]
+* fix EM.system argument handling [#322]
+* ruby 1.9 compat in smtp server and stomp protocols [#349, #315]
+* fix pause from post_init [#380]
+
+## 1.0.1 (February 27, 2013)
+* use rb_wait_for_single_fd() on ruby 2.0 to fix rb_thread_select() deprecation [#363]
+* fix epoll/kqueue mode in ruby 2.0 by removing calls to rb_enable_interrupt() [#248, #389]
+* fix memory leak when verifying ssl cerificates [#403]
+* fix initial connection delay [#393, #374]
+* fix build on windows [#371]

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# About EventMachine #
+# About EventMachine  [![Code Climate](https://codeclimate.com/github/eventmachine/eventmachine.png)](https://codeclimate.com/github/eventmachine/eventmachine)
 
 
 ## What is EventMachine ##
@@ -75,7 +75,7 @@ Here's a fully-functional echo server written with EventMachine:
 
        def unbind
          puts "-- someone disconnected from the echo server!"
-      end
+       end
     end
 
     # Note that this will block current thread.

data/README_JP.md

@@ -8,7 +8,15 @@ JRuby実装のビルドとインストール
     $ jgem build eventmachine.gemspec
 
     // jruby用のgemを作成
-    $ jruby -S rake java gem
+    $ jruby rake java gem
 
     // インストール
-    $ jgem install pkg/sonixlabs-eventmachine-java-1.0.x-java
+    $ jgem install sonixlabs-eventmachine-java-1.0.x-java
+
+    // rubygemsにpush
+    $ gem push sonixlabs-eventmachine-java-1.0.x-java
+
+
+# fork
+
+* jruby_tls: https://github.com/asynchrony/eventmachine/tree/jruby_tls

data/eventmachine.gemspec

@@ -1,22 +1,25 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/em/version', __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
+require "em/version"
+
 
 Gem::Specification.new do |s|
   s.name = 'sonixlabs-eventmachine-java'
   s.version = EventMachine::VERSION
-  s.homepage = 'https://github.com/sonixlabs/eventmachine'
+  s.homepage = 'http://rubyeventmachine.com'
   s.rubyforge_project = 'eventmachine'
   s.platform = 'java' # jruby only
+  s.licenses = ["Ruby", "GPL"]
 
-  s.authors = ["Kazuhiro Yamada"]
-  s.email   = ["sonixlabs@sonix.asia", "yamadakazu45@gmail.com"]
+  s.authors = ["Francis Cianfrocca", "Aman Gupta"]
+  s.email   = ["garbagecat10@gmail.com", "aman@tmm1.net"]
 
   s.files = `git ls-files`.split("\n")
   s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
 
-  s.add_development_dependency 'rake-compiler', '~> 0.8.1'
-  s.add_development_dependency 'yard', ">= 0.7.2"
-  s.add_development_dependency 'bluecloth'
+  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/
 
   s.summary = 'Ruby/EventMachine library'
   s.description = "EventMachine implements a fast, single-threaded engine for arbitrary network

data/ext/binder.cpp

@@ -32,7 +32,7 @@ STATIC Bindable_t::CreateBinding
 unsigned long Bindable_t::CreateBinding()
 {
 	static unsigned long num = 0;
-	while(BindingBag[++num]);
+	while(BindingBag[++num]) {}
 	return num;
 }
 

data/ext/cmain.cpp

@@ -259,6 +259,7 @@ evma_num_close_scheduled
 
 extern "C" int evma_num_close_scheduled ()
 {
+	ensure_eventmachine("evma_num_close_scheduled");
 	return EventMachine->NumCloseScheduled;
 }
 
@@ -282,6 +283,16 @@ extern "C" const unsigned long evma_create_unix_domain_server (const char *filen
 	return EventMachine->CreateUnixDomainServer (filename);
 }
 
+/***********************
+evma_attach_sd
+************************/
+
+extern "C" const unsigned long evma_attach_sd (int sd)
+{
+	ensure_eventmachine("evma_attach_sd");
+	return EventMachine->AttachSD (sd);
+}
+
 /*************************
 evma_open_datagram_socket
 *************************/

data/ext/ed.cpp

@@ -217,6 +217,8 @@ EventableDescriptor::ScheduleClose
 
 void EventableDescriptor::ScheduleClose (bool after_writing)
 {
+	if (IsCloseScheduled())
+		return;
 	MyEventMachine->NumCloseScheduled++;
 	// KEEP THIS SYNCHRONIZED WITH ::IsCloseScheduled.
 	if (after_writing)
@@ -460,6 +462,7 @@ ConnectionDescriptor::SetConnectPending
 void ConnectionDescriptor::SetConnectPending(bool f)
 {
 	bConnectPending = f;
+	MyEventMachine->QueueHeartbeat(this);
 	_UpdateEvents();
 }
 
@@ -764,7 +767,11 @@ void ConnectionDescriptor::Read()
 		
 
 		int r = read (sd, readbuffer, sizeof(readbuffer) - 1);
+#ifdef OS_WIN32
+		int e = WSAGetLastError();
+#else
 		int e = errno;
+#endif
 		//cerr << "<R:" << r << ">";
 
 		if (r > 0) {
@@ -778,6 +785,8 @@ void ConnectionDescriptor::Read()
 			// a security guard against buffer overflows.
 			readbuffer [r] = 0;
 			_DispatchInboundData (readbuffer, r);
+			if (bPaused)
+				break;
 		}
 		else if (r == 0) {
 			break;
@@ -980,11 +989,7 @@ void ConnectionDescriptor::_WriteOutboundData()
 	// Max of 16 outbound pages at a time
 	if (iovcnt > 16) iovcnt = 16;
 
-	#ifdef CC_SUNWspro
-	struct iovec iov[16];
-	#else
-	struct iovec iov[ iovcnt ];
-	#endif
+	iovec iov[16];
 
 	for(int i = 0; i < iovcnt; i++){
 		OutboundPage *op = &(OutboundPages[i]);
@@ -1031,7 +1036,11 @@ void ConnectionDescriptor::_WriteOutboundData()
 	#endif
 
 	bool err = false;
+#ifdef OS_WIN32
+	int e = WSAGetLastError();
+#else
 	int e = errno;
+#endif
 	if (bytes_written < 0) {
 		err = true;
 		bytes_written = 0;
@@ -1445,14 +1454,16 @@ void AcceptorDescriptor::Read()
 			(*EventCallback) (GetBinding(), EM_CONNECTION_ACCEPTED, NULL, cd->GetBinding());
 		}
 		#ifdef HAVE_EPOLL
-		cd->GetEpollEvent()->events = EPOLLIN | (cd->SelectForWrite() ? EPOLLOUT : 0);
+		cd->GetEpollEvent()->events =
+			(cd->SelectForRead() ? EPOLLIN : 0) | (cd->SelectForWrite() ? EPOLLOUT : 0);
 		#endif
 		assert (MyEventMachine);
 		MyEventMachine->Add (cd);
 		#ifdef HAVE_KQUEUE
 		if (cd->SelectForWrite())
 			MyEventMachine->ArmKqueueWriter (cd);
-		MyEventMachine->ArmKqueueReader (cd);
+		if (cd->SelectForRead())
+			MyEventMachine->ArmKqueueReader (cd);
 		#endif
 	}
 
@@ -1660,7 +1671,11 @@ void DatagramDescriptor::Write()
 
 		// The nasty cast to (char*) is needed because Windows is brain-dead.
 		int s = sendto (sd, (char*)op->Buffer, op->Length, 0, (struct sockaddr*)&(op->From), sizeof(op->From));
+#ifdef OS_WIN32
+		int e = WSAGetLastError();
+#else
 		int e = errno;
+#endif
 
 		OutboundDataSize -= op->Length;
 		op->Free();

data/ext/ed.h

@@ -69,14 +69,14 @@ class EventableDescriptor: public Bindable_t
 		virtual bool GetSubprocessPid (pid_t*) {return false;}
 
 		virtual void StartTls() {}
-		virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename, bool verify_peer) {}
+		virtual void SetTlsParms (const char *, const char *, bool) {}
 
 		#ifdef WITH_SSL
 		virtual X509 *GetPeerCert() {return NULL;}
 		#endif
 
 		virtual uint64_t GetCommInactivityTimeout() {return 0;}
-		virtual int SetCommInactivityTimeout (uint64_t value) {return 0;}
+		virtual int SetCommInactivityTimeout (uint64_t) {return 0;}
 		uint64_t GetPendingConnectTimeout();
 		int SetPendingConnectTimeout (uint64_t value);
 		uint64_t GetLastActivity() { return LastActivity; }
@@ -215,7 +215,7 @@ class ConnectionDescriptor: public EventableDescriptor
 	protected:
 		struct OutboundPage {
 			OutboundPage (const char *b, int l, int o=0): Buffer(b), Length(l), Offset(o) {}
-			void Free() {if (Buffer) free ((char*)Buffer); }
+			void Free() {if (Buffer) free (const_cast<char*>(Buffer)); }
 			const char *Buffer;
 			int Length;
 			int Offset;
@@ -292,7 +292,7 @@ class DatagramDescriptor: public EventableDescriptor
 	protected:
 		struct OutboundPage {
 			OutboundPage (const char *b, int l, struct sockaddr_in f, int o=0): Buffer(b), Length(l), Offset(o), From(f) {}
-			void Free() {if (Buffer) free ((char*)Buffer); }
+			void Free() {if (Buffer) free (const_cast<char*>(Buffer)); }
 			const char *Buffer;
 			int Length;
 			int Offset;
@@ -354,7 +354,7 @@ class PipeDescriptor: public EventableDescriptor
 	protected:
 		struct OutboundPage {
 			OutboundPage (const char *b, int l, int o=0): Buffer(b), Length(l), Offset(o) {}
-			void Free() {if (Buffer) free ((char*)Buffer); }
+			void Free() {if (Buffer) free (const_cast<char*>(Buffer)); }
 			const char *Buffer;
 			int Length;
 			int Offset;

data/ext/em.cpp

@@ -382,15 +382,27 @@ EventMachine_t::_DispatchHeartbeats
 
 void EventMachine_t::_DispatchHeartbeats()
 {
+	// Store the first processed heartbeat descriptor and bail out if
+	// we see it again. This fixes an infinite loop in case the system time
+	// is changed out from underneath MyCurrentLoopTime.
+	const EventableDescriptor *head = NULL;
+
 	while (true) {
 		multimap<uint64_t,EventableDescriptor*>::iterator i = Heartbeats.begin();
 		if (i == Heartbeats.end())
 			break;
 		if (i->first > MyCurrentLoopTime)
 			break;
+
 		EventableDescriptor *ed = i->second;
+		if (ed == head)
+			break;
+
 		ed->Heartbeat();
 		QueueHeartbeat(ed);
+
+		if (head == NULL)
+			head = ed;
 	}
 }
 
@@ -482,8 +494,7 @@ void EventMachine_t::Run()
 		_AddNewDescriptors();
 		_ModifyDescriptors();
 
-		if (!_RunOnce())
-			break;
+		_RunOnce();
 		if (bTerminateSignalReceived)
 			break;
 	}
@@ -494,27 +505,24 @@ void EventMachine_t::Run()
 EventMachine_t::_RunOnce
 ************************/
 
-bool EventMachine_t::_RunOnce()
+void EventMachine_t::_RunOnce()
 {
-	bool ret;
 	if (bEpoll)
-		ret = _RunEpollOnce();
+		_RunEpollOnce();
 	else if (bKqueue)
-		ret = _RunKqueueOnce();
+		_RunKqueueOnce();
 	else
-		ret = _RunSelectOnce();
+		_RunSelectOnce();
 	_DispatchHeartbeats();
 	_CleanupSockets();
-	return ret;
 }
 
 
-
 /*****************************
 EventMachine_t::_RunEpollOnce
 *****************************/
 
-bool EventMachine_t::_RunEpollOnce()
+void EventMachine_t::_RunEpollOnce()
 {
 	#ifdef HAVE_EPOLL
 	assert (epfd != -1);
@@ -524,17 +532,22 @@ bool EventMachine_t::_RunEpollOnce()
 
 	#ifdef BUILD_FOR_RUBY
 	int ret = 0;
+
+	#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;
 
 	FD_ZERO(&fdreads);
 	FD_SET(epfd, &fdreads);
 
 	if ((ret = rb_thread_select(epfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+	#endif
 		if (ret == -1) {
 			assert(errno != EINVAL);
 			assert(errno != EBADF);
 		}
-		return true;
+		return;
 	}
 
 	TRAP_BEG;
@@ -572,8 +585,6 @@ bool EventMachine_t::_RunEpollOnce()
 		timeval tv = {0, ((errno == EINTR) ? 5 : 50) * 1000};
 		EmSelect (0, NULL, NULL, NULL, &tv);
 	}
-
-	return true;
 	#else
 	throw std::runtime_error ("epoll is not implemented on this platform");
 	#endif
@@ -584,7 +595,7 @@ bool EventMachine_t::_RunEpollOnce()
 EventMachine_t::_RunKqueueOnce
 ******************************/
 
-bool EventMachine_t::_RunKqueueOnce()
+void EventMachine_t::_RunKqueueOnce()
 {
 	#ifdef HAVE_KQUEUE
 	assert (kqfd != -1);
@@ -598,17 +609,22 @@ bool EventMachine_t::_RunKqueueOnce()
 
 	#ifdef BUILD_FOR_RUBY
 	int ret = 0;
+
+	#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;
 
 	FD_ZERO(&fdreads);
 	FD_SET(kqfd, &fdreads);
 
 	if ((ret = rb_thread_select(kqfd + 1, &fdreads, NULL, NULL, &tv)) < 1) {
+	#endif
 		if (ret == -1) {
 			assert(errno != EINVAL);
 			assert(errno != EBADF);
 		}
-		return true;
+		return;
 	}
 
 	TRAP_BEG;
@@ -659,8 +675,6 @@ bool EventMachine_t::_RunKqueueOnce()
 		rb_thread_schedule();
 	}
 	#endif
-
-	return true;
 	#else
 	throw std::runtime_error ("kqueue is not implemented on this platform");
 	#endif
@@ -673,7 +687,7 @@ EventMachine_t::_TimeTilNextEvent
 
 timeval EventMachine_t::_TimeTilNextEvent()
 {
-	// 29jul11: Changed calculation base from MyCurrentLoopTime to the 
+	// 29jul11: Changed calculation base from MyCurrentLoopTime to the
 	// real time. As MyCurrentLoopTime is set at the beginning of an
 	// iteration and this calculation is done at the end, evenmachine
 	// will potentially oversleep by the amount of time the iteration
@@ -695,10 +709,12 @@ timeval EventMachine_t::_TimeTilNextEvent()
 	if (!NewDescriptors.empty() || !ModifiedDescriptors.empty()) {
 		next_event = current_time;
 	}
-	
+
 	timeval tv;
 
-	if (next_event == 0 || NumCloseScheduled > 0) {
+	if (NumCloseScheduled > 0 || bTerminateSignalReceived) {
+		tv.tv_sec = tv.tv_usec = 0;
+	} else if (next_event == 0) {
 		tv = Quantum;
 	} else {
 		if (next_event > current_time) {
@@ -833,37 +849,17 @@ int SelectData_t::_Select()
 EventMachine_t::_RunSelectOnce
 ******************************/
 
-bool EventMachine_t::_RunSelectOnce()
+void EventMachine_t::_RunSelectOnce()
 {
 	// Crank the event machine once.
 	// If there are no descriptors to process, then sleep
 	// for a few hundred mills to avoid busy-looping.
-	// Return T/F to indicate whether we should continue.
 	// This is based on a select loop. Alternately provide epoll
 	// if we know we're running on a 2.6 kernel.
 	// epoll will be effective if we provide it as an alternative,
 	// however it has the same problem interoperating with Ruby
 	// threads that select does.
 
-	//cerr << "X";
-
-	/* This protection is now obsolete, because we will ALWAYS
-	 * have at least one descriptor (the loop-breaker) to read.
-	 */
-	/*
-	if (Descriptors.size() == 0) {
-		#ifdef OS_UNIX
-		timeval tv = {0, 200 * 1000};
-		EmSelect (0, NULL, NULL, NULL, &tv);
-		return true;
-		#endif
-		#ifdef OS_WIN32
-		Sleep (200);
-		return true;
-		#endif
-	}
-	*/
-
 	SelectData_t SelectData;
 	/*
 	fd_set fdreads, fdwrites;
@@ -965,8 +961,6 @@ bool EventMachine_t::_RunSelectOnce()
 			}
 		}
 	}
-
-	return true;
 }
 
 void EventMachine_t::_CleanBadDescriptors()
@@ -1419,6 +1413,14 @@ int EventMachine_t::DetachFD (EventableDescriptor *ed)
 	// Prevent the descriptor from being modified, in case DetachFD was called from a timer or next_tick
 	ModifiedDescriptors.erase (ed);
 
+	// Prevent the descriptor from being added, in case DetachFD was called in the same tick as AttachFD
+	for (size_t i = 0; i < NewDescriptors.size(); i++) {
+		if (ed == NewDescriptors[i]) {
+			NewDescriptors.erase(NewDescriptors.begin() + i);
+			break;
+		}
+	}
+
 	// Set MySocket = INVALID_SOCKET so ShouldDelete() is true (and the descriptor gets deleted and removed),
 	// and also to prevent anyone from calling close() on the detached fd
 	ed->SetSocketInvalid();
@@ -1511,8 +1513,6 @@ const unsigned long EventMachine_t::CreateTcpServer (const char *server, int por
 	if (!bind_here)
 		return 0;
 
-	unsigned long output_binding = 0;
-
 	//struct sockaddr_in sin;
 
 	int sd_accept = socket (family, SOCK_STREAM, 0);
@@ -1549,25 +1549,7 @@ const unsigned long EventMachine_t::CreateTcpServer (const char *server, int por
 		goto fail;
 	}
 
-	{
-		// Set the acceptor non-blocking.
-		// THIS IS CRUCIALLY IMPORTANT because we read it in a select loop.
-		if (!SetSocketNonblocking (sd_accept)) {
-		//int val = fcntl (sd_accept, F_GETFL, 0);
-		//if (fcntl (sd_accept, F_SETFL, val | O_NONBLOCK) == -1) {
-			goto fail;
-		}
-	}
-
-	{ // Looking good.
-		AcceptorDescriptor *ad = new AcceptorDescriptor (sd_accept, this);
-		if (!ad)
-			throw std::runtime_error ("unable to allocate acceptor");
-		Add (ad);
-		output_binding = ad->GetBinding();
-	}
-
-	return output_binding;
+	return AttachSD(sd_accept);
 
 	fail:
 	if (sd_accept != INVALID_SOCKET)
@@ -1858,7 +1840,6 @@ const unsigned long EventMachine_t::CreateUnixDomainServer (const char *filename
 
 	// The whole rest of this function is only compiled on Unix systems.
 	#ifdef OS_UNIX
-	unsigned long output_binding = 0;
 
 	struct sockaddr_un s_sun;
 
@@ -1896,6 +1877,24 @@ const unsigned long EventMachine_t::CreateUnixDomainServer (const char *filename
 		goto fail;
 	}
 
+	return AttachSD(sd_accept);
+
+	fail:
+	if (sd_accept != INVALID_SOCKET)
+		close (sd_accept);
+	return 0;
+	#endif // OS_UNIX
+}
+
+
+/**************************************
+EventMachine_t::AttachSD
+**************************************/
+
+const unsigned long EventMachine_t::AttachSD (int sd_accept)
+{
+	unsigned long output_binding = 0;
+
 	{
 		// Set the acceptor non-blocking.
 		// THIS IS CRUCIALLY IMPORTANT because we read it in a select loop.
@@ -1920,7 +1919,6 @@ const unsigned long EventMachine_t::CreateUnixDomainServer (const char *filename
 	if (sd_accept != INVALID_SOCKET)
 		close (sd_accept);
 	return 0;
-	#endif // OS_UNIX
 }
 
 

data/ext/em.h

@@ -24,9 +24,13 @@ See the file COPYING for complete licensing information.
   #include <ruby.h>
   #define EmSelect rb_thread_select
 
+  #ifdef HAVE_RB_WAIT_FOR_SINGLE_FD
+    #include <ruby/io.h>
+  #endif
+
   #if defined(HAVE_RBTRAP)
     #include <rubysig.h>
-  #elif defined(HAVE_RB_THREAD_CHECK_INTS)
+  #elif defined(HAVE_RB_ENABLE_INTERRUPT)
     extern "C" {
       void rb_enable_interrupt(void);
       void rb_disable_interrupt(void);
@@ -84,6 +88,7 @@ class EventMachine_t
 		const unsigned long CreateTcpServer (const char *, int);
 		const unsigned long OpenDatagramSocket (const char *, int);
 		const unsigned long CreateUnixDomainServer (const char*);
+		const unsigned long AttachSD (int);
 		const unsigned long OpenKeyboard();
 		//const char *Popen (const char*, const char*);
 		const unsigned long Socketpair (char* const*);
@@ -141,7 +146,7 @@ class EventMachine_t
 		uint64_t GetRealTime();
 
 	private:
-		bool _RunOnce();
+		void _RunOnce();
 		void _RunTimers();
 		void _UpdateTime();
 		void _AddNewDescriptors();
@@ -149,9 +154,9 @@ class EventMachine_t
 		void _InitializeLoopBreaker();
 		void _CleanupSockets();
 
-		bool _RunSelectOnce();
-		bool _RunEpollOnce();
-		bool _RunKqueueOnce();
+		void _RunSelectOnce();
+		void _RunEpollOnce();
+		void _RunKqueueOnce();
 
 		void _ModifyEpollEvent (EventableDescriptor*);
 		void _DispatchHeartbeats();

data/ext/eventmachine.h

@@ -64,6 +64,7 @@ extern "C" {
 	void evma_stop_tcp_server (const unsigned long signature);
 	const unsigned long evma_create_tcp_server (const char *address, int port);
 	const unsigned long evma_create_unix_domain_server (const char *filename);
+	const unsigned long evma_attach_sd (int sd);
 	const unsigned long evma_open_datagram_socket (const char *server, int port);
 	const unsigned long evma_open_keyboard();
 	void evma_set_tls_parms (const unsigned long binding, const char *privatekey_filename, const char *certchain_filenane, int verify_peer);