eventmachine 0.12.8-java → 0.12.10-java

data/ext/em.h

@@ -34,8 +34,16 @@ See the file COPYING for complete licensing information.
   #include <ruby.h>
   #define EmSelect rb_thread_select
 
-  #ifdef HAVE_RBTRAP
+  #if defined(HAVE_RBTRAP)
     #include <rubysig.h>
+  #elif defined(HAVE_RB_THREAD_CHECK_INTS)
+    extern "C" {
+      void rb_enable_interrupt(void);
+      void rb_disable_interrupt(void);
+    }
+
+    #define TRAP_BEG rb_enable_interrupt()
+    #define TRAP_END do { rb_disable_interrupt(); rb_thread_check_ints(); } while(0)
   #else
     #define TRAP_BEG
     #define TRAP_END
@@ -74,28 +82,28 @@ class EventMachine_t
 		static void SetMaxTimerCount (int);
 
 	public:
-		EventMachine_t (void(*event_callback)(const char*, int, const char*, int));
+		EventMachine_t (void(*event_callback)(const unsigned long, int, const char*, const unsigned long));
 		virtual ~EventMachine_t();
 
 		void Run();
 		void ScheduleHalt();
 		void SignalLoopBreaker();
-		const char *InstallOneshotTimer (int);
-		const char *ConnectToServer (const char *, int, const char *, int);
-		const char *ConnectToUnixServer (const char *);
-
-		const char *CreateTcpServer (const char *, int);
-		const char *OpenDatagramSocket (const char *, int);
-		const char *CreateUnixDomainServer (const char*);
-		const char *_OpenFileForWriting (const char*);
-		const char *OpenKeyboard();
+		const unsigned long InstallOneshotTimer (int);
+		const unsigned long ConnectToServer (const char *, int, const char *, int);
+		const unsigned long ConnectToUnixServer (const char *);
+
+		const unsigned long CreateTcpServer (const char *, int);
+		const unsigned long OpenDatagramSocket (const char *, int);
+		const unsigned long CreateUnixDomainServer (const char*);
+		const unsigned long _OpenFileForWriting (const char*);
+		const unsigned long OpenKeyboard();
 		//const char *Popen (const char*, const char*);
-		const char *Socketpair (char* const*);
+		const unsigned long Socketpair (char* const*);
 
 		void Add (EventableDescriptor*);
 		void Modify (EventableDescriptor*);
 
-		const char *AttachFD (int, bool, bool);
+		const unsigned long AttachFD (int, bool);
 		int DetachFD (EventableDescriptor*);
 
 		void ArmKqueueWriter (EventableDescriptor*);
@@ -112,18 +120,18 @@ class EventMachine_t
 		float GetHeartbeatInterval();
 		int SetHeartbeatInterval(float);
 
-		const char *WatchFile (const char*);
+		const unsigned long WatchFile (const char*);
 		void UnwatchFile (int);
-		void UnwatchFile (const char*);
+		void UnwatchFile (const unsigned long);
 
 		#ifdef HAVE_KQUEUE
 		void _HandleKqueueFileEvent (struct kevent*);
 		void _RegisterKqueueFileEvent(int);
 		#endif
 
-		const char *WatchPid (int);
+		const unsigned long WatchPid (int);
 		void UnwatchPid (int);
-		void UnwatchPid (const char *);
+		void UnwatchPid (const unsigned long);
 
 		#ifdef HAVE_KQUEUE
 		void _HandleKqueuePidEvent (struct kevent*);
@@ -160,7 +168,7 @@ class EventMachine_t
 			MaxEvents = 4096
 		};
 		int HeartbeatInterval;
-		void (*EventCallback)(const char*, int, const char*, int);
+		void (*EventCallback)(const unsigned long, int, const char*, const unsigned long);
 
 		class Timer_t: public Bindable_t {
 		};
@@ -212,6 +220,7 @@ struct SelectData_t
 	int maxsocket;
 	fd_set fdreads;
 	fd_set fdwrites;
+	fd_set fderrors;
 	timeval tv;
 	int nSockets;
 };

data/ext/emwin.cpp

@@ -138,7 +138,7 @@ bool EventMachine_t::_RunTimers()
 		if (i->first > gCurrentLoopTime)
 			break;
 		if (EventCallback)
-			(*EventCallback) ("", EM_TIMER_FIRED, i->second.GetBinding().c_str(), i->second.GetBinding().length());
+			(*EventCallback) (NULL, EM_TIMER_FIRED, NULL, i->second.GetBinding());
 		Timers.erase (i);
 	}
 	return true;
@@ -158,7 +158,7 @@ const char *EventMachine_t::InstallOneshotTimer (int seconds)
 
 	Timer_t t;
 	Timers.insert (make_pair (time(NULL) + seconds, t));
-	return t.GetBinding().c_str();
+	return t.GetBinding();
 }
 
 
@@ -230,7 +230,7 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 		if (!ad)
 			throw std::runtime_error ("unable to allocate acceptor");
 		Add (ad);
-		output_binding = ad->GetBinding().c_str();
+		output_binding = ad->GetBinding();
 
 		CreateIoCompletionPort ((HANDLE)sd_accept, Iocp, NULL, 0);
 		SOCKET sd = socket (AF_INET, SOCK_STREAM, 0);

data/ext/eventmachine.h

@@ -39,43 +39,54 @@ extern "C" {
 
 	};
 
-	void evma_initialize_library (void(*)(const char*, int, const char*, int));
+	void evma_initialize_library (void(*)(const unsigned long, int, const char*, const unsigned long));
 	void evma_run_machine();
 	void evma_release_library();
-	const char *evma_install_oneshot_timer (int seconds);
-	const char *evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
-	const char *evma_connect_to_unix_server (const char *server);
-
-	const char *evma_attach_fd (int file_descriptor, int read_mode, int write_mode);
-	int evma_detach_fd (const char *binding);
-
-	void evma_stop_tcp_server (const char *signature);
-	const char *evma_create_tcp_server (const char *address, int port);
-	const char *evma_create_unix_domain_server (const char *filename);
-	const char *evma_open_datagram_socket (const char *server, int port);
-	const char *evma_open_keyboard();
-	void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filenane, int verify_peer);
-	void evma_start_tls (const char *binding);
+	const unsigned long evma_install_oneshot_timer (int seconds);
+	const unsigned long evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
+	const unsigned long evma_connect_to_unix_server (const char *server);
+
+	const unsigned long evma_attach_fd (int file_descriptor, int watch_mode);
+	int evma_detach_fd (const unsigned long binding);
+	int evma_get_file_descriptor (const unsigned long binding);
+	int evma_is_notify_readable (const unsigned long binding);
+	void evma_set_notify_readable (const unsigned long binding, int mode);
+	int evma_is_notify_writable (const unsigned long binding);
+	void evma_set_notify_writable (const unsigned long binding, int mode);
+
+	int evma_pause(const unsigned long binding);
+	int evma_is_paused(const unsigned long binding);
+	int evma_resume(const unsigned long binding);
+
+	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_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);
+	void evma_start_tls (const unsigned long binding);
 
 	#ifdef WITH_SSL
-	X509 *evma_get_peer_cert (const char *binding);
-	void evma_accept_ssl_peer (const char *binding);
+	X509 *evma_get_peer_cert (const unsigned long binding);
+	void evma_accept_ssl_peer (const unsigned long binding);
 	#endif
 
-	int evma_get_peername (const char *binding, struct sockaddr*);
-	int evma_get_sockname (const char *binding, struct sockaddr*);
-	int evma_get_subprocess_pid (const char *binding, pid_t*);
-	int evma_get_subprocess_status (const char *binding, int*);
+	int evma_get_peername (const unsigned long binding, struct sockaddr*);
+	int evma_get_sockname (const unsigned long binding, struct sockaddr*);
+	int evma_get_subprocess_pid (const unsigned long binding, pid_t*);
+	int evma_get_subprocess_status (const unsigned long binding, int*);
 	int evma_get_connection_count();
-	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
-	int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);
-	float evma_get_comm_inactivity_timeout (const char *binding);
-	int evma_set_comm_inactivity_timeout (const char *binding, float value);
-	int evma_get_outbound_data_size (const char *binding);
-	int evma_send_file_data_to_connection (const char *binding, const char *filename);
-
-	void evma_close_connection (const char *binding, int after_writing);
-	int evma_report_connection_error_status (const char *binding);
+	int evma_send_data_to_connection (const unsigned long binding, const char *data, int data_length);
+	int evma_send_datagram (const unsigned long binding, const char *data, int data_length, const char *address, int port);
+	float evma_get_comm_inactivity_timeout (const unsigned long binding);
+	int evma_set_comm_inactivity_timeout (const unsigned long binding, float value);
+	float evma_get_pending_connect_timeout (const unsigned long binding);
+	int evma_set_pending_connect_timeout (const unsigned long binding, float value);
+	int evma_get_outbound_data_size (const unsigned long binding);
+	int evma_send_file_data_to_connection (const unsigned long binding, const char *filename);
+
+	void evma_close_connection (const unsigned long binding, int after_writing);
+	int evma_report_connection_error_status (const unsigned long binding);
 	void evma_signal_loopbreak();
 	void evma_set_timer_quantum (int);
 	int evma_get_max_timer_count();
@@ -85,17 +96,17 @@ extern "C" {
 	float evma_get_heartbeat_interval();
 	int evma_set_heartbeat_interval(float);
 
-	const char *evma__write_file (const char *filename);
-	const char *evma_popen (char * const*cmd_strings);
+	const unsigned long evma__write_file (const char *filename);
+	const unsigned long evma_popen (char * const*cmd_strings);
 
-	const char *evma_watch_filename (const char *fname);
-	void evma_unwatch_filename (const char *sig);
+	const unsigned long evma_watch_filename (const char *fname);
+	void evma_unwatch_filename (const unsigned long);
 
-	const char *evma_watch_pid (int);
-	void evma_unwatch_pid (const char *sig);
+	const unsigned long evma_watch_pid (int);
+	void evma_unwatch_pid (const unsigned long);
 
-	void evma_start_proxy(const char*, const char*);
-	void evma_stop_proxy(const char*);
+	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long);
+	void evma_stop_proxy(const unsigned long);
 
 	int evma_set_rlimit_nofile (int n_files);
 

data/ext/eventmachine_cpp.h

@@ -26,7 +26,7 @@ See the file COPYING for complete licensing information.
 
 namespace EM {
 
-	void Callback (const char *sig, int event, const char *data, int length);
+	void Callback (const unsigned long sig, int event, const char *data, const unsigned long length);
 	void Run (void(*)(void));
 	void AddTimer (int, void(*)());
 	void StopReactor();
@@ -40,12 +40,12 @@ namespace EM {
 			Eventable() {}
 			virtual ~Eventable() {}
 
-			std::string Signature;
+			unsigned long Signature;
 
 			// Called by the framework
 			virtual void ReceiveData (const char *data, int length) {}
 			virtual void ConnectionCompleted() {}
-			virtual void Accept (const char*) {}
+			virtual void Accept (const unsigned long) {}
 			virtual void Unbind() {}
 			virtual void PostInit() {}
 			virtual void SslHandshakeCompleted() {}
@@ -81,7 +81,7 @@ namespace EM {
 			virtual ~Acceptor() {}
 
 			void Start (const char*, int);
-			void Accept (const char*);
+			void Accept (const unsigned long);
 
 			virtual Connection *MakeConnection() {return new Connection();}
 	};

data/ext/extconf.rb

@@ -18,6 +18,8 @@ add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro(
 add_define "HAVE_INOTIFY" if inotify = have_func('inotify_init', 'sys/inotify.h')
 add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sys/syscall.h')
 add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
+have_func('rb_thread_check_ints')
+have_func('rb_time_new')
 
 # Minor platform details between *nix and Windows:
 
@@ -48,9 +50,8 @@ when /mswin32/, /mingw32/, /bccwin32/
   end
 
 when /solaris/
-  check_libs(%w[nsl socket], true)
-
   add_define 'OS_SOLARIS8'
+  check_libs(%w[nsl socket], true)
 
   # Patch by Tim Pease, fixes SUNWspro compile problems.
   if CONFIG['CC'] == 'cc'
@@ -67,31 +68,36 @@ when /openbsd/
   # OpenBSD branch contributed by Guillaume Sellier.
 
   # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
-  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
+  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++ -fPIC"
+  CONFIG['LDSHAREDXX'] = "$(CXX) -shared -lstdc++ -fPIC"
 
 when /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(' ')
 
 when /linux/
+  add_define 'HAVE_EPOLL' if have_func('epoll_create', 'sys/epoll.h')
 
   # Original epoll test is inadequate because 2.4 kernels have the header
   # but not the code.
   # add_define 'HAVE_EPOLL' if have_header('sys/epoll.h')
-  if have_header('sys/epoll.h')
-    File.open("hasEpollTest.c", "w") {|f|
-      f.puts "#include <sys/epoll.h>"
-      f.puts "int main() { epoll_create(1024); return 0;}"
-    }
-    (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
-    `rm -f hasEpollTest.c hasEpollTest`
-    add_define 'HAVE_EPOLL' if e == 0
-  end
+  # if have_header('sys/epoll.h')
+  #   File.open("hasEpollTest.c", "w") {|f|
+  #     f.puts "#include <sys/epoll.h>"
+  #     f.puts "int main() { epoll_create(1024); return 0;}"
+  #   }
+  #   (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
+  #   `rm -f hasEpollTest.c hasEpollTest`
+  #   add_define 'HAVE_EPOLL' if e == 0
+  # end
 
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
+
+when /aix/
+  CONFIG['LDSHARED'] = "$(CXX) -shared -Wl,-G -Wl,-brtl"
+
 else
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
@@ -130,4 +136,13 @@ else
   add_define "WITHOUT_SSL"
 end
 
+# solaris c++ compiler doesn't have make_pair()
+TRY_LINK.sub!('$(CC)', '$(CXX)')
+add_define 'HAVE_MAKE_PAIR' if try_link(<<SRC, '-lstdc++')
+  #include <utility>
+  using namespace std;
+  int main(){ pair<int,int> tuple = make_pair(1,2); }
+SRC
+TRY_LINK.sub!('$(CXX)', '$(CC)')
+
 create_makefile "rubyeventmachine"

data/ext/fastfilereader/extconf.rb

@@ -26,7 +26,7 @@ else
   add_define 'OS_UNIX'
 end
 
-
+# Main platform invariances:
 
 case RUBY_PLATFORM
 when /mswin32/, /mingw32/, /bccwin32/
@@ -41,9 +41,8 @@ when /mswin32/, /mingw32/, /bccwin32/
   end
 
 when /solaris/
-  check_libs(%w[nsl socket], true)
-
   add_define 'OS_SOLARIS8'
+  check_libs(%w[nsl socket], true)
 
   # Patch by Tim Pease, fixes SUNWspro compile problems.
   if CONFIG['CC'] == 'cc'
@@ -55,20 +54,27 @@ when /solaris/
     # on Unix we need a g++ link, not gcc.
     CONFIG['LDSHARED'] = "$(CXX) -shared"
   end
+
 when /openbsd/
   # OpenBSD branch contributed by Guillaume Sellier.
 
   # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
-  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
+  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++ -fPIC"
+  CONFIG['LDSHAREDXX'] = "$(CXX) -shared -lstdc++ -fPIC"
+
 when /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(' ')
 
 when /linux/
-
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
+
+when /aix/
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) -shared -Wl,-G"
+
 else
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"

data/ext/project.h

@@ -69,11 +69,21 @@ typedef int SOCKET;
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned long)-1)
 #endif
+#endif /* OS_SOLARIS8 */
+
+#ifdef _AIX
+#include <strings.h>
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
 #endif
-#endif
+#endif /* _AIX */
 
+#endif /* OS_UNIX */
 
 #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
+
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winsock2.h>
@@ -81,6 +91,7 @@ typedef int SOCKET;
 #include <rpc.h>
 #include <fcntl.h>
 #include <assert.h>
+
 typedef int socklen_t;
 typedef int pid_t;
 #endif

data/ext/rubymain.cpp

@@ -32,8 +32,10 @@ Statics
 static VALUE EmModule;
 static VALUE EmConnection;
 
+static VALUE EM_eConnectionError;
 static VALUE EM_eUnknownTimerFired;
 static VALUE EM_eConnectionNotBound;
+static VALUE EM_eUnsupported;
 
 static VALUE Intern_at_signature;
 static VALUE Intern_at_timers;
@@ -53,10 +55,10 @@ static VALUE Intern_proxy_target_unbound;
 static VALUE rb_cProcStatus;
 
 struct em_event {
-	const char *a1;
+	unsigned long a1;
 	int a2;
 	const char *a3;
-	int a4;
+	unsigned long a4;
 };
 
 /****************
@@ -65,30 +67,30 @@ t_event_callback
 
 static void event_callback (struct em_event* e)
 {
-	const char *a1 = e->a1;
+	const unsigned long a1 = e->a1;
 	int a2 = e->a2;
 	const char *a3 = e->a3;
-	int a4 = e->a4;
+	const unsigned long a4 = e->a4;
 
 	if (a2 == EM_CONNECTION_READ) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
 		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "received %d bytes of data for unknown signature: %s", a4, a1);
+			rb_raise (EM_eConnectionNotBound, "received %lu bytes of data for unknown signature: %lu", a4, a1);
 		rb_funcall (q, Intern_receive_data, 1, rb_str_new (a3, a4));
 	}
 	else if (a2 == EM_CONNECTION_NOTIFY_READABLE) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
 		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %s", a1);
+			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
 		rb_funcall (q, Intern_notify_readable, 0);
 	}
 	else if (a2 == EM_CONNECTION_NOTIFY_WRITABLE) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
 		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %s", a1);
+			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
 		rb_funcall (q, Intern_notify_writable, 0);
 	}
 	else if (a2 == EM_LOOPBREAK_SIGNAL) {
@@ -96,9 +98,9 @@ static void event_callback (struct em_event* e)
 	}
 	else if (a2 == EM_TIMER_FIRED) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_timers);
-		VALUE q = rb_funcall (t, Intern_delete, 1, rb_str_new(a3, a4));
+		VALUE q = rb_funcall (t, Intern_delete, 1, ULONG2NUM (a4));
 		if (q == Qnil) {
-			rb_raise (EM_eUnknownTimerFired, "no such timer: %s", a1);
+			rb_raise (EM_eUnknownTimerFired, "no such timer: %lu", a4);
 		} else if (q == Qfalse) {
 			/* Timer Canceled */
 		} else {
@@ -108,16 +110,16 @@ static void event_callback (struct em_event* e)
 	#ifdef WITH_SSL
 	else if (a2 == EM_SSL_HANDSHAKE_COMPLETED) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
 		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %s", a1);
+			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
 		rb_funcall (q, Intern_ssl_handshake_completed, 0);
 	}
 	else if (a2 == EM_SSL_VERIFY) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
 		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %s", a1);
+			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
 		VALUE r = rb_funcall (q, Intern_ssl_verify_peer, 1, rb_str_new(a3, a4));
 		if (RTEST(r))
 			evma_accept_ssl_peer (a1);
@@ -125,13 +127,13 @@ static void event_callback (struct em_event* e)
 	#endif
 	else if (a2 == EM_PROXY_TARGET_UNBOUND) {
 		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
 		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %s", a1);
+			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
 		rb_funcall (q, Intern_proxy_target_unbound, 0);
 	}
 	else
-		rb_funcall (EmModule, Intern_event_callback, 3, rb_str_new2(a1), (a2 << 1) | 1, rb_str_new(a3,a4));
+		rb_funcall (EmModule, Intern_event_callback, 3, ULONG2NUM(a1), INT2FIX(a2), a3 ? rb_str_new(a3,a4) : ULONG2NUM(a4));
 }
 
 /*******************
@@ -148,7 +150,7 @@ static void event_error_handler(VALUE unused, VALUE err)
 event_callback_wrapper
 **********************/
 
-static void event_callback_wrapper (const char *a1, int a2, const char *a3, int a4)
+static void event_callback_wrapper (const unsigned long a1, int a2, const char *a3, const unsigned long a4)
 {
 	struct em_event e;
 	e.a1 = a1;
@@ -191,10 +193,10 @@ t_add_oneshot_timer
 
 static VALUE t_add_oneshot_timer (VALUE self, VALUE interval)
 {
-	const char *f = evma_install_oneshot_timer (FIX2INT (interval));
-	if (!f || !*f)
-		rb_raise (rb_eRuntimeError, "no timer");
-	return rb_str_new2 (f);
+	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");
+	return ULONG2NUM (f);
 }
 
 
@@ -204,10 +206,10 @@ t_start_server
 
 static VALUE t_start_server (VALUE self, VALUE server, VALUE port)
 {
-	const char *f = evma_create_tcp_server (StringValuePtr(server), FIX2INT(port));
-	if (!f || !*f)
+	const unsigned long f = evma_create_tcp_server (StringValuePtr(server), FIX2INT(port));
+	if (!f)
 		rb_raise (rb_eRuntimeError, "no acceptor");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 /*************
@@ -216,7 +218,7 @@ t_stop_server
 
 static VALUE t_stop_server (VALUE self, VALUE signature)
 {
-	evma_stop_tcp_server (StringValuePtr (signature));
+	evma_stop_tcp_server (NUM2ULONG (signature));
 	return Qnil;
 }
 
@@ -227,10 +229,10 @@ t_start_unix_server
 
 static VALUE t_start_unix_server (VALUE self, VALUE filename)
 {
-	const char *f = evma_create_unix_domain_server (StringValuePtr(filename));
-	if (!f || !*f)
+	const unsigned long f = evma_create_unix_domain_server (StringValuePtr(filename));
+	if (!f)
 		rb_raise (rb_eRuntimeError, "no unix-domain acceptor");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 
@@ -241,7 +243,7 @@ t_send_data
 
 static VALUE t_send_data (VALUE self, VALUE signature, VALUE data, VALUE data_length)
 {
-	int b = evma_send_data_to_connection (StringValuePtr (signature), StringValuePtr (data), FIX2INT (data_length));
+	int b = evma_send_data_to_connection (NUM2ULONG (signature), StringValuePtr (data), FIX2INT (data_length));
 	return INT2NUM (b);
 }
 
@@ -252,7 +254,7 @@ t_start_tls
 
 static VALUE t_start_tls (VALUE self, VALUE signature)
 {
-	evma_start_tls (StringValuePtr (signature));
+	evma_start_tls (NUM2ULONG (signature));
 	return Qnil;
 }
 
@@ -267,7 +269,7 @@ static VALUE t_set_tls_parms (VALUE self, VALUE signature, VALUE privkeyfile, VA
 	 * It's expected that the parameter list will grow as we add more supported features.
 	 * ALL of these parameters are optional, and can be specified as empty or NULL strings.
 	 */
-	evma_set_tls_parms (StringValuePtr (signature), StringValuePtr (privkeyfile), StringValuePtr (certchainfile), (verify_peer == Qtrue ? 1 : 0));
+	evma_set_tls_parms (NUM2ULONG (signature), StringValuePtr (privkeyfile), StringValuePtr (certchainfile), (verify_peer == Qtrue ? 1 : 0));
 	return Qnil;
 }
 
@@ -284,7 +286,7 @@ static VALUE t_get_peer_cert (VALUE self, VALUE signature)
 	BUF_MEM *buf;
 	BIO *out;
 
-	cert = evma_get_peer_cert (StringValuePtr (signature));
+	cert = evma_get_peer_cert (NUM2ULONG (signature));
 
 	if (cert != NULL) {
 		out = BIO_new(BIO_s_mem());
@@ -306,7 +308,7 @@ t_get_peername
 static VALUE t_get_peername (VALUE self, VALUE signature)
 {
 	struct sockaddr s;
-	if (evma_get_peername (StringValuePtr (signature), &s)) {
+	if (evma_get_peername (NUM2ULONG (signature), &s)) {
 		return rb_str_new ((const char*)&s, sizeof(s));
 	}
 
@@ -320,7 +322,7 @@ t_get_sockname
 static VALUE t_get_sockname (VALUE self, VALUE signature)
 {
 	struct sockaddr s;
-	if (evma_get_sockname (StringValuePtr (signature), &s)) {
+	if (evma_get_sockname (NUM2ULONG (signature), &s)) {
 		return rb_str_new ((const char*)&s, sizeof(s));
 	}
 
@@ -334,7 +336,7 @@ t_get_subprocess_pid
 static VALUE t_get_subprocess_pid (VALUE self, VALUE signature)
 {
 	pid_t pid;
-	if (evma_get_subprocess_pid (StringValuePtr (signature), &pid)) {
+	if (evma_get_subprocess_pid (NUM2ULONG (signature), &pid)) {
 		return INT2NUM (pid);
 	}
 
@@ -352,8 +354,8 @@ static VALUE t_get_subprocess_status (VALUE self, VALUE signature)
 	int status;
 	pid_t pid;
 
-	if (evma_get_subprocess_status (StringValuePtr (signature), &status)) {
-		if (evma_get_subprocess_pid (StringValuePtr (signature), &pid)) {
+	if (evma_get_subprocess_status (NUM2ULONG (signature), &status)) {
+		if (evma_get_subprocess_pid (NUM2ULONG (signature), &pid)) {
 			proc_status = rb_obj_alloc(rb_cProcStatus);
 			rb_iv_set(proc_status, "status", INT2FIX(status));
 			rb_iv_set(proc_status, "pid", INT2FIX(pid));
@@ -378,7 +380,7 @@ t_get_comm_inactivity_timeout
 
 static VALUE t_get_comm_inactivity_timeout (VALUE self, VALUE signature)
 {
-	return rb_float_new(evma_get_comm_inactivity_timeout(StringValuePtr(signature)));
+	return rb_float_new(evma_get_comm_inactivity_timeout(NUM2ULONG (signature)));
 }
 
 /*****************************
@@ -388,11 +390,31 @@ t_set_comm_inactivity_timeout
 static VALUE t_set_comm_inactivity_timeout (VALUE self, VALUE signature, VALUE timeout)
 {
 	float ti = RFLOAT_VALUE(timeout);
-	if (evma_set_comm_inactivity_timeout (StringValuePtr (signature), ti));
+	if (evma_set_comm_inactivity_timeout (NUM2ULONG (signature), ti));
 		return Qtrue;
 	return Qfalse;
 }
 
+/*****************************
+t_get_pending_connect_timeout
+*****************************/
+
+static VALUE t_get_pending_connect_timeout (VALUE self, VALUE signature)
+{
+	return rb_float_new(evma_get_pending_connect_timeout(NUM2ULONG (signature)));
+}
+
+/*****************************
+t_set_pending_connect_timeout
+*****************************/
+
+static VALUE t_set_pending_connect_timeout (VALUE self, VALUE signature, VALUE timeout)
+{
+	float ti = RFLOAT_VALUE(timeout);
+	if (evma_set_pending_connect_timeout (NUM2ULONG (signature), ti));
+		return Qtrue;
+	return Qfalse;
+}
 
 /***************
 t_send_datagram
@@ -400,7 +422,7 @@ t_send_datagram
 
 static VALUE t_send_datagram (VALUE self, VALUE signature, VALUE data, VALUE data_length, VALUE address, VALUE port)
 {
-	int b = evma_send_datagram (StringValuePtr (signature), StringValuePtr (data), FIX2INT (data_length), StringValuePtr(address), FIX2INT(port));
+	int b = evma_send_datagram (NUM2ULONG (signature), StringValuePtr (data), FIX2INT (data_length), StringValuePtr(address), FIX2INT(port));
 	return INT2NUM (b);
 }
 
@@ -411,7 +433,7 @@ t_close_connection
 
 static VALUE t_close_connection (VALUE self, VALUE signature, VALUE after_writing)
 {
-	evma_close_connection (StringValuePtr (signature), ((after_writing == Qtrue) ? 1 : 0));
+	evma_close_connection (NUM2ULONG (signature), ((after_writing == Qtrue) ? 1 : 0));
 	return Qnil;
 }
 
@@ -421,7 +443,7 @@ t_report_connection_error_status
 
 static VALUE t_report_connection_error_status (VALUE self, VALUE signature)
 {
-	int b = evma_report_connection_error_status (StringValuePtr (signature));
+	int b = evma_report_connection_error_status (NUM2ULONG (signature));
 	return INT2NUM (b);
 }
 
@@ -437,10 +459,14 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 	// Specifically, if the value of port comes in as a string rather than an integer,
 	// NUM2INT will throw a type error, but FIX2INT will generate garbage.
 
-	const char *f = evma_connect_to_server (NULL, 0, StringValuePtr(server), NUM2INT(port));
-	if (!f || !*f)
-		rb_raise (rb_eRuntimeError, "no connection");
-	return rb_str_new2 (f);
+	try {
+		const unsigned long f = evma_connect_to_server (NULL, 0, StringValuePtr(server), NUM2INT(port));
+		if (!f)
+			rb_raise (EM_eConnectionError, "no connection");
+		return ULONG2NUM (f);
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, e.what());
+	}
 }
 
 /*********************
@@ -453,15 +479,14 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 	// Specifically, if the value of port comes in as a string rather than an integer,
 	// NUM2INT will throw a type error, but FIX2INT will generate garbage.
 
-	const char *f;
 	try {
-		f = evma_connect_to_server (StringValuePtr(bind_addr), NUM2INT(bind_port), StringValuePtr(server), NUM2INT(port));
-		if (!f || !*f)
-			rb_raise (rb_eRuntimeError, "no connection");
+		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");
+		return ULONG2NUM (f);
 	} catch (std::runtime_error e) {
-		rb_sys_fail(e.what());
+		rb_raise (EM_eConnectionError, e.what());
 	}
-	return rb_str_new2 (f);
 }
 
 /*********************
@@ -470,31 +495,113 @@ t_connect_unix_server
 
 static VALUE t_connect_unix_server (VALUE self, VALUE serversocket)
 {
-	const char *f = evma_connect_to_unix_server (StringValuePtr(serversocket));
-	if (!f || !*f)
+	const unsigned long f = evma_connect_to_unix_server (StringValuePtr(serversocket));
+	if (!f)
 		rb_raise (rb_eRuntimeError, "no connection");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 /***********
 t_attach_fd
 ***********/
 
-static VALUE t_attach_fd (VALUE self, VALUE file_descriptor, VALUE read_mode, VALUE write_mode)
+static VALUE t_attach_fd (VALUE self, VALUE file_descriptor, VALUE watch_mode)
 {
-	const char *f = evma_attach_fd (NUM2INT(file_descriptor), (read_mode == Qtrue) ? 1 : 0, (write_mode == Qtrue) ? 1 : 0);
-	if (!f || !*f)
+	const unsigned long f = evma_attach_fd (NUM2INT(file_descriptor), watch_mode == Qtrue);
+	if (!f)
 		rb_raise (rb_eRuntimeError, "no connection");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 /***********
 t_detach_fd
 ***********/
 
-static VALUE t_detach_fd (VALUE self,  VALUE signature)
+static VALUE t_detach_fd (VALUE self, VALUE signature)
+{
+	return INT2NUM(evma_detach_fd (NUM2ULONG (signature)));
+}
+
+/**************
+t_get_sock_opt
+**************/
+
+static VALUE t_get_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optname)
+{
+	int fd = evma_get_file_descriptor (NUM2ULONG (signature));
+	int level = NUM2INT(lev), option = NUM2INT(optname);
+	socklen_t len = 128;
+	char buf[128];
+
+	if (getsockopt(fd, level, option, buf, &len) < 0)
+		rb_sys_fail("getsockopt");
+
+	return rb_str_new(buf, len);
+}
+
+/********************
+t_is_notify_readable
+********************/
+
+static VALUE t_is_notify_readable (VALUE self, VALUE signature)
+{
+	return evma_is_notify_readable(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+}
+
+/*********************
+t_set_notify_readable
+*********************/
+
+static VALUE t_set_notify_readable (VALUE self, VALUE signature, VALUE mode)
 {
-	return INT2NUM(evma_detach_fd (StringValuePtr(signature)));
+	evma_set_notify_readable(NUM2ULONG (signature), mode == Qtrue);
+	return Qnil;
+}
+
+/********************
+t_is_notify_readable
+********************/
+
+static VALUE t_is_notify_writable (VALUE self, VALUE signature)
+{
+	return evma_is_notify_writable(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+}
+
+/*********************
+t_set_notify_writable
+*********************/
+
+static VALUE t_set_notify_writable (VALUE self, VALUE signature, VALUE mode)
+{
+	evma_set_notify_writable(NUM2ULONG (signature), mode == Qtrue);
+	return Qnil;
+}
+
+/*******
+t_pause
+*******/
+
+static VALUE t_pause (VALUE self, VALUE signature)
+{
+	return evma_pause(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+}
+
+/********
+t_resume
+********/
+
+static VALUE t_resume (VALUE self, VALUE signature)
+{
+	return evma_resume(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+}
+
+/**********
+t_paused_p
+**********/
+
+static VALUE t_paused_p (VALUE self, VALUE signature)
+{
+	return evma_is_paused(NUM2ULONG (signature)) ? Qtrue : Qfalse;
 }
 
 /*****************
@@ -503,10 +610,10 @@ t_open_udp_socket
 
 static VALUE t_open_udp_socket (VALUE self, VALUE server, VALUE port)
 {
-	const char *f = evma_open_datagram_socket (StringValuePtr(server), FIX2INT(port));
-	if (!f || !*f)
+	const unsigned long f = evma_open_datagram_socket (StringValuePtr(server), FIX2INT(port));
+	if (!f)
 		rb_raise (rb_eRuntimeError, "no datagram socket");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 
@@ -600,10 +707,10 @@ t__write_file
 
 static VALUE t__write_file (VALUE self, VALUE filename)
 {
-	const char *f = evma__write_file (StringValuePtr (filename));
-	if (!f || !*f)
+	const unsigned long f = evma__write_file (StringValuePtr (filename));
+	if (!f)
 		rb_raise (rb_eRuntimeError, "file not opened");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 /**************
@@ -628,15 +735,15 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 	}
 	strings[len] = NULL;
 
-	const char *f = evma_popen (strings);
-	if (!f || !*f) {
+	const unsigned long f = evma_popen (strings);
+	if (!f) {
 		char *err = strerror (errno);
 		char buf[100];
 		memset (buf, 0, sizeof(buf));
 		snprintf (buf, sizeof(buf)-1, "no popen: %s", (err?err:"???"));
-		rb_raise (rb_eRuntimeError, buf);
+		rb_raise (rb_eRuntimeError, "%s", buf);
 	}
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 
@@ -646,10 +753,10 @@ t_read_keyboard
 
 static VALUE t_read_keyboard (VALUE self)
 {
-	const char *f = evma_open_keyboard();
-	if (!f || !*f)
+	const unsigned long f = evma_open_keyboard();
+	if (!f)
 		rb_raise (rb_eRuntimeError, "no keyboard reader");
-	return rb_str_new2 (f);
+	return ULONG2NUM (f);
 }
 
 
@@ -660,7 +767,7 @@ t_watch_filename
 static VALUE t_watch_filename (VALUE self, VALUE fname)
 {
 	try {
-		return rb_str_new2(evma_watch_filename(StringValuePtr(fname)));
+		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
 	} catch (std::runtime_error e) {
 		rb_sys_fail(e.what());
 	}
@@ -673,7 +780,7 @@ t_unwatch_filename
 
 static VALUE t_unwatch_filename (VALUE self, VALUE sig)
 {
-	evma_unwatch_filename(StringValuePtr(sig));
+	evma_unwatch_filename(NUM2ULONG (sig));
 	return Qnil;
 }
 
@@ -685,7 +792,7 @@ t_watch_pid
 static VALUE t_watch_pid (VALUE self, VALUE pid)
 {
 	try {
-		return rb_str_new2(evma_watch_pid(NUM2INT(pid)));
+		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
 	} catch (std::runtime_error e) {
 		rb_sys_fail(e.what());
 	}
@@ -698,7 +805,7 @@ t_unwatch_pid
 
 static VALUE t_unwatch_pid (VALUE self, VALUE sig)
 {
-	evma_unwatch_pid(StringValuePtr(sig));
+	evma_unwatch_pid(NUM2ULONG (sig));
 	return Qnil;
 }
 
@@ -722,9 +829,6 @@ t__epoll
 
 static VALUE t__epoll (VALUE self)
 {
-	if (t__epoll_p(self) == Qfalse)
-		return Qfalse;
-
 	evma_set_epoll (1);
 	return Qtrue;
 }
@@ -736,7 +840,7 @@ t__epoll_set
 static VALUE t__epoll_set (VALUE self, VALUE val)
 {
 	if (t__epoll_p(self) == Qfalse)
-		return Qfalse;
+		rb_raise (EM_eUnsupported, "epoll is not supported on this platform");
 
 	evma_set_epoll (val == Qtrue ? 1 : 0);
 	return val;
@@ -762,9 +866,6 @@ t__kqueue
 
 static VALUE t__kqueue (VALUE self)
 {
-	if (t__kqueue_p(self) == Qfalse)
-		return Qfalse;
-
 	evma_set_kqueue (1);
 	return Qtrue;
 }
@@ -776,7 +877,7 @@ t__kqueue_set
 static VALUE t__kqueue_set (VALUE self, VALUE val)
 {
 	if (t__kqueue_p(self) == Qfalse)
-		return Qfalse;
+		rb_raise (EM_eUnsupported, "kqueue is not supported on this platform");
 
 	evma_set_kqueue (val == Qtrue ? 1 : 0);
 	return val;
@@ -812,7 +913,7 @@ static VALUE t_send_file_data (VALUE self, VALUE signature, VALUE filename)
 	 * do this. For one thing it's ugly. For another, we can't be sure zero is never a real errno.
 	 */
 
-	int b = evma_send_file_data_to_connection (StringValuePtr(signature), StringValuePtr(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.");
 	if (b > 0) {
@@ -821,7 +922,7 @@ static VALUE t_send_file_data (VALUE self, VALUE signature, VALUE filename)
 		memset (buf, 0, sizeof(buf));
 		snprintf (buf, sizeof(buf)-1, ": %s %s", StringValuePtr(filename),(err?err:"???"));
 
-		rb_raise (rb_eIOError, buf);
+		rb_raise (rb_eIOError, "%s", buf);
 	}
 
 	return INT2NUM (0);
@@ -845,7 +946,7 @@ conn_get_outbound_data_size
 static VALUE conn_get_outbound_data_size (VALUE self)
 {
 	VALUE sig = rb_ivar_get (self, Intern_at_signature);
-	return INT2NUM (evma_get_outbound_data_size (StringValuePtr(sig)));
+	return INT2NUM (evma_get_outbound_data_size (NUM2ULONG (sig)));
 }
 
 
@@ -866,12 +967,17 @@ t_get_loop_time
 
 static VALUE t_get_loop_time (VALUE self)
 {
-  VALUE cTime = rb_path2class("Time");
+#ifndef HAVE_RB_TIME_NEW
+  static VALUE cTime = rb_path2class("Time");
+  static ID at = rb_intern("at");
+#endif
+
   if (gCurrentLoopTime != 0) {
-    return rb_funcall(cTime,
-                      rb_intern("at"),
-                      1,
-                      INT2NUM(gCurrentLoopTime));
+#ifndef HAVE_RB_TIME_NEW
+    return rb_funcall(cTime, at, 2, INT2NUM(gCurrentLoopTime / 1000000), INT2NUM(gCurrentLoopTime % 1000000));
+#else
+    return rb_time_new(gCurrentLoopTime / 1000000, gCurrentLoopTime % 1000000);
+#endif
   }
   return Qnil;
 }
@@ -881,9 +987,9 @@ static VALUE t_get_loop_time (VALUE self)
 t_start_proxy
 **************/
 
-static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to)
+static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize)
 {
-	evma_start_proxy(StringValuePtr(from), StringValuePtr(to));
+	evma_start_proxy(NUM2ULONG (from), NUM2ULONG (to), NUM2ULONG(bufsize));
 	return Qnil;
 }
 
@@ -894,7 +1000,7 @@ t_stop_proxy
 
 static VALUE t_stop_proxy (VALUE self, VALUE from)
 {
-	evma_stop_proxy(StringValuePtr(from));
+	evma_stop_proxy(NUM2ULONG (from));
 	return Qnil;
 }
 
@@ -955,9 +1061,11 @@ extern "C" void Init_rubyeventmachine()
 	EmModule = rb_define_module ("EventMachine");
 	EmConnection = rb_define_class_under (EmModule, "Connection", rb_cObject);
 
-	rb_define_class_under (EmModule, "NoHandlerForAcceptedConnection", rb_eException);
+	rb_define_class_under (EmModule, "NoHandlerForAcceptedConnection", rb_eRuntimeError);
+	EM_eConnectionError = rb_define_class_under (EmModule, "ConnectionError", rb_eRuntimeError);
 	EM_eConnectionNotBound = rb_define_class_under (EmModule, "ConnectionNotBound", rb_eRuntimeError);
 	EM_eUnknownTimerFired = rb_define_class_under (EmModule, "UnknownTimerFired", rb_eRuntimeError);
+	EM_eUnsupported = rb_define_class_under (EmModule, "Unsupported", rb_eRuntimeError);
 
 	rb_define_module_function (EmModule, "initialize_event_machine", (VALUE(*)(...))t_initialize_event_machine, 0);
 	rb_define_module_function (EmModule, "run_machine", (VALUE(*)(...))t_run_machine_without_threads, 0);
@@ -977,10 +1085,19 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "bind_connect_server", (VALUE(*)(...))t_bind_connect_server, 4);
 	rb_define_module_function (EmModule, "connect_unix_server", (VALUE(*)(...))t_connect_unix_server, 1);
 
-	rb_define_module_function (EmModule, "attach_fd", (VALUE (*)(...))t_attach_fd, 3);
+	rb_define_module_function (EmModule, "attach_fd", (VALUE (*)(...))t_attach_fd, 2);
 	rb_define_module_function (EmModule, "detach_fd", (VALUE (*)(...))t_detach_fd, 1);
+	rb_define_module_function (EmModule, "get_sock_opt", (VALUE (*)(...))t_get_sock_opt, 3);
+	rb_define_module_function (EmModule, "set_notify_readable", (VALUE (*)(...))t_set_notify_readable, 2);
+	rb_define_module_function (EmModule, "set_notify_writable", (VALUE (*)(...))t_set_notify_writable, 2);
+	rb_define_module_function (EmModule, "is_notify_readable", (VALUE (*)(...))t_is_notify_readable, 1);
+	rb_define_module_function (EmModule, "is_notify_writable", (VALUE (*)(...))t_is_notify_writable, 1);
+
+	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, "start_proxy", (VALUE (*)(...))t_start_proxy, 2);
+	rb_define_module_function (EmModule, "start_proxy", (VALUE (*)(...))t_start_proxy, 3);
 	rb_define_module_function (EmModule, "stop_proxy", (VALUE (*)(...))t_stop_proxy, 1);
 
 	rb_define_module_function (EmModule, "watch_filename", (VALUE (*)(...))t_watch_filename, 1);
@@ -1015,6 +1132,8 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "get_subprocess_status", (VALUE(*)(...))t_get_subprocess_status, 1);
 	rb_define_module_function (EmModule, "get_comm_inactivity_timeout", (VALUE(*)(...))t_get_comm_inactivity_timeout, 1);
 	rb_define_module_function (EmModule, "set_comm_inactivity_timeout", (VALUE(*)(...))t_set_comm_inactivity_timeout, 2);
+	rb_define_module_function (EmModule, "get_pending_connect_timeout", (VALUE(*)(...))t_get_pending_connect_timeout, 1);
+	rb_define_module_function (EmModule, "set_pending_connect_timeout", (VALUE(*)(...))t_set_pending_connect_timeout, 2);
 	rb_define_module_function (EmModule, "set_rlimit_nofile", (VALUE(*)(...))t_set_rlimit_nofile, 1);
 	rb_define_module_function (EmModule, "get_connection_count", (VALUE(*)(...))t_get_connection_count, 0);