eventmachine 1.0.7-java → 1.0.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93017d412c61150a4d664be575d7ce87907d5ed
-  data.tar.gz: bd2358d58e8b21db9cdcd962651a674fb9eb607e
+  metadata.gz: 9407d5002e439f7bfc0290697021ba19adcb68fc
+  data.tar.gz: f7b6f83ff388375b52f5b0207d0a7bd03388ec94
 SHA512:
-  metadata.gz: f1f260562d40ed19f4a483080840de34afc7df80d5c31c184e6c52ebf8000596f63d076590a94cc9164922e3d201b24639850f16eae109d2f6af80b72b6eccea
-  data.tar.gz: b521218d7da6dadc59f531932f0e7e03983f326a3bda6ce8728b4b0a052f0a92117de3745a57f539d4fba782b23beebf55f2b30672ccff930ba5db4475f24996
+  metadata.gz: f6a7975235284f6c4ae1c9f602fbb8789d7fe46325b5a4741a99cb94d27733273172b80bb341a29a4a7a747586f821373e435c854eca1286b43de59c0b16ea18
+  data.tar.gz: a9728d5e9ea5b63cc8f20b88f0d72e73824b8a46ba764fd9d237386275961a6c879adc7bd3cb603b715c5ffd7494bc290d37209e0b369504c263602db1a3deff

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.8 (August 6, 2015)
+* fix kqueue assertion failed, postpone ArmKqueueWriter until all events are processed [#51, #176, #372, #401, #619]
+* fix Rubinius GC, crank the machine from Ruby space when running Rubinius [#201, #202, #617]
+* test to show that LineText2 preserves whitespace and newlines [#32, #622]
+* bump up compiler warnings and resolve them [#616]
+* fix Windows x64 use uintptr_t instead of unsigned long for binding pointers [#612, #615]
+* fix linetext2 unroll tail recursion to avoid stack level too deep [#609]
+* fix for compilation with SSL on windows [#601]
+* open file descriptors and sockets with O_CLOEXEC where possible [#298, #488, #591]
+* fix SmtpClient: send second EHLO after STARTTLS. [#589]
+* fix nul-terminated strings in C, use StringValueCStr instead of StringValuePtr 
+
 ## 1.0.7 (February 10, 2015)
 * fix delay in kqueue/epoll reactor shutdown when timers exist [#587]
 * fix memory leak introduced in v1.0.5 [#586]

data/README.md

@@ -32,7 +32,7 @@ EventMachine has been around since the early 2000s and is a mature and battle te
 
 ## What platforms are supported by EventMachine? ##
 
-EventMachine supports Ruby 1.8.7, 1.9.2, REE, JRuby and **works well on Windows** as well
+EventMachine supports Ruby >= 1.8.7 and <= 2.2 REE, JRuby and **works well on Windows** as well
 as many operating systems from the Unix family (Linux, Mac OS X, BSD flavors).
 
 

data/ext/binder.cpp

@@ -22,16 +22,16 @@ See the file COPYING for complete licensing information.
 #define DEV_URANDOM "/dev/urandom"
 
 
-map<unsigned long, Bindable_t*> Bindable_t::BindingBag;
+map<uintptr_t, Bindable_t*> Bindable_t::BindingBag;
 
 
 /********************************
 STATIC Bindable_t::CreateBinding
 ********************************/
 
-unsigned long Bindable_t::CreateBinding()
+uintptr_t Bindable_t::CreateBinding()
 {
-	static unsigned long num = 0;
+	static uintptr_t num = 0;
 	while(BindingBag[++num]) {}
 	return num;
 }
@@ -90,13 +90,13 @@ string Bindable_t::CreateBinding()
 STATIC: Bindable_t::GetObject
 *****************************/
 
-Bindable_t *Bindable_t::GetObject (const unsigned long binding)
+Bindable_t *Bindable_t::GetObject (const uintptr_t binding)
 {
-  map<unsigned long, Bindable_t*>::const_iterator i = BindingBag.find (binding);
-  if (i != BindingBag.end())
-    return i->second;
-  else
-    return NULL;
+	map<uintptr_t, Bindable_t*>::const_iterator i = BindingBag.find (binding);
+	if (i != BindingBag.end())
+		return i->second;
+	else
+		return NULL;
 }
 
 

data/ext/binder.h

@@ -24,18 +24,18 @@ See the file COPYING for complete licensing information.
 class Bindable_t
 {
 	public:
-		static unsigned long CreateBinding();
-		static Bindable_t *GetObject (const unsigned long);
-		static map<unsigned long, Bindable_t*> BindingBag;
+		static uintptr_t CreateBinding();
+		static Bindable_t *GetObject (const uintptr_t);
+		static map<uintptr_t, Bindable_t*> BindingBag;
 
 	public:
 		Bindable_t();
 		virtual ~Bindable_t();
 
-		const unsigned long GetBinding() {return Binding;}
+		const uintptr_t GetBinding() {return Binding;}
 
 	private:
-		unsigned long Binding;
+		uintptr_t Binding;
 };
 
 

data/ext/cmain.cpp

@@ -29,8 +29,7 @@ See the file COPYING for complete licensing information.
 #endif
 
 static EventMachine_t *EventMachine;
-static int bUseEpoll = 0;
-static int bUseKqueue = 0;
+static Poller_t Poller = Poller_Default;
 
 extern "C" void ensure_eventmachine (const char *caller = "unknown caller")
 {
@@ -58,11 +57,8 @@ extern "C" void evma_initialize_library (EMCallback cb)
 		#else
 			throw std::runtime_error ("eventmachine already initialized: evma_initialize_library");
 		#endif
-	EventMachine = new EventMachine_t (cb);
-	if (bUseEpoll)
-		EventMachine->_UseEpoll();
-	if (bUseKqueue)
-		EventMachine->_UseKqueue();
+
+	EventMachine = new EventMachine_t (cb, Poller);
 }
 
 
@@ -78,6 +74,17 @@ extern "C" void evma_release_library()
 }
 
 
+/*********************
+evma_run_machine_once
+*********************/
+
+extern "C" bool evma_run_machine_once()
+{
+	ensure_eventmachine("evma_run_machine_once");
+	return EventMachine->RunOnce();
+}
+
+
 /****************
 evma_run_machine
 ****************/
@@ -93,7 +100,7 @@ extern "C" void evma_run_machine()
 evma_install_oneshot_timer
 **************************/
 
-extern "C" const unsigned long evma_install_oneshot_timer (int seconds)
+extern "C" const uintptr_t evma_install_oneshot_timer (int seconds)
 {
 	ensure_eventmachine("evma_install_oneshot_timer");
 	return EventMachine->InstallOneshotTimer (seconds);
@@ -104,7 +111,7 @@ extern "C" const unsigned long evma_install_oneshot_timer (int seconds)
 evma_connect_to_server
 **********************/
 
-extern "C" const unsigned long evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port)
+extern "C" const uintptr_t evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port)
 {
 	ensure_eventmachine("evma_connect_to_server");
 	return EventMachine->ConnectToServer (bind_addr, bind_port, server, port);
@@ -114,7 +121,7 @@ extern "C" const unsigned long evma_connect_to_server (const char *bind_addr, in
 evma_connect_to_unix_server
 ***************************/
 
-extern "C" const unsigned long evma_connect_to_unix_server (const char *server)
+extern "C" const uintptr_t evma_connect_to_unix_server (const char *server)
 {
 	ensure_eventmachine("evma_connect_to_unix_server");
 	return EventMachine->ConnectToUnixServer (server);
@@ -124,7 +131,7 @@ extern "C" const unsigned long evma_connect_to_unix_server (const char *server)
 evma_attach_fd
 **************/
 
-extern "C" const unsigned long evma_attach_fd (int file_descriptor, int watch_mode)
+extern "C" const uintptr_t evma_attach_fd (int file_descriptor, int watch_mode)
 {
 	ensure_eventmachine("evma_attach_fd");
 	return EventMachine->AttachFD (file_descriptor, watch_mode ? true : false);
@@ -134,7 +141,7 @@ extern "C" const unsigned long evma_attach_fd (int file_descriptor, int watch_mo
 evma_detach_fd
 **************/
 
-extern "C" int evma_detach_fd (const unsigned long binding)
+extern "C" int evma_detach_fd (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_detach_fd");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -153,7 +160,7 @@ extern "C" int evma_detach_fd (const unsigned long binding)
 evma_get_file_descriptor
 ************************/
 
-extern "C" int evma_get_file_descriptor (const unsigned long binding)
+extern "C" int evma_get_file_descriptor (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_get_file_descriptor");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -172,7 +179,7 @@ extern "C" int evma_get_file_descriptor (const unsigned long binding)
 evma_is_notify_readable
 ***********************/
 
-extern "C" int evma_is_notify_readable (const unsigned long binding)
+extern "C" int evma_is_notify_readable (const uintptr_t binding)
 {
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -184,7 +191,7 @@ extern "C" int evma_is_notify_readable (const unsigned long binding)
 evma_set_notify_readable
 ************************/
 
-extern "C" void evma_set_notify_readable (const unsigned long binding, int mode)
+extern "C" void evma_set_notify_readable (const uintptr_t binding, int mode)
 {
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -195,7 +202,7 @@ extern "C" void evma_set_notify_readable (const unsigned long binding, int mode)
 evma_is_notify_writable
 ***********************/
 
-extern "C" int evma_is_notify_writable (const unsigned long binding)
+extern "C" int evma_is_notify_writable (const uintptr_t binding)
 {
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -207,7 +214,7 @@ extern "C" int evma_is_notify_writable (const unsigned long binding)
 evma_set_notify_writable
 ************************/
 
-extern "C" void evma_set_notify_writable (const unsigned long binding, int mode)
+extern "C" void evma_set_notify_writable (const uintptr_t binding, int mode)
 {
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -218,7 +225,7 @@ extern "C" void evma_set_notify_writable (const unsigned long binding, int mode)
 evma_pause
 **********/
 
-extern "C" int evma_pause (const unsigned long binding)
+extern "C" int evma_pause (const uintptr_t binding)
 {
 	EventableDescriptor *cd = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -231,7 +238,7 @@ extern "C" int evma_pause (const unsigned long binding)
 evma_resume
 ***********/
 
-extern "C" int evma_resume (const unsigned long binding)
+extern "C" int evma_resume (const uintptr_t binding)
 {
 	EventableDescriptor *cd = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -244,7 +251,7 @@ extern "C" int evma_resume (const unsigned long binding)
 evma_is_paused
 **************/
 
-extern "C" int evma_is_paused (const unsigned long binding)
+extern "C" int evma_is_paused (const uintptr_t binding)
 {
 	EventableDescriptor *cd = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (cd)
@@ -267,7 +274,7 @@ extern "C" int evma_num_close_scheduled ()
 evma_create_tcp_server
 **********************/
 
-extern "C" const unsigned long evma_create_tcp_server (const char *address, int port)
+extern "C" const uintptr_t evma_create_tcp_server (const char *address, int port)
 {
 	ensure_eventmachine("evma_create_tcp_server");
 	return EventMachine->CreateTcpServer (address, port);
@@ -277,7 +284,7 @@ extern "C" const unsigned long evma_create_tcp_server (const char *address, int
 evma_create_unix_domain_server
 ******************************/
 
-extern "C" const unsigned long evma_create_unix_domain_server (const char *filename)
+extern "C" const uintptr_t evma_create_unix_domain_server (const char *filename)
 {
 	ensure_eventmachine("evma_create_unix_domain_server");
 	return EventMachine->CreateUnixDomainServer (filename);
@@ -287,7 +294,7 @@ extern "C" const unsigned long evma_create_unix_domain_server (const char *filen
 evma_attach_sd
 ************************/
 
-extern "C" const unsigned long evma_attach_sd (int sd)
+extern "C" const uintptr_t evma_attach_sd (int sd)
 {
 	ensure_eventmachine("evma_attach_sd");
 	return EventMachine->AttachSD (sd);
@@ -297,7 +304,7 @@ extern "C" const unsigned long evma_attach_sd (int sd)
 evma_open_datagram_socket
 *************************/
 
-extern "C" const unsigned long evma_open_datagram_socket (const char *address, int port)
+extern "C" const uintptr_t evma_open_datagram_socket (const char *address, int port)
 {
 	ensure_eventmachine("evma_open_datagram_socket");
 	return EventMachine->OpenDatagramSocket (address, port);
@@ -307,7 +314,7 @@ extern "C" const unsigned long evma_open_datagram_socket (const char *address, i
 evma_open_keyboard
 ******************/
 
-extern "C" const unsigned long evma_open_keyboard()
+extern "C" const uintptr_t evma_open_keyboard()
 {
 	ensure_eventmachine("evma_open_keyboard");
 	return EventMachine->OpenKeyboard();
@@ -317,7 +324,7 @@ extern "C" const unsigned long evma_open_keyboard()
 evma_watch_filename
 *******************/
 
-extern "C" const unsigned long evma_watch_filename (const char *fname)
+extern "C" const uintptr_t evma_watch_filename (const char *fname)
 {
 	ensure_eventmachine("evma_watch_filename");
 	return EventMachine->WatchFile(fname);
@@ -327,7 +334,7 @@ extern "C" const unsigned long evma_watch_filename (const char *fname)
 evma_unwatch_filename
 *********************/
 
-extern "C" void evma_unwatch_filename (const unsigned long sig)
+extern "C" void evma_unwatch_filename (const uintptr_t sig)
 {
 	ensure_eventmachine("evma_unwatch_file");
 	EventMachine->UnwatchFile(sig);
@@ -337,7 +344,7 @@ extern "C" void evma_unwatch_filename (const unsigned long sig)
 evma_watch_pid
 **************/
 
-extern "C" const unsigned long evma_watch_pid (int pid)
+extern "C" const uintptr_t evma_watch_pid (int pid)
 {
 	ensure_eventmachine("evma_watch_pid");
 	return EventMachine->WatchPid(pid);
@@ -347,7 +354,7 @@ extern "C" const unsigned long evma_watch_pid (int pid)
 evma_unwatch_pid
 ****************/
 
-extern "C" void evma_unwatch_pid (const unsigned long sig)
+extern "C" void evma_unwatch_pid (const uintptr_t sig)
 {
 	ensure_eventmachine("evma_unwatch_pid");
 	EventMachine->UnwatchPid(sig);
@@ -357,7 +364,7 @@ extern "C" void evma_unwatch_pid (const unsigned long sig)
 evma_send_data_to_connection
 ****************************/
 
-extern "C" int evma_send_data_to_connection (const unsigned long binding, const char *data, int data_length)
+extern "C" int evma_send_data_to_connection (const uintptr_t binding, const char *data, int data_length)
 {
 	ensure_eventmachine("evma_send_data_to_connection");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -370,7 +377,7 @@ extern "C" int evma_send_data_to_connection (const unsigned long binding, const
 evma_send_datagram
 ******************/
 
-extern "C" int evma_send_datagram (const unsigned long binding, const char *data, int data_length, const char *address, int port)
+extern "C" int evma_send_datagram (const uintptr_t binding, const char *data, int data_length, const char *address, int port)
 {
 	ensure_eventmachine("evma_send_datagram");
 	DatagramDescriptor *dd = dynamic_cast <DatagramDescriptor*> (Bindable_t::GetObject (binding));
@@ -384,7 +391,7 @@ extern "C" int evma_send_datagram (const unsigned long binding, const char *data
 evma_close_connection
 *********************/
 
-extern "C" void evma_close_connection (const unsigned long binding, int after_writing)
+extern "C" void evma_close_connection (const uintptr_t binding, int after_writing)
 {
 	ensure_eventmachine("evma_close_connection");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -396,7 +403,7 @@ extern "C" void evma_close_connection (const unsigned long binding, int after_wr
 evma_report_connection_error_status
 ***********************************/
 
-extern "C" int evma_report_connection_error_status (const unsigned long binding)
+extern "C" int evma_report_connection_error_status (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_report_connection_error_status");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -409,7 +416,7 @@ extern "C" int evma_report_connection_error_status (const unsigned long binding)
 evma_stop_tcp_server
 ********************/
 
-extern "C" void evma_stop_tcp_server (const unsigned long binding)
+extern "C" void evma_stop_tcp_server (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_stop_tcp_server");
 	AcceptorDescriptor::StopAcceptor (binding);
@@ -431,7 +438,7 @@ extern "C" void evma_stop_machine()
 evma_start_tls
 **************/
 
-extern "C" void evma_start_tls (const unsigned long binding)
+extern "C" void evma_start_tls (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_start_tls");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -443,7 +450,7 @@ extern "C" void evma_start_tls (const unsigned long binding)
 evma_set_tls_parms
 ******************/
 
-extern "C" void evma_set_tls_parms (const unsigned long binding, const char *privatekey_filename, const char *certchain_filename, int verify_peer)
+extern "C" void evma_set_tls_parms (const uintptr_t binding, const char *privatekey_filename, const char *certchain_filename, int verify_peer)
 {
 	ensure_eventmachine("evma_set_tls_parms");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -456,7 +463,7 @@ evma_get_peer_cert
 ******************/
 
 #ifdef WITH_SSL
-extern "C" X509 *evma_get_peer_cert (const unsigned long binding)
+extern "C" X509 *evma_get_peer_cert (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_get_peer_cert");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -471,7 +478,7 @@ evma_accept_ssl_peer
 ********************/
 
 #ifdef WITH_SSL
-extern "C" void evma_accept_ssl_peer (const unsigned long binding)
+extern "C" void evma_accept_ssl_peer (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_accept_ssl_peer");
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
@@ -484,7 +491,7 @@ extern "C" void evma_accept_ssl_peer (const unsigned long binding)
 evma_get_peername
 *****************/
 
-extern "C" int evma_get_peername (const unsigned long binding, struct sockaddr *sa, socklen_t *len)
+extern "C" int evma_get_peername (const uintptr_t binding, struct sockaddr *sa, socklen_t *len)
 {
 	ensure_eventmachine("evma_get_peername");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -499,7 +506,7 @@ extern "C" int evma_get_peername (const unsigned long binding, struct sockaddr *
 evma_get_sockname
 *****************/
 
-extern "C" int evma_get_sockname (const unsigned long binding, struct sockaddr *sa, socklen_t *len)
+extern "C" int evma_get_sockname (const uintptr_t binding, struct sockaddr *sa, socklen_t *len)
 {
 	ensure_eventmachine("evma_get_sockname");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -514,7 +521,7 @@ extern "C" int evma_get_sockname (const unsigned long binding, struct sockaddr *
 evma_get_subprocess_pid
 ***********************/
 
-extern "C" int evma_get_subprocess_pid (const unsigned long binding, pid_t *pid)
+extern "C" int evma_get_subprocess_pid (const uintptr_t binding, pid_t *pid)
 {
 	ensure_eventmachine("evma_get_subprocess_pid");
 	#ifdef OS_UNIX
@@ -537,7 +544,7 @@ extern "C" int evma_get_subprocess_pid (const unsigned long binding, pid_t *pid)
 evma_get_subprocess_status
 **************************/
 
-extern "C" int evma_get_subprocess_status (const unsigned long binding, int *status)
+extern "C" int evma_get_subprocess_status (const uintptr_t binding UNUSED, int *status)
 {
 	ensure_eventmachine("evma_get_subprocess_status");
 	if (status) {
@@ -574,7 +581,7 @@ extern "C" void evma_signal_loopbreak()
 evma_get_comm_inactivity_timeout
 ********************************/
 
-extern "C" float evma_get_comm_inactivity_timeout (const unsigned long binding)
+extern "C" float evma_get_comm_inactivity_timeout (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_get_comm_inactivity_timeout");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -589,7 +596,7 @@ extern "C" float evma_get_comm_inactivity_timeout (const unsigned long binding)
 evma_set_comm_inactivity_timeout
 ********************************/
 
-extern "C" int evma_set_comm_inactivity_timeout (const unsigned long binding, float value)
+extern "C" int evma_set_comm_inactivity_timeout (const uintptr_t binding, float value)
 {
 	ensure_eventmachine("evma_set_comm_inactivity_timeout");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -605,7 +612,7 @@ extern "C" int evma_set_comm_inactivity_timeout (const unsigned long binding, fl
 evma_get_pending_connect_timeout
 ********************************/
 
-extern "C" float evma_get_pending_connect_timeout (const unsigned long binding)
+extern "C" float evma_get_pending_connect_timeout (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_get_pending_connect_timeout");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -621,7 +628,7 @@ extern "C" float evma_get_pending_connect_timeout (const unsigned long binding)
 evma_set_pending_connect_timeout
 ********************************/
 
-extern "C" int evma_set_pending_connect_timeout (const unsigned long binding, float value)
+extern "C" int evma_set_pending_connect_timeout (const uintptr_t binding, float value)
 {
 	ensure_eventmachine("evma_set_pending_connect_timeout");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -700,7 +707,7 @@ extern "C" void evma_setuid_string (const char *username)
 evma_popen
 **********/
 
-extern "C" const unsigned long evma_popen (char * const*cmd_strings)
+extern "C" const uintptr_t evma_popen (char * const*cmd_strings)
 {
 	ensure_eventmachine("evma_popen");
 	return EventMachine->Socketpair (cmd_strings);
@@ -711,7 +718,7 @@ extern "C" const unsigned long evma_popen (char * const*cmd_strings)
 evma_get_outbound_data_size
 ***************************/
 
-extern "C" int evma_get_outbound_data_size (const unsigned long binding)
+extern "C" int evma_get_outbound_data_size (const uintptr_t binding)
 {
 	ensure_eventmachine("evma_get_outbound_data_size");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -725,7 +732,10 @@ evma_set_epoll
 
 extern "C" void evma_set_epoll (int use)
 {
-	bUseEpoll = !!use;
+	if (use)
+		Poller = Poller_Epoll;
+	else
+		Poller = Poller_Default;
 }
 
 /***************
@@ -734,7 +744,10 @@ evma_set_kqueue
 
 extern "C" void evma_set_kqueue (int use)
 {
-	bUseKqueue = !!use;
+	if (use)
+		Poller = Poller_Kqueue;
+	else
+		Poller = Poller_Default;
 }
 
 
@@ -752,7 +765,7 @@ extern "C" int evma_set_rlimit_nofile (int nofiles)
 evma_send_file_data_to_connection
 *********************************/
 
-extern "C" int evma_send_file_data_to_connection (const unsigned long binding, const char *filename)
+extern "C" int evma_send_file_data_to_connection (const uintptr_t binding, const char *filename)
 {
 	/* This is a sugaring over send_data_to_connection that reads a file into a
 	 * locally-allocated buffer, and sends the file data to the remote peer.
@@ -819,7 +832,7 @@ extern "C" int evma_send_file_data_to_connection (const unsigned long binding, c
 evma_start_proxy
 *****************/
 
-extern "C" void evma_start_proxy (const unsigned long from, const unsigned long to, const unsigned long bufsize, const unsigned long length)
+extern "C" void evma_start_proxy (const uintptr_t from, const uintptr_t to, const unsigned long bufsize, const unsigned long length)
 {
 	ensure_eventmachine("evma_start_proxy");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));
@@ -832,7 +845,7 @@ extern "C" void evma_start_proxy (const unsigned long from, const unsigned long
 evma_stop_proxy
 ****************/
 
-extern "C" void evma_stop_proxy (const unsigned long from)
+extern "C" void evma_stop_proxy (const uintptr_t from)
 {
 	ensure_eventmachine("evma_stop_proxy");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));
@@ -844,7 +857,7 @@ extern "C" void evma_stop_proxy (const unsigned long from)
 evma_proxied_bytes
 *******************/
 
-extern "C" unsigned long evma_proxied_bytes (const unsigned long from)
+extern "C" unsigned long evma_proxied_bytes (const uintptr_t from)
 {
 	ensure_eventmachine("evma_proxied_bytes");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));
@@ -859,7 +872,7 @@ extern "C" unsigned long evma_proxied_bytes (const unsigned long from)
 evma_get_last_activity_time
 ****************************/
 
-extern "C" uint64_t evma_get_last_activity_time(const unsigned long from)
+extern "C" uint64_t evma_get_last_activity_time(const uintptr_t from)
 {
 	ensure_eventmachine("evma_get_last_activity_time");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));