eventmachine 0.12.10 → 1.0.0.beta.1

data/ext/em.h

@@ -57,16 +57,6 @@ See the file COPYING for complete licensing information.
   #define EmSelect select
 #endif
 
-
-#ifdef OS_UNIX
-typedef long long Int64;
-#endif
-#ifdef OS_WIN32
-typedef __int64 Int64;
-#endif
-
-extern Int64 gCurrentLoopTime;
-
 class EventableDescriptor;
 class InotifyDescriptor;
 
@@ -82,7 +72,7 @@ class EventMachine_t
 		static void SetMaxTimerCount (int);
 
 	public:
-		EventMachine_t (void(*event_callback)(const unsigned long, int, const char*, const unsigned long));
+		EventMachine_t (EMCallback);
 		virtual ~EventMachine_t();
 
 		void Run();
@@ -137,6 +127,8 @@ class EventMachine_t
 		void _HandleKqueuePidEvent (struct kevent*);
 		#endif
 
+		uint64_t GetCurrentLoopTime() { return MyCurrentLoopTime; }
+
 		// Temporary:
 		void _UseEpoll();
 		void _UseKqueue();
@@ -144,6 +136,11 @@ class EventMachine_t
 		bool UsingKqueue() { return bKqueue; }
 		bool UsingEpoll() { return bEpoll; }
 
+		void QueueHeartbeat(EventableDescriptor*);
+		void ClearHeartbeat(uint64_t);
+
+		uint64_t GetRealTime();
+
 	private:
 		bool _RunOnce();
 		bool _RunTimers();
@@ -151,12 +148,16 @@ class EventMachine_t
 		void _AddNewDescriptors();
 		void _ModifyDescriptors();
 		void _InitializeLoopBreaker();
+		void _CleanupSockets();
 
 		bool _RunSelectOnce();
 		bool _RunEpollOnce();
 		bool _RunKqueueOnce();
 
 		void _ModifyEpollEvent (EventableDescriptor*);
+		void _DispatchHeartbeats();
+		timeval _TimeTilNextEvent();
+		void _CleanBadDescriptors();
 
 	public:
 		void _ReadLoopBreaker();
@@ -168,19 +169,20 @@ class EventMachine_t
 			MaxEvents = 4096
 		};
 		int HeartbeatInterval;
-		void (*EventCallback)(const unsigned long, int, const char*, const unsigned long);
+		EMCallback EventCallback;
 
 		class Timer_t: public Bindable_t {
 		};
 
-		multimap<Int64, Timer_t> Timers;
+		multimap<uint64_t, Timer_t> Timers;
+		multimap<uint64_t, EventableDescriptor*> Heartbeats;
 		map<int, Bindable_t*> Files;
 		map<int, Bindable_t*> Pids;
 		vector<EventableDescriptor*> Descriptors;
 		vector<EventableDescriptor*> NewDescriptors;
 		set<EventableDescriptor*> ModifiedDescriptors;
 
-		Int64 NextHeartbeatTime;
+		uint64_t NextHeartbeatTime;
 
 		int LoopBreakerReader;
 		int LoopBreakerWriter;
@@ -190,6 +192,13 @@ class EventMachine_t
 
 		timeval Quantum;
 
+		uint64_t MyCurrentLoopTime;
+
+		#ifdef OS_WIN32
+		unsigned TickCountTickover;
+		unsigned LastTickCount;
+		#endif
+
 	private:
 		bool bEpoll;
 		int epfd; // Epoll file-descriptor
@@ -225,8 +234,6 @@ struct SelectData_t
 	int nSockets;
 };
 
-
-
 #endif // __EventMachine__H_
 
 //#endif // OS_UNIX

data/ext/eventmachine.h

@@ -35,11 +35,12 @@ extern "C" {
 		EM_CONNECTION_NOTIFY_WRITABLE = 107,
 		EM_SSL_HANDSHAKE_COMPLETED = 108,
 		EM_SSL_VERIFY = 109,
-		EM_PROXY_TARGET_UNBOUND = 110
+		EM_PROXY_TARGET_UNBOUND = 110,
+		EM_PROXY_COMPLETED = 111
 
 	};
 
-	void evma_initialize_library (void(*)(const unsigned long, int, const char*, const unsigned long));
+	void evma_initialize_library (EMCallback);
 	void evma_run_machine();
 	void evma_release_library();
 	const unsigned long evma_install_oneshot_timer (int seconds);
@@ -105,7 +106,7 @@ extern "C" {
 	const unsigned long evma_watch_pid (int);
 	void evma_unwatch_pid (const unsigned long);
 
-	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long);
+	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long, const unsigned long);
 	void evma_stop_proxy(const unsigned long);
 
 	int evma_set_rlimit_nofile (int n_files);
@@ -113,6 +114,7 @@ extern "C" {
 	void evma_set_epoll (int use);
 	void evma_set_kqueue (int use);
 
+	uint64_t evma_get_current_loop_time();
 #if __cplusplus
 }
 #endif

data/ext/extconf.rb

@@ -53,11 +53,13 @@ when /solaris/
   add_define 'OS_SOLARIS8'
   check_libs(%w[nsl socket], true)
 
-  # Patch by Tim Pease, fixes SUNWspro compile problems.
-  if CONFIG['CC'] == 'cc'
+  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
     # SUN CHAIN
-    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    add_define 'CC_SUNWspro'
+    $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
     CONFIG['CCDLFLAGS'] = "-KPIC"
+    CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
   else
     # GNU CHAIN
     # on Unix we need a g++ link, not gcc.

data/ext/fastfilereader/extconf.rb

@@ -44,11 +44,13 @@ when /solaris/
   add_define 'OS_SOLARIS8'
   check_libs(%w[nsl socket], true)
 
-  # Patch by Tim Pease, fixes SUNWspro compile problems.
-  if CONFIG['CC'] == 'cc'
+  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
     # SUN CHAIN
-    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    add_define 'CC_SUNWspro'
+    $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
     CONFIG['CCDLFLAGS'] = "-KPIC"
+    CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
   else
     # GNU CHAIN
     # on Unix we need a g++ link, not gcc.

data/ext/fastfilereader/mapper.cpp

@@ -88,7 +88,7 @@ void Mapper_t::Close()
 	// Can be called multiple times.
 	// Calls to GetChunk are invalid after a call to Close.
 	if (MapPoint) {
-		#ifdef OS_SOLARIS8
+		#ifdef CC_SUNWspro
 		munmap ((char*)MapPoint, FileSize);
 		#else
 		munmap ((void*)MapPoint, FileSize);

data/ext/kb.cpp

@@ -26,9 +26,7 @@ KeyboardDescriptor::KeyboardDescriptor
 
 KeyboardDescriptor::KeyboardDescriptor (EventMachine_t *parent_em):
 	EventableDescriptor (0, parent_em),
-	bReadAttemptedAfterClose (false),
-	LastIo (gCurrentLoopTime),
-	InactivityTimeout (0)
+	bReadAttemptedAfterClose (false)
 {
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = EPOLLIN;

data/ext/pipe.cpp

@@ -30,8 +30,6 @@ PipeDescriptor::PipeDescriptor
 PipeDescriptor::PipeDescriptor (int fd, pid_t subpid, EventMachine_t *parent_em):
 	EventableDescriptor (fd, parent_em),
 	bReadAttemptedAfterClose (false),
-	LastIo (gCurrentLoopTime),
-	InactivityTimeout (0),
 	OutboundDataSize (0),
 	SubprocessPid (subpid)
 {
@@ -104,22 +102,22 @@ PipeDescriptor::~PipeDescriptor()
 	struct timespec req = {0, 50000000}; // 0.05s
 	int n;
 
-	// wait 0.25s for the process to die
-	for (n=0; n<5; n++) {
+	// wait 0.5s for the process to die
+	for (n=0; n<10; n++) {
 		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) != 0) return;
 		nanosleep (&req, NULL);
 	}
 
-	// send SIGTERM and wait another 0.5s
+	// send SIGTERM and wait another 1s
 	kill (SubprocessPid, SIGTERM);
-	for (n=0; n<10; n++) {
+	for (n=0; n<20; n++) {
 		nanosleep (&req, NULL);
 		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) != 0) return;
 	}
 
-	// send SIGKILL and wait another 1s
+	// send SIGKILL and wait another 5s
 	kill (SubprocessPid, SIGKILL);
-	for (n=0; n<20; n++) {
+	for (n=0; n<100; n++) {
 		nanosleep (&req, NULL);
 		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) != 0) return;
 	}
@@ -143,7 +141,7 @@ void PipeDescriptor::Read()
 		return;
 	}
 
-	LastIo = gCurrentLoopTime;
+	LastActivity = MyEventMachine->GetCurrentLoopTime();
 
 	int total_bytes_read = 0;
 	char readbuffer [16 * 1024];
@@ -203,7 +201,7 @@ void PipeDescriptor::Write()
 	int sd = GetSocket();
 	assert (sd != INVALID_SOCKET);
 
-	LastIo = gCurrentLoopTime;
+	LastActivity = MyEventMachine->GetCurrentLoopTime();
 	char output_buffer [16 * 1024];
 	size_t nbytes = 0;
 
@@ -268,7 +266,7 @@ PipeDescriptor::Heartbeat
 void PipeDescriptor::Heartbeat()
 {
 	// If an inactivity timeout is defined, then check for it.
-	if (InactivityTimeout && ((gCurrentLoopTime - LastIo) >= InactivityTimeout))
+	if (InactivityTimeout && ((MyEventMachine->GetCurrentLoopTime() - LastActivity) >= InactivityTimeout))
 		ScheduleClose (false);
 		//bCloseNow = true;
 }

data/ext/project.h

@@ -55,8 +55,8 @@ See the file COPYING for complete licensing information.
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <pwd.h>
+#include <string.h>
 typedef int SOCKET;
-#define closesocket close
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR -1
 #ifdef OS_SOLARIS8
@@ -96,6 +96,9 @@ typedef int socklen_t;
 typedef int pid_t;
 #endif
 
+#if !defined(_MSC_VER) || _MSC_VER > 1400
+#include <stdint.h>
+#endif
 
 using namespace std;
 
@@ -134,6 +137,14 @@ static inline int inotify_rm_watch (int fd, __u32 wd) { return syscall (__NR_ino
 #include <sys/uio.h>
 #endif
 
+#if __cplusplus
+extern "C" {
+#endif
+  typedef void (*EMCallback)(const unsigned long, int, const char*, const unsigned long);
+#if __cplusplus
+}
+#endif
+
 #include "binder.h"
 #include "em.h"
 #include "epoll.h"
@@ -145,7 +156,4 @@ static inline int inotify_rm_watch (int fd, __u32 wd) { return syscall (__NR_ino
 #include "eventmachine.h"
 #include "eventmachine_cpp.h"
 
-
-
-
 #endif // __Project__H_

data/ext/rubymain.cpp

@@ -31,6 +31,8 @@ Statics
 
 static VALUE EmModule;
 static VALUE EmConnection;
+static VALUE EmConnsHash;
+static VALUE EmTimersHash;
 
 static VALUE EM_eConnectionError;
 static VALUE EM_eUnknownTimerFired;
@@ -51,89 +53,117 @@ static VALUE Intern_ssl_verify_peer;
 static VALUE Intern_notify_readable;
 static VALUE Intern_notify_writable;
 static VALUE Intern_proxy_target_unbound;
+static VALUE Intern_proxy_completed;
+static VALUE Intern_connection_completed;
 
 static VALUE rb_cProcStatus;
 
 struct em_event {
-	unsigned long a1;
-	int a2;
-	const char *a3;
-	unsigned long a4;
+	unsigned long signature;
+	int event;
+	const char *data_str;
+	unsigned long data_num;
 };
 
+static inline VALUE ensure_conn(const unsigned long signature)
+{
+	VALUE conn = rb_hash_aref (EmConnsHash, ULONG2NUM (signature));
+	if (conn == Qnil)
+		rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", signature);
+	return conn;
+}
+
+
 /****************
 t_event_callback
 ****************/
 
-static void event_callback (struct em_event* e)
-{
-	const unsigned long a1 = e->a1;
-	int a2 = e->a2;
-	const char *a3 = e->a3;
-	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, ULONG2NUM (a1));
-		if (q == Qnil)
-			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, ULONG2NUM (a1));
-		if (q == Qnil)
-			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, ULONG2NUM (a1));
-		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
-		rb_funcall (q, Intern_notify_writable, 0);
-	}
-	else if (a2 == EM_LOOPBREAK_SIGNAL) {
-		rb_funcall (EmModule, Intern_run_deferred_callbacks, 0);
-	}
-	else if (a2 == EM_TIMER_FIRED) {
-		VALUE t = rb_ivar_get (EmModule, Intern_at_timers);
-		VALUE q = rb_funcall (t, Intern_delete, 1, ULONG2NUM (a4));
-		if (q == Qnil) {
-			rb_raise (EM_eUnknownTimerFired, "no such timer: %lu", a4);
-		} else if (q == Qfalse) {
-			/* Timer Canceled */
-		} else {
-			rb_funcall (q, Intern_call, 0);
+static inline void event_callback (struct em_event* e)
+{
+	const unsigned long signature = e->signature;
+	int event = e->event;
+	const char *data_str = e->data_str;
+	const unsigned long data_num = e->data_num;
+
+	switch (event) {
+		case EM_CONNECTION_READ:
+		{
+			VALUE conn = rb_hash_aref (EmConnsHash, ULONG2NUM (signature));
+			if (conn == Qnil)
+				rb_raise (EM_eConnectionNotBound, "received %lu bytes of data for unknown signature: %lu", data_num, signature);
+			rb_funcall (conn, Intern_receive_data, 1, rb_str_new (data_str, data_num));
+			return;
+		}
+		case EM_CONNECTION_ACCEPTED:
+		case EM_CONNECTION_UNBOUND:
+		{
+			rb_funcall (EmModule, Intern_event_callback, 3, ULONG2NUM(signature), INT2FIX(event), data_str ? rb_str_new(data_str,data_num) : ULONG2NUM(data_num));
+			return;
+		}
+		case EM_CONNECTION_COMPLETED:
+		{
+			VALUE conn = ensure_conn(signature);
+			rb_funcall (conn, Intern_connection_completed, 0);
+			return;
+		}
+		case EM_CONNECTION_NOTIFY_READABLE:
+		{
+			VALUE conn = ensure_conn(signature);
+			rb_funcall (conn, Intern_notify_readable, 0);
+			return;
+		}
+		case EM_CONNECTION_NOTIFY_WRITABLE:
+		{
+			VALUE conn = ensure_conn(signature);
+			rb_funcall (conn, Intern_notify_writable, 0);
+			return;
+		}
+		case EM_LOOPBREAK_SIGNAL:
+		{
+			rb_funcall (EmModule, Intern_run_deferred_callbacks, 0);
+			return;
+		}
+		case EM_TIMER_FIRED:
+		{
+			VALUE timer = rb_funcall (EmTimersHash, Intern_delete, 1, ULONG2NUM (data_num));
+			if (timer == Qnil) {
+				rb_raise (EM_eUnknownTimerFired, "no such timer: %lu", data_num);
+			} else if (timer == Qfalse) {
+				/* Timer Canceled */
+			} else {
+				rb_funcall (timer, Intern_call, 0);
+			}
+			return;
+		}
+		#ifdef WITH_SSL
+		case EM_SSL_HANDSHAKE_COMPLETED:
+		{
+			VALUE conn = ensure_conn(signature);
+			rb_funcall (conn, Intern_ssl_handshake_completed, 0);
+			return;
+		}
+		case EM_SSL_VERIFY:
+		{
+			VALUE conn = ensure_conn(signature);
+			VALUE should_accept = rb_funcall (conn, Intern_ssl_verify_peer, 1, rb_str_new(data_str, data_num));
+			if (RTEST(should_accept))
+				evma_accept_ssl_peer (signature);
+			return;
+		}
+		#endif
+		case EM_PROXY_TARGET_UNBOUND:
+		{
+			VALUE conn = ensure_conn(signature);
+			rb_funcall (conn, Intern_proxy_target_unbound, 0);
+			return;
+		}
+		case EM_PROXY_COMPLETED:
+		{
+			VALUE conn = ensure_conn(signature);
+			rb_funcall (conn, Intern_proxy_completed, 0);
+			return;
 		}
 	}
-	#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, ULONG2NUM (a1));
-		if (q == Qnil)
-			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, ULONG2NUM (a1));
-		if (q == Qnil)
-			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);
-	}
-	#endif
-	else if (a2 == EM_PROXY_TARGET_UNBOUND) {
-		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
-		VALUE q = rb_hash_aref (t, ULONG2NUM (a1));
-		if (q == Qnil)
-			rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", a1);
-		rb_funcall (q, Intern_proxy_target_unbound, 0);
-	}
-	else
-		rb_funcall (EmModule, Intern_event_callback, 3, ULONG2NUM(a1), INT2FIX(a2), a3 ? rb_str_new(a3,a4) : ULONG2NUM(a4));
 }
 
 /*******************
@@ -150,13 +180,13 @@ static void event_error_handler(VALUE unused, VALUE err)
 event_callback_wrapper
 **********************/
 
-static void event_callback_wrapper (const unsigned long a1, int a2, const char *a3, const unsigned long a4)
+static void event_callback_wrapper (const unsigned long signature, int event, const char *data_str, const unsigned long data_num)
 {
 	struct em_event e;
-	e.a1 = a1;
-	e.a2 = a2;
-	e.a3 = a3;
-	e.a4 = a4;
+	e.signature = signature;
+	e.event = event;
+	e.data_str = data_str;
+	e.data_num = data_num;
 
 	if (!rb_ivar_defined(EmModule, Intern_at_error_handler))
 		event_callback(&e);
@@ -170,7 +200,11 @@ t_initialize_event_machine
 
 static VALUE t_initialize_event_machine (VALUE self)
 {
-	evma_initialize_library (event_callback_wrapper);
+	EmConnsHash = rb_ivar_get (EmModule, Intern_at_conns);
+	EmTimersHash = rb_ivar_get (EmModule, Intern_at_timers);
+	assert(EmConnsHash != Qnil);
+	assert(EmTimersHash != Qnil);
+	evma_initialize_library ((EMCallback)event_callback_wrapper);
 	return Qnil;
 }
 
@@ -208,7 +242,7 @@ static VALUE t_start_server (VALUE self, VALUE server, VALUE port)
 {
 	const unsigned long f = evma_create_tcp_server (StringValuePtr(server), FIX2INT(port));
 	if (!f)
-		rb_raise (rb_eRuntimeError, "no acceptor");
+		rb_raise (rb_eRuntimeError, "no acceptor (port is in use or requires root privileges)");
 	return ULONG2NUM (f);
 }
 
@@ -467,6 +501,7 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, e.what());
 	}
+	return Qnil;
 }
 
 /*********************
@@ -487,6 +522,7 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, e.what());
 	}
+	return Qnil;
 }
 
 /*********************
@@ -725,9 +761,9 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 	#else
 		int len = RARRAY (cmd)->len;
 	#endif
-	if (len > 98)
+	if (len >= 2048)
 		rb_raise (rb_eRuntimeError, "too many arguments to popen");
-	char *strings [100];
+	char *strings [2048];
 	for (int i=0; i < len; i++) {
 		VALUE ix = INT2FIX (i);
 		VALUE s = rb_ary_aref (1, &ix, cmd);
@@ -769,8 +805,9 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
 	try {
 		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
 	} catch (std::runtime_error e) {
-		rb_sys_fail(e.what());
+		rb_raise (EM_eUnsupported, e.what());
 	}
+	return Qnil;
 }
 
 
@@ -794,8 +831,9 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
 	try {
 		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
 	} catch (std::runtime_error e) {
-		rb_sys_fail(e.what());
+		rb_raise (EM_eUnsupported, e.what());
 	}
+	return Qnil;
 }
 
 
@@ -972,11 +1010,12 @@ static VALUE t_get_loop_time (VALUE self)
   static ID at = rb_intern("at");
 #endif
 
-  if (gCurrentLoopTime != 0) {
+  uint64_t current_time = evma_get_current_loop_time();
+  if (current_time != 0) {
 #ifndef HAVE_RB_TIME_NEW
-    return rb_funcall(cTime, at, 2, INT2NUM(gCurrentLoopTime / 1000000), INT2NUM(gCurrentLoopTime % 1000000));
+    return rb_funcall(cTime, at, 2, INT2NUM(current_time / 1000000), INT2NUM(current_time % 1000000));
 #else
-    return rb_time_new(gCurrentLoopTime / 1000000, gCurrentLoopTime % 1000000);
+    return rb_time_new(current_time / 1000000, current_time % 1000000);
 #endif
   }
   return Qnil;
@@ -987,9 +1026,13 @@ static VALUE t_get_loop_time (VALUE self)
 t_start_proxy
 **************/
 
-static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize)
+static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize, VALUE length)
 {
-	evma_start_proxy(NUM2ULONG (from), NUM2ULONG (to), NUM2ULONG(bufsize));
+	try {
+		evma_start_proxy(NUM2ULONG (from), NUM2ULONG (to), NUM2ULONG(bufsize), NUM2ULONG(length));
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, e.what());
+	}
 	return Qnil;
 }
 
@@ -1000,7 +1043,11 @@ t_stop_proxy
 
 static VALUE t_stop_proxy (VALUE self, VALUE from)
 {
-	evma_stop_proxy(NUM2ULONG (from));
+	try{
+		evma_stop_proxy(NUM2ULONG (from));
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, e.what());
+	}
 	return Qnil;
 }
 
@@ -1054,6 +1101,8 @@ extern "C" void Init_rubyeventmachine()
 	Intern_notify_readable = rb_intern ("notify_readable");
 	Intern_notify_writable = rb_intern ("notify_writable");
 	Intern_proxy_target_unbound = rb_intern ("proxy_target_unbound");
+	Intern_proxy_completed = rb_intern ("proxy_completed");
+	Intern_connection_completed = rb_intern ("connection_completed");
 
 	// INCOMPLETE, we need to define class Connections inside module EventMachine
 	// run_machine and run_machine_without_threads are now identical.
@@ -1097,7 +1146,7 @@ extern "C" void Init_rubyeventmachine()
 	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, 3);
+	rb_define_module_function (EmModule, "start_proxy", (VALUE (*)(...))t_start_proxy, 4);
 	rb_define_module_function (EmModule, "stop_proxy", (VALUE (*)(...))t_stop_proxy, 1);
 
 	rb_define_module_function (EmModule, "watch_filename", (VALUE (*)(...))t_watch_filename, 1);