eventmachine 1.0.7-java → 1.0.8-java

data/ext/em.h

@@ -97,6 +97,16 @@ class EventableDescriptor;
 class InotifyDescriptor;
 struct SelectData_t;
 
+/*************
+enum Poller_t
+*************/
+enum Poller_t {
+	Poller_Default, // typically Select
+	Poller_Epoll,
+	Poller_Kqueue
+};
+
+
 /********************
 class EventMachine_t
 ********************/
@@ -111,29 +121,30 @@ class EventMachine_t
 		static void SetSimultaneousAcceptCount (int);
 
 	public:
-		EventMachine_t (EMCallback);
+		EventMachine_t (EMCallback, Poller_t);
 		virtual ~EventMachine_t();
 
+		bool RunOnce();
 		void Run();
 		void ScheduleHalt();
 		void SignalLoopBreaker();
-		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 AttachSD (int);
-		const unsigned long OpenKeyboard();
+		const uintptr_t InstallOneshotTimer (int);
+		const uintptr_t ConnectToServer (const char *, int, const char *, int);
+		const uintptr_t ConnectToUnixServer (const char *);
+
+		const uintptr_t CreateTcpServer (const char *, int);
+		const uintptr_t OpenDatagramSocket (const char *, int);
+		const uintptr_t CreateUnixDomainServer (const char*);
+		const uintptr_t AttachSD (int);
+		const uintptr_t OpenKeyboard();
 		//const char *Popen (const char*, const char*);
-		const unsigned long Socketpair (char* const*);
+		const uintptr_t Socketpair (char* const*);
 
 		void Add (EventableDescriptor*);
 		void Modify (EventableDescriptor*);
 		void Deregister (EventableDescriptor*);
 
-		const unsigned long AttachFD (int, bool);
+		const uintptr_t AttachFD (int, bool);
 		int DetachFD (EventableDescriptor*);
 
 		void ArmKqueueWriter (EventableDescriptor*);
@@ -150,18 +161,18 @@ class EventMachine_t
 		float GetHeartbeatInterval();
 		int SetHeartbeatInterval(float);
 
-		const unsigned long WatchFile (const char*);
+		const uintptr_t WatchFile (const char*);
 		void UnwatchFile (int);
-		void UnwatchFile (const unsigned long);
+		void UnwatchFile (const uintptr_t);
 
 		#ifdef HAVE_KQUEUE
 		void _HandleKqueueFileEvent (struct kevent*);
 		void _RegisterKqueueFileEvent(int);
 		#endif
 
-		const unsigned long WatchPid (int);
+		const uintptr_t WatchPid (int);
 		void UnwatchPid (int);
-		void UnwatchPid (const unsigned long);
+		void UnwatchPid (const uintptr_t);
 
 		#ifdef HAVE_KQUEUE
 		void _HandleKqueuePidEvent (struct kevent*);
@@ -169,20 +180,14 @@ class EventMachine_t
 
 		uint64_t GetCurrentLoopTime() { return MyCurrentLoopTime; }
 
-		// Temporary:
-		void _UseEpoll();
-		void _UseKqueue();
-
-		bool UsingKqueue() { return bKqueue; }
-		bool UsingEpoll() { return bEpoll; }
-
 		void QueueHeartbeat(EventableDescriptor*);
 		void ClearHeartbeat(uint64_t, EventableDescriptor*);
 
 		uint64_t GetRealTime();
 
+		Poller_t GetPoller() { return Poller; }
+
 	private:
-		void _RunOnce();
 		void _RunTimers();
 		void _UpdateTime();
 		void _AddNewDescriptors();
@@ -223,8 +228,6 @@ class EventMachine_t
 		vector<EventableDescriptor*> NewDescriptors;
 		set<EventableDescriptor*> ModifiedDescriptors;
 
-		uint64_t NextHeartbeatTime;
-
 		int LoopBreakerReader;
 		int LoopBreakerWriter;
 		#ifdef OS_WIN32
@@ -248,19 +251,21 @@ class EventMachine_t
 		bool bTerminateSignalReceived;
 		SelectData_t *SelectData;
 
-		bool bEpoll;
+		Poller_t Poller;
+
 		int epfd; // Epoll file-descriptor
 		#ifdef HAVE_EPOLL
 		struct epoll_event epoll_events [MaxEvents];
 		#endif
 
-		bool bKqueue;
 		int kqfd; // Kqueue file-descriptor
 		#ifdef HAVE_KQUEUE
 		struct kevent Karray [MaxEvents];
 		#endif
 
+		#ifdef HAVE_INOTIFY
 		InotifyDescriptor *inotify; // pollable descriptor for our inotify instance
+		#endif
 };
 
 

data/ext/eventmachine.h

@@ -41,57 +41,58 @@ extern "C" {
 	};
 
 	void evma_initialize_library (EMCallback);
+	bool evma_run_machine_once();
 	void evma_run_machine();
 	void evma_release_library();
-	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);
-
-    int evma_num_close_scheduled();
-
-	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);
-	void evma_start_tls (const unsigned long binding);
+	const uintptr_t evma_install_oneshot_timer (int seconds);
+	const uintptr_t evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
+	const uintptr_t evma_connect_to_unix_server (const char *server);
+
+	const uintptr_t evma_attach_fd (int file_descriptor, int watch_mode);
+	int evma_detach_fd (const uintptr_t binding);
+	int evma_get_file_descriptor (const uintptr_t binding);
+	int evma_is_notify_readable (const uintptr_t binding);
+	void evma_set_notify_readable (const uintptr_t binding, int mode);
+	int evma_is_notify_writable (const uintptr_t binding);
+	void evma_set_notify_writable (const uintptr_t binding, int mode);
+
+	int evma_pause(const uintptr_t binding);
+	int evma_is_paused(const uintptr_t binding);
+	int evma_resume(const uintptr_t binding);
+
+	int evma_num_close_scheduled();
+
+	void evma_stop_tcp_server (const uintptr_t binding);
+	const uintptr_t evma_create_tcp_server (const char *address, int port);
+	const uintptr_t evma_create_unix_domain_server (const char *filename);
+	const uintptr_t evma_attach_sd (int sd);
+	const uintptr_t evma_open_datagram_socket (const char *server, int port);
+	const uintptr_t evma_open_keyboard();
+	void evma_set_tls_parms (const uintptr_t binding, const char *privatekey_filename, const char *certchain_filenane, int verify_peer);
+	void evma_start_tls (const uintptr_t binding);
 
 	#ifdef WITH_SSL
-	X509 *evma_get_peer_cert (const unsigned long binding);
-	void evma_accept_ssl_peer (const unsigned long binding);
+	X509 *evma_get_peer_cert (const uintptr_t binding);
+	void evma_accept_ssl_peer (const uintptr_t binding);
 	#endif
 
-	int evma_get_peername (const unsigned long binding, struct sockaddr*, socklen_t*);
-	int evma_get_sockname (const unsigned long binding, struct sockaddr*, socklen_t*);
-	int evma_get_subprocess_pid (const unsigned long binding, pid_t*);
-	int evma_get_subprocess_status (const unsigned long binding, int*);
+	int evma_get_peername (const uintptr_t binding, struct sockaddr*, socklen_t*);
+	int evma_get_sockname (const uintptr_t binding, struct sockaddr*, socklen_t*);
+	int evma_get_subprocess_pid (const uintptr_t binding, pid_t*);
+	int evma_get_subprocess_status (const uintptr_t binding, int*);
 	int evma_get_connection_count();
-	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);
-	uint64_t evma_get_last_activity_time (const unsigned long);
-	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);
+	int evma_send_data_to_connection (const uintptr_t binding, const char *data, int data_length);
+	int evma_send_datagram (const uintptr_t binding, const char *data, int data_length, const char *address, int port);
+	float evma_get_comm_inactivity_timeout (const uintptr_t binding);
+	int evma_set_comm_inactivity_timeout (const uintptr_t binding, float value);
+	float evma_get_pending_connect_timeout (const uintptr_t binding);
+	int evma_set_pending_connect_timeout (const uintptr_t binding, float value);
+	int evma_get_outbound_data_size (const uintptr_t binding);
+	uint64_t evma_get_last_activity_time (const uintptr_t binding);
+	int evma_send_file_data_to_connection (const uintptr_t binding, const char *filename);
+
+	void evma_close_connection (const uintptr_t binding, int after_writing);
+	int evma_report_connection_error_status (const uintptr_t binding);
 	void evma_signal_loopbreak();
 	void evma_set_timer_quantum (int);
 	int evma_get_max_timer_count();
@@ -103,17 +104,17 @@ extern "C" {
 	float evma_get_heartbeat_interval();
 	int evma_set_heartbeat_interval(float);
 
-	const unsigned long evma_popen (char * const*cmd_strings);
+	const uintptr_t evma_popen (char * const*cmd_strings);
 
-	const unsigned long evma_watch_filename (const char *fname);
-	void evma_unwatch_filename (const unsigned long);
+	const uintptr_t evma_watch_filename (const char *fname);
+	void evma_unwatch_filename (const uintptr_t binding);
 
-	const unsigned long evma_watch_pid (int);
-	void evma_unwatch_pid (const unsigned long);
+	const uintptr_t evma_watch_pid (int);
+	void evma_unwatch_pid (const uintptr_t binding);
 
-	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long, const unsigned long);
-	void evma_stop_proxy(const unsigned long);
-	unsigned long evma_proxied_bytes(const unsigned long);
+	void evma_start_proxy(const uintptr_t from, const uintptr_t to, const unsigned long bufsize, const unsigned long length);
+	void evma_stop_proxy(const uintptr_t from);
+	unsigned long evma_proxied_bytes(const uintptr_t from);
 
 	int evma_set_rlimit_nofile (int n_files);
 

data/ext/extconf.rb

@@ -25,15 +25,15 @@ end
 def manual_ssl_config
   ssl_libs_heads_args = {
     :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :mswin => [%w[ssleay32 eay32], %w[openssl/ssl.h openssl/err.h]],
+    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
   }
 
   dc_flags = ['ssl']
   dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM and ENV['OPENSSL']
 
   libs, heads = case RUBY_PLATFORM
-  when /mswin/    ; ssl_libs_heads_args[:mswin]
-  else              ssl_libs_heads_args[:unix]
+  when /mswin|mingw|bccwin/ ; ssl_libs_heads_args[:mswin]
+  else                        ssl_libs_heads_args[:unix]
   end
   dir_config(*dc_flags)
   check_libs(libs) and check_heads(heads)
@@ -76,6 +76,9 @@ add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sy
 add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
 add_define 'HAVE_RB_THREAD_FD_SELECT' if have_func('rb_thread_fd_select')
 add_define 'HAVE_RB_FDSET_T' if have_type('rb_fdset_t', 'ruby/intern.h')
+add_define 'HAVE_PIPE2' if have_func('pipe2', 'unistd.h')
+add_define 'HAVE_ACCEPT4' if have_func('accept4', 'sys/socket.h')
+add_define 'HAVE_SOCK_CLOEXEC' if have_const('SOCK_CLOEXEC', 'sys/socket.h')
 
 have_func('rb_wait_for_single_fd')
 have_func('rb_enable_interrupt')
@@ -172,6 +175,26 @@ else
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 end
 
+# This is our wishlist. We use whichever flags work on the host.
+# In the future, add -Werror to make sure all warnings are resolved.
+# deprecated-declarations are used in OS X OpenSSL
+# ignored-qualifiers are used by the Bindings (would-be void *)
+# unused-result because GCC 4.6 no longer silences (void) ignore_this(function)
+%w(
+  -Wall
+  -Wextra
+  -Wno-deprecated-declarations
+  -Wno-ignored-qualifiers
+  -Wno-unused-result
+).select do |flag|
+  try_link('int main() {return 0;}', flag)
+end.each do |flag|
+  $CFLAGS << ' ' << flag
+  $CPPFLAGS << ' ' << flag
+end
+puts "CFLAGS=#{$CFLAGS}"
+puts "CPPFLAGS=#{$CPPFLAGS}"
+
 # Platform-specific time functions
 if have_func('clock_gettime')
   # clock_gettime is POSIX, but the monotonic clocks are not

data/ext/fastfilereader/rubymain.cpp

@@ -48,7 +48,7 @@ mapper_new
 
 static VALUE mapper_new (VALUE self, VALUE filename)
 {
-	Mapper_t *m = new Mapper_t (StringValuePtr (filename));
+	Mapper_t *m = new Mapper_t (StringValueCStr (filename));
 	if (!m)
 		rb_raise (rb_eException, "No Mapper Object");
 	VALUE v = Data_Wrap_Struct (Mapper, 0, mapper_dt, (void*)m);

data/ext/kb.cpp

@@ -74,6 +74,6 @@ KeyboardDescriptor::Read
 void KeyboardDescriptor::Read()
 {
 	char c;
-	read (GetSocket(), &c, 1);
+	(void)read (GetSocket(), &c, 1);
 	_GenericInboundDispatch(&c, 1);
 }

data/ext/pipe.cpp

@@ -242,7 +242,9 @@ void PipeDescriptor::Write()
 			OutboundPages.push_front (OutboundPage (buffer, len));
 		}
 		#ifdef HAVE_EPOLL
-		EpollEvent.events = (EPOLLIN | (SelectForWrite() ? EPOLLOUT : 0));
+		EpollEvent.events = EPOLLIN;
+		if (SelectForWrite())
+			EpollEvent.events |= EPOLLOUT;
 		assert (MyEventMachine);
 		MyEventMachine->Modify (this);
 		#endif
@@ -305,7 +307,7 @@ bool PipeDescriptor::SelectForWrite()
 PipeDescriptor::SendOutboundData
 ********************************/
 
-int PipeDescriptor::SendOutboundData (const char *data, int length)
+int PipeDescriptor::SendOutboundData (const char *data, unsigned long length)
 {
 	//if (bCloseNow || bCloseAfterWriting)
 	if (IsCloseScheduled())

data/ext/project.h

@@ -155,6 +155,12 @@ extern "C" {
 }
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#define UNUSED __attribute__ ((unused))
+#else
+#define UNUSED
+#endif
+
 #include "binder.h"
 #include "em.h"
 #include "ed.h"

data/ext/rubymain.cpp

@@ -25,6 +25,16 @@ See the file COPYING for complete licensing information.
 #define RFLOAT_VALUE(arg) RFLOAT(arg)->value
 #endif
 
+/* Adapted from NUM2BSIG / BSIG2NUM in ext/fiddle/conversions.h,
+ * we'll call it a BSIG for Binding Signature here. */
+#if SIZEOF_VOIDP == SIZEOF_LONG
+# define BSIG2NUM(x)   (ULONG2NUM((unsigned long)(x)))
+# define NUM2BSIG(x)   (NUM2ULONG(x))
+#else
+# define BSIG2NUM(x)   (ULL2NUM((unsigned long long)(x)))
+# define NUM2BSIG(x)   (NUM2ULL(x))
+#endif
+
 /*******
 Statics
 *******/
@@ -59,15 +69,15 @@ static VALUE Intern_connection_completed;
 static VALUE rb_cProcStatus;
 
 struct em_event {
-	unsigned long signature;
+	uintptr_t signature;
 	int event;
 	const char *data_str;
 	unsigned long data_num;
 };
 
-static inline VALUE ensure_conn(const unsigned long signature)
+static inline VALUE ensure_conn(const uintptr_t signature)
 {
-	VALUE conn = rb_hash_aref (EmConnsHash, ULONG2NUM (signature));
+	VALUE conn = rb_hash_aref (EmConnsHash, BSIG2NUM (signature));
 	if (conn == Qnil)
 		rb_raise (EM_eConnectionNotBound, "unknown connection: %lu", signature);
 	return conn;
@@ -80,7 +90,7 @@ t_event_callback
 
 static inline void event_callback (struct em_event* e)
 {
-	const unsigned long signature = e->signature;
+	const uintptr_t signature = e->signature;
 	int event = e->event;
 	const char *data_str = e->data_str;
 	const unsigned long data_num = e->data_num;
@@ -88,7 +98,7 @@ static inline void event_callback (struct em_event* e)
 	switch (event) {
 		case EM_CONNECTION_READ:
 		{
-			VALUE conn = rb_hash_aref (EmConnsHash, ULONG2NUM (signature));
+			VALUE conn = rb_hash_aref (EmConnsHash, BSIG2NUM (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));
@@ -96,12 +106,12 @@ static inline void event_callback (struct em_event* e)
 		}
 		case EM_CONNECTION_ACCEPTED:
 		{
-			rb_funcall (EmModule, Intern_event_callback, 3, ULONG2NUM(signature), INT2FIX(event), ULONG2NUM(data_num));
+			rb_funcall (EmModule, Intern_event_callback, 3, BSIG2NUM(signature), INT2FIX(event), ULONG2NUM(data_num));
 			return;
 		}
 		case EM_CONNECTION_UNBOUND:
 		{
-			rb_funcall (EmModule, Intern_event_callback, 3, ULONG2NUM(signature), INT2FIX(event), ULONG2NUM(data_num));
+			rb_funcall (EmModule, Intern_event_callback, 3, BSIG2NUM(signature), INT2FIX(event), ULONG2NUM(data_num));
 			return;
 		}
 		case EM_CONNECTION_COMPLETED:
@@ -174,7 +184,7 @@ static inline void event_callback (struct em_event* e)
 event_error_handler
 *******************/
 
-static void event_error_handler(VALUE unused, VALUE err)
+static void event_error_handler(VALUE self UNUSED, VALUE err)
 {
 	VALUE error_handler = rb_ivar_get(EmModule, Intern_at_error_handler);
 	rb_funcall (error_handler, Intern_call, 1, err);
@@ -184,7 +194,7 @@ static void event_error_handler(VALUE unused, VALUE err)
 event_callback_wrapper
 **********************/
 
-static void event_callback_wrapper (const unsigned long signature, int event, const char *data_str, const unsigned long data_num)
+static void event_callback_wrapper (const uintptr_t signature, int event, const char *data_str, const unsigned long data_num)
 {
 	struct em_event e;
 	e.signature = signature;
@@ -202,7 +212,7 @@ static void event_callback_wrapper (const unsigned long signature, int event, co
 t_initialize_event_machine
 **************************/
 
-static VALUE t_initialize_event_machine (VALUE self)
+static VALUE t_initialize_event_machine (VALUE self UNUSED)
 {
 	EmConnsHash = rb_ivar_get (EmModule, Intern_at_conns);
 	EmTimersHash = rb_ivar_get (EmModule, Intern_at_timers);
@@ -213,12 +223,21 @@ static VALUE t_initialize_event_machine (VALUE self)
 }
 
 
+/******************
+t_run_machine_once
+******************/
 
-/*****************************
-t_run_machine_without_threads
-*****************************/
+static VALUE t_run_machine_once (VALUE self UNUSED)
+{
+	return evma_run_machine_once () ? Qtrue : Qfalse;
+}
 
-static VALUE t_run_machine_without_threads (VALUE self)
+
+/*************
+t_run_machine
+*************/
+
+static VALUE t_run_machine (VALUE self UNUSED)
 {
 	evma_run_machine();
 	return Qnil;
@@ -229,12 +248,12 @@ static VALUE t_run_machine_without_threads (VALUE self)
 t_add_oneshot_timer
 *******************/
 
-static VALUE t_add_oneshot_timer (VALUE self, VALUE interval)
+static VALUE t_add_oneshot_timer (VALUE self UNUSED, VALUE interval)
 {
-	const unsigned long f = evma_install_oneshot_timer (FIX2INT (interval));
+	const uintptr_t f = evma_install_oneshot_timer (FIX2INT (interval));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "ran out of timers; use #set_max_timers to increase limit");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 
@@ -242,21 +261,21 @@ static VALUE t_add_oneshot_timer (VALUE self, VALUE interval)
 t_start_server
 **************/
 
-static VALUE t_start_server (VALUE self, VALUE server, VALUE port)
+static VALUE t_start_server (VALUE self UNUSED, VALUE server, VALUE port)
 {
-	const unsigned long f = evma_create_tcp_server (StringValuePtr(server), FIX2INT(port));
+	const uintptr_t f = evma_create_tcp_server (StringValueCStr(server), FIX2INT(port));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no acceptor (port is in use or requires root privileges)");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 /*************
 t_stop_server
 *************/
 
-static VALUE t_stop_server (VALUE self, VALUE signature)
+static VALUE t_stop_server (VALUE self UNUSED, VALUE signature)
 {
-	evma_stop_tcp_server (NUM2ULONG (signature));
+	evma_stop_tcp_server (NUM2BSIG (signature));
 	return Qnil;
 }
 
@@ -265,24 +284,24 @@ static VALUE t_stop_server (VALUE self, VALUE signature)
 t_start_unix_server
 *******************/
 
-static VALUE t_start_unix_server (VALUE self, VALUE filename)
+static VALUE t_start_unix_server (VALUE self UNUSED, VALUE filename)
 {
-	const unsigned long f = evma_create_unix_domain_server (StringValuePtr(filename));
+	const uintptr_t f = evma_create_unix_domain_server (StringValueCStr(filename));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no unix-domain acceptor");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 /********************
 t_attach_sd
 ********************/
 
-static VALUE t_attach_sd(VALUE self, VALUE sd)
+static VALUE t_attach_sd(VALUE self UNUSED, VALUE sd)
 {
-	const unsigned long f = evma_attach_sd(FIX2INT(sd));
+	const uintptr_t f = evma_attach_sd(FIX2INT(sd));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no socket descriptor acceptor");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 
@@ -290,9 +309,9 @@ static VALUE t_attach_sd(VALUE self, VALUE sd)
 t_send_data
 ***********/
 
-static VALUE t_send_data (VALUE self, VALUE signature, VALUE data, VALUE data_length)
+static VALUE t_send_data (VALUE self UNUSED, VALUE signature, VALUE data, VALUE data_length)
 {
-	int b = evma_send_data_to_connection (NUM2ULONG (signature), StringValuePtr (data), FIX2INT (data_length));
+	int b = evma_send_data_to_connection (NUM2BSIG (signature), StringValuePtr (data), FIX2INT (data_length));
 	return INT2NUM (b);
 }
 
@@ -301,9 +320,9 @@ static VALUE t_send_data (VALUE self, VALUE signature, VALUE data, VALUE data_le
 t_start_tls
 ***********/
 
-static VALUE t_start_tls (VALUE self, VALUE signature)
+static VALUE t_start_tls (VALUE self UNUSED, VALUE signature)
 {
-	evma_start_tls (NUM2ULONG (signature));
+	evma_start_tls (NUM2BSIG (signature));
 	return Qnil;
 }
 
@@ -311,14 +330,14 @@ static VALUE t_start_tls (VALUE self, VALUE signature)
 t_set_tls_parms
 ***************/
 
-static VALUE t_set_tls_parms (VALUE self, VALUE signature, VALUE privkeyfile, VALUE certchainfile, VALUE verify_peer)
+static VALUE t_set_tls_parms (VALUE self UNUSED, VALUE signature, VALUE privkeyfile, VALUE certchainfile, VALUE verify_peer)
 {
 	/* set_tls_parms takes a series of positional arguments for specifying such things
 	 * as private keys and certificate chains.
 	 * 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 (NUM2ULONG (signature), StringValuePtr (privkeyfile), StringValuePtr (certchainfile), (verify_peer == Qtrue ? 1 : 0));
+	evma_set_tls_parms (NUM2BSIG (signature), StringValueCStr (privkeyfile), StringValueCStr (certchainfile), (verify_peer == Qtrue ? 1 : 0));
 	return Qnil;
 }
 
@@ -326,7 +345,7 @@ static VALUE t_set_tls_parms (VALUE self, VALUE signature, VALUE privkeyfile, VA
 t_get_peer_cert
 ***************/
 
-static VALUE t_get_peer_cert (VALUE self, VALUE signature)
+static VALUE t_get_peer_cert (VALUE self UNUSED, VALUE signature)
 {
 	VALUE ret = Qnil;
 
@@ -335,7 +354,7 @@ static VALUE t_get_peer_cert (VALUE self, VALUE signature)
 	BUF_MEM *buf;
 	BIO *out;
 
-	cert = evma_get_peer_cert (NUM2ULONG (signature));
+	cert = evma_get_peer_cert (NUM2BSIG (signature));
 
 	if (cert != NULL) {
 		out = BIO_new(BIO_s_mem());
@@ -354,11 +373,11 @@ static VALUE t_get_peer_cert (VALUE self, VALUE signature)
 t_get_peername
 **************/
 
-static VALUE t_get_peername (VALUE self, VALUE signature)
+static VALUE t_get_peername (VALUE self UNUSED, VALUE signature)
 {
 	char buf[1024];
 	socklen_t len = sizeof buf;
-	if (evma_get_peername (NUM2ULONG (signature), (struct sockaddr*)buf, &len)) {
+	if (evma_get_peername (NUM2BSIG (signature), (struct sockaddr*)buf, &len)) {
 		return rb_str_new (buf, len);
 	}
 
@@ -369,11 +388,11 @@ static VALUE t_get_peername (VALUE self, VALUE signature)
 t_get_sockname
 **************/
 
-static VALUE t_get_sockname (VALUE self, VALUE signature)
+static VALUE t_get_sockname (VALUE self UNUSED, VALUE signature)
 {
 	char buf[1024];
 	socklen_t len = sizeof buf;
-	if (evma_get_sockname (NUM2ULONG (signature), (struct sockaddr*)buf, &len)) {
+	if (evma_get_sockname (NUM2BSIG (signature), (struct sockaddr*)buf, &len)) {
 		return rb_str_new (buf, len);
 	}
 
@@ -384,10 +403,10 @@ static VALUE t_get_sockname (VALUE self, VALUE signature)
 t_get_subprocess_pid
 ********************/
 
-static VALUE t_get_subprocess_pid (VALUE self, VALUE signature)
+static VALUE t_get_subprocess_pid (VALUE self UNUSED, VALUE signature)
 {
 	pid_t pid;
-	if (evma_get_subprocess_pid (NUM2ULONG (signature), &pid)) {
+	if (evma_get_subprocess_pid (NUM2BSIG (signature), &pid)) {
 		return INT2NUM (pid);
 	}
 
@@ -398,15 +417,15 @@ static VALUE t_get_subprocess_pid (VALUE self, VALUE signature)
 t_get_subprocess_status
 ***********************/
 
-static VALUE t_get_subprocess_status (VALUE self, VALUE signature)
+static VALUE t_get_subprocess_status (VALUE self UNUSED, VALUE signature)
 {
 	VALUE proc_status = Qnil;
 
 	int status;
 	pid_t pid;
 
-	if (evma_get_subprocess_status (NUM2ULONG (signature), &status)) {
-		if (evma_get_subprocess_pid (NUM2ULONG (signature), &pid)) {
+	if (evma_get_subprocess_status (NUM2BSIG (signature), &status)) {
+		if (evma_get_subprocess_pid (NUM2BSIG (signature), &pid)) {
 			proc_status = rb_obj_alloc(rb_cProcStatus);
 
 			/* MRI Ruby uses hidden instance vars */
@@ -434,7 +453,7 @@ static VALUE t_get_subprocess_status (VALUE self, VALUE signature)
 t_get_connection_count
 **********************/
 
-static VALUE t_get_connection_count (VALUE self)
+static VALUE t_get_connection_count (VALUE self UNUSED)
 {
 	return INT2NUM(evma_get_connection_count());
 }
@@ -443,19 +462,19 @@ static VALUE t_get_connection_count (VALUE self)
 t_get_comm_inactivity_timeout
 *****************************/
 
-static VALUE t_get_comm_inactivity_timeout (VALUE self, VALUE signature)
+static VALUE t_get_comm_inactivity_timeout (VALUE self UNUSED, VALUE signature)
 {
-	return rb_float_new(evma_get_comm_inactivity_timeout(NUM2ULONG (signature)));
+	return rb_float_new(evma_get_comm_inactivity_timeout(NUM2BSIG (signature)));
 }
 
 /*****************************
 t_set_comm_inactivity_timeout
 *****************************/
 
-static VALUE t_set_comm_inactivity_timeout (VALUE self, VALUE signature, VALUE timeout)
+static VALUE t_set_comm_inactivity_timeout (VALUE self UNUSED, VALUE signature, VALUE timeout)
 {
 	float ti = RFLOAT_VALUE(timeout);
-	if (evma_set_comm_inactivity_timeout(NUM2ULONG(signature), ti)) {
+	if (evma_set_comm_inactivity_timeout(NUM2BSIG(signature), ti)) {
 		return Qtrue;
 	}
 	return Qfalse;
@@ -465,19 +484,19 @@ static VALUE t_set_comm_inactivity_timeout (VALUE self, VALUE signature, VALUE t
 t_get_pending_connect_timeout
 *****************************/
 
-static VALUE t_get_pending_connect_timeout (VALUE self, VALUE signature)
+static VALUE t_get_pending_connect_timeout (VALUE self UNUSED, VALUE signature)
 {
-	return rb_float_new(evma_get_pending_connect_timeout(NUM2ULONG (signature)));
+	return rb_float_new(evma_get_pending_connect_timeout(NUM2BSIG (signature)));
 }
 
 /*****************************
 t_set_pending_connect_timeout
 *****************************/
 
-static VALUE t_set_pending_connect_timeout (VALUE self, VALUE signature, VALUE timeout)
+static VALUE t_set_pending_connect_timeout (VALUE self UNUSED, VALUE signature, VALUE timeout)
 {
 	float ti = RFLOAT_VALUE(timeout);
-	if (evma_set_pending_connect_timeout(NUM2ULONG(signature), ti)) {
+	if (evma_set_pending_connect_timeout(NUM2BSIG(signature), ti)) {
 		return Qtrue;
 	}
 	return Qfalse;
@@ -487,9 +506,9 @@ static VALUE t_set_pending_connect_timeout (VALUE self, VALUE signature, VALUE t
 t_send_datagram
 ***************/
 
-static VALUE t_send_datagram (VALUE self, VALUE signature, VALUE data, VALUE data_length, VALUE address, VALUE port)
+static VALUE t_send_datagram (VALUE self UNUSED, VALUE signature, VALUE data, VALUE data_length, VALUE address, VALUE port)
 {
-	int b = evma_send_datagram (NUM2ULONG (signature), StringValuePtr (data), FIX2INT (data_length), StringValuePtr(address), FIX2INT(port));
+	int b = evma_send_datagram (NUM2BSIG (signature), StringValuePtr (data), FIX2INT (data_length), StringValueCStr(address), FIX2INT(port));
 	return INT2NUM (b);
 }
 
@@ -498,9 +517,9 @@ static VALUE t_send_datagram (VALUE self, VALUE signature, VALUE data, VALUE dat
 t_close_connection
 ******************/
 
-static VALUE t_close_connection (VALUE self, VALUE signature, VALUE after_writing)
+static VALUE t_close_connection (VALUE self UNUSED, VALUE signature, VALUE after_writing)
 {
-	evma_close_connection (NUM2ULONG (signature), ((after_writing == Qtrue) ? 1 : 0));
+	evma_close_connection (NUM2BSIG (signature), ((after_writing == Qtrue) ? 1 : 0));
 	return Qnil;
 }
 
@@ -508,9 +527,9 @@ static VALUE t_close_connection (VALUE self, VALUE signature, VALUE after_writin
 t_report_connection_error_status
 ********************************/
 
-static VALUE t_report_connection_error_status (VALUE self, VALUE signature)
+static VALUE t_report_connection_error_status (VALUE self UNUSED, VALUE signature)
 {
-	int b = evma_report_connection_error_status (NUM2ULONG (signature));
+	int b = evma_report_connection_error_status (NUM2BSIG (signature));
 	return INT2NUM (b);
 }
 
@@ -520,17 +539,17 @@ static VALUE t_report_connection_error_status (VALUE self, VALUE signature)
 t_connect_server
 ****************/
 
-static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
+static VALUE t_connect_server (VALUE self UNUSED, VALUE server, VALUE port)
 {
 	// Avoid FIX2INT in this case, because it doesn't deal with type errors properly.
 	// 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.
 
 	try {
-		const unsigned long f = evma_connect_to_server (NULL, 0, StringValuePtr(server), NUM2INT(port));
+		const uintptr_t f = evma_connect_to_server (NULL, 0, StringValueCStr(server), NUM2INT(port));
 		if (!f)
 			rb_raise (EM_eConnectionError, "%s", "no connection");
-		return ULONG2NUM (f);
+		return BSIG2NUM (f);
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
@@ -541,17 +560,17 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 t_bind_connect_server
 *********************/
 
-static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port, VALUE server, VALUE port)
+static VALUE t_bind_connect_server (VALUE self UNUSED, VALUE bind_addr, VALUE bind_port, VALUE server, VALUE port)
 {
 	// Avoid FIX2INT in this case, because it doesn't deal with type errors properly.
 	// 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.
 
 	try {
-		const unsigned long f = evma_connect_to_server (StringValuePtr(bind_addr), NUM2INT(bind_port), StringValuePtr(server), NUM2INT(port));
+		const uintptr_t f = evma_connect_to_server (StringValueCStr(bind_addr), NUM2INT(bind_port), StringValueCStr(server), NUM2INT(port));
 		if (!f)
 			rb_raise (EM_eConnectionError, "%s", "no connection");
-		return ULONG2NUM (f);
+		return BSIG2NUM (f);
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
@@ -562,50 +581,50 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 t_connect_unix_server
 *********************/
 
-static VALUE t_connect_unix_server (VALUE self, VALUE serversocket)
+static VALUE t_connect_unix_server (VALUE self UNUSED, VALUE serversocket)
 {
-	const unsigned long f = evma_connect_to_unix_server (StringValuePtr(serversocket));
+	const uintptr_t f = evma_connect_to_unix_server (StringValueCStr(serversocket));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no connection");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 /***********
 t_attach_fd
 ***********/
 
-static VALUE t_attach_fd (VALUE self, VALUE file_descriptor, VALUE watch_mode)
+static VALUE t_attach_fd (VALUE self UNUSED, VALUE file_descriptor, VALUE watch_mode)
 {
-	const unsigned long f = evma_attach_fd (NUM2INT(file_descriptor), watch_mode == Qtrue);
+	const uintptr_t f = evma_attach_fd (NUM2INT(file_descriptor), watch_mode == Qtrue);
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no connection");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 /***********
 t_detach_fd
 ***********/
 
-static VALUE t_detach_fd (VALUE self, VALUE signature)
+static VALUE t_detach_fd (VALUE self UNUSED, VALUE signature)
 {
-	return INT2NUM(evma_detach_fd (NUM2ULONG (signature)));
+	return INT2NUM(evma_detach_fd (NUM2BSIG (signature)));
 }
 
 /*********************
 t_get_file_descriptor
 *********************/
-static VALUE t_get_file_descriptor (VALUE self, VALUE signature)
+static VALUE t_get_file_descriptor (VALUE self UNUSED, VALUE signature)
 {
-	return INT2NUM(evma_get_file_descriptor (NUM2ULONG (signature)));
+	return INT2NUM(evma_get_file_descriptor (NUM2BSIG (signature)));
 }
 
 /**************
 t_get_sock_opt
 **************/
 
-static VALUE t_get_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optname)
+static VALUE t_get_sock_opt (VALUE self UNUSED, VALUE signature, VALUE lev, VALUE optname)
 {
-	int fd = evma_get_file_descriptor (NUM2ULONG (signature));
+	int fd = evma_get_file_descriptor (NUM2BSIG (signature));
 	int level = NUM2INT(lev), option = NUM2INT(optname);
 	socklen_t len = 128;
 	char buf[128];
@@ -620,9 +639,9 @@ static VALUE t_get_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optna
 t_set_sock_opt
 **************/
 
-static VALUE t_set_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optname, VALUE optval)
+static VALUE t_set_sock_opt (VALUE self UNUSED, VALUE signature, VALUE lev, VALUE optname, VALUE optval)
 {
-	int fd = evma_get_file_descriptor (NUM2ULONG (signature));
+	int fd = evma_get_file_descriptor (NUM2BSIG (signature));
 	int level = NUM2INT(lev), option = NUM2INT(optname);
 	int i;
 	const void *v;
@@ -658,18 +677,18 @@ static VALUE t_set_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optna
 t_is_notify_readable
 ********************/
 
-static VALUE t_is_notify_readable (VALUE self, VALUE signature)
+static VALUE t_is_notify_readable (VALUE self UNUSED, VALUE signature)
 {
-	return evma_is_notify_readable(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+	return evma_is_notify_readable(NUM2BSIG (signature)) ? Qtrue : Qfalse;
 }
 
 /*********************
 t_set_notify_readable
 *********************/
 
-static VALUE t_set_notify_readable (VALUE self, VALUE signature, VALUE mode)
+static VALUE t_set_notify_readable (VALUE self UNUSED, VALUE signature, VALUE mode)
 {
-	evma_set_notify_readable(NUM2ULONG (signature), mode == Qtrue);
+	evma_set_notify_readable(NUM2BSIG(signature), mode == Qtrue);
 	return Qnil;
 }
 
@@ -677,18 +696,18 @@ static VALUE t_set_notify_readable (VALUE self, VALUE signature, VALUE mode)
 t_is_notify_readable
 ********************/
 
-static VALUE t_is_notify_writable (VALUE self, VALUE signature)
+static VALUE t_is_notify_writable (VALUE self UNUSED, VALUE signature)
 {
-	return evma_is_notify_writable(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+	return evma_is_notify_writable(NUM2BSIG (signature)) ? Qtrue : Qfalse;
 }
 
 /*********************
 t_set_notify_writable
 *********************/
 
-static VALUE t_set_notify_writable (VALUE self, VALUE signature, VALUE mode)
+static VALUE t_set_notify_writable (VALUE self UNUSED, VALUE signature, VALUE mode)
 {
-	evma_set_notify_writable(NUM2ULONG (signature), mode == Qtrue);
+	evma_set_notify_writable(NUM2BSIG (signature), mode == Qtrue);
 	return Qnil;
 }
 
@@ -696,34 +715,34 @@ static VALUE t_set_notify_writable (VALUE self, VALUE signature, VALUE mode)
 t_pause
 *******/
 
-static VALUE t_pause (VALUE self, VALUE signature)
+static VALUE t_pause (VALUE self UNUSED, VALUE signature)
 {
-	return evma_pause(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+	return evma_pause(NUM2BSIG (signature)) ? Qtrue : Qfalse;
 }
 
 /********
 t_resume
 ********/
 
-static VALUE t_resume (VALUE self, VALUE signature)
+static VALUE t_resume (VALUE self UNUSED, VALUE signature)
 {
-	return evma_resume(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+	return evma_resume(NUM2BSIG (signature)) ? Qtrue : Qfalse;
 }
 
 /**********
 t_paused_p
 **********/
 
-static VALUE t_paused_p (VALUE self, VALUE signature)
+static VALUE t_paused_p (VALUE self UNUSED, VALUE signature)
 {
-	return evma_is_paused(NUM2ULONG (signature)) ? Qtrue : Qfalse;
+	return evma_is_paused(NUM2BSIG (signature)) ? Qtrue : Qfalse;
 }
 
 /*********************
 t_num_close_scheduled
 *********************/
 
-static VALUE t_num_close_scheduled (VALUE self)
+static VALUE t_num_close_scheduled (VALUE self UNUSED)
 {
 	return INT2FIX(evma_num_close_scheduled());
 }
@@ -732,12 +751,12 @@ static VALUE t_num_close_scheduled (VALUE self)
 t_open_udp_socket
 *****************/
 
-static VALUE t_open_udp_socket (VALUE self, VALUE server, VALUE port)
+static VALUE t_open_udp_socket (VALUE self UNUSED, VALUE server, VALUE port)
 {
-	const unsigned long f = evma_open_datagram_socket (StringValuePtr(server), FIX2INT(port));
+	const uintptr_t f = evma_open_datagram_socket (StringValueCStr(server), FIX2INT(port));
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no datagram socket");
-	return ULONG2NUM (f);
+	return BSIG2NUM(f);
 }
 
 
@@ -746,7 +765,7 @@ static VALUE t_open_udp_socket (VALUE self, VALUE server, VALUE port)
 t_release_machine
 *****************/
 
-static VALUE t_release_machine (VALUE self)
+static VALUE t_release_machine (VALUE self UNUSED)
 {
 	evma_release_library();
 	return Qnil;
@@ -757,7 +776,7 @@ static VALUE t_release_machine (VALUE self)
 t_stop
 ******/
 
-static VALUE t_stop (VALUE self)
+static VALUE t_stop (VALUE self UNUSED)
 {
 	evma_stop_machine();
 	return Qnil;
@@ -767,7 +786,7 @@ static VALUE t_stop (VALUE self)
 t_signal_loopbreak
 ******************/
 
-static VALUE t_signal_loopbreak (VALUE self)
+static VALUE t_signal_loopbreak (VALUE self UNUSED)
 {
 	evma_signal_loopbreak();
 	return Qnil;
@@ -777,7 +796,7 @@ static VALUE t_signal_loopbreak (VALUE self)
 t_library_type
 **************/
 
-static VALUE t_library_type (VALUE self)
+static VALUE t_library_type (VALUE self UNUSED)
 {
 	return rb_eval_string (":extension");
 }
@@ -788,54 +807,54 @@ static VALUE t_library_type (VALUE self)
 t_set_timer_quantum
 *******************/
 
-static VALUE t_set_timer_quantum (VALUE self, VALUE interval)
+static VALUE t_set_timer_quantum (VALUE self UNUSED, VALUE interval)
 {
-  evma_set_timer_quantum (FIX2INT (interval));
-  return Qnil;
+	evma_set_timer_quantum (FIX2INT (interval));
+	return Qnil;
 }
 
 /********************
 t_get_max_timer_count
 ********************/
 
-static VALUE t_get_max_timer_count (VALUE self)
+static VALUE t_get_max_timer_count (VALUE self UNUSED)
 {
-  return INT2FIX (evma_get_max_timer_count());
+	return INT2FIX (evma_get_max_timer_count());
 }
 
 /********************
 t_set_max_timer_count
 ********************/
 
-static VALUE t_set_max_timer_count (VALUE self, VALUE ct)
+static VALUE t_set_max_timer_count (VALUE self UNUSED, VALUE ct)
 {
-  evma_set_max_timer_count (FIX2INT (ct));
-  return Qnil;
+	evma_set_max_timer_count (FIX2INT (ct));
+	return Qnil;
 }
 
 /********************
 t_get/set_simultaneous_accept_count
 ********************/
 
-static VALUE t_get_simultaneous_accept_count (VALUE self)
+static VALUE t_get_simultaneous_accept_count (VALUE self UNUSED)
 {
-  return INT2FIX (evma_get_simultaneous_accept_count());
+	return INT2FIX (evma_get_simultaneous_accept_count());
 }
 
-static VALUE t_set_simultaneous_accept_count (VALUE self, VALUE ct)
+static VALUE t_set_simultaneous_accept_count (VALUE self UNUSED, VALUE ct)
 {
-  evma_set_simultaneous_accept_count (FIX2INT (ct));
-  return Qnil;
+	evma_set_simultaneous_accept_count (FIX2INT (ct));
+	return Qnil;
 }
 
 /***************
 t_setuid_string
 ***************/
 
-static VALUE t_setuid_string (VALUE self, VALUE username)
+static VALUE t_setuid_string (VALUE self UNUSED, VALUE username)
 {
-  evma_setuid_string (StringValuePtr (username));
-  return Qnil;
+	evma_setuid_string (StringValueCStr (username));
+	return Qnil;
 }
 
 
@@ -844,7 +863,7 @@ static VALUE t_setuid_string (VALUE self, VALUE username)
 t_invoke_popen
 **************/
 
-static VALUE t_invoke_popen (VALUE self, VALUE cmd)
+static VALUE t_invoke_popen (VALUE self UNUSED, VALUE cmd)
 {
 	// 1.8.7+
 	#ifdef RARRAY_LEN
@@ -858,11 +877,11 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 	for (int i=0; i < len; i++) {
 		VALUE ix = INT2FIX (i);
 		VALUE s = rb_ary_aref (1, &ix, cmd);
-		strings[i] = StringValuePtr (s);
+		strings[i] = StringValueCStr (s);
 	}
 	strings[len] = NULL;
 
-	unsigned long f = 0;
+	uintptr_t f = 0;
 	try {
 		f = evma_popen (strings);
 	} catch (std::runtime_error e) {
@@ -875,7 +894,7 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 		snprintf (buf, sizeof(buf)-1, "no popen: %s", (err?err:"???"));
 		rb_raise (rb_eRuntimeError, "%s", buf);
 	}
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 
@@ -883,12 +902,12 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 t_read_keyboard
 ***************/
 
-static VALUE t_read_keyboard (VALUE self)
+static VALUE t_read_keyboard (VALUE self UNUSED)
 {
-	const unsigned long f = evma_open_keyboard();
+	const uintptr_t f = evma_open_keyboard();
 	if (!f)
 		rb_raise (rb_eRuntimeError, "%s", "no keyboard reader");
-	return ULONG2NUM (f);
+	return BSIG2NUM (f);
 }
 
 
@@ -896,10 +915,10 @@ static VALUE t_read_keyboard (VALUE self)
 t_watch_filename
 ****************/
 
-static VALUE t_watch_filename (VALUE self, VALUE fname)
+static VALUE t_watch_filename (VALUE self UNUSED, VALUE fname)
 {
 	try {
-		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
+		return BSIG2NUM(evma_watch_filename(StringValueCStr(fname)));
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eUnsupported, "%s", e.what());
 	}
@@ -911,9 +930,9 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
 t_unwatch_filename
 ******************/
 
-static VALUE t_unwatch_filename (VALUE self, VALUE sig)
+static VALUE t_unwatch_filename (VALUE self UNUSED, VALUE sig)
 {
-	evma_unwatch_filename(NUM2ULONG (sig));
+	evma_unwatch_filename(NUM2BSIG (sig));
 	return Qnil;
 }
 
@@ -922,10 +941,10 @@ static VALUE t_unwatch_filename (VALUE self, VALUE sig)
 t_watch_pid
 ***********/
 
-static VALUE t_watch_pid (VALUE self, VALUE pid)
+static VALUE t_watch_pid (VALUE self UNUSED, VALUE pid)
 {
 	try {
-		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
+		return BSIG2NUM(evma_watch_pid(NUM2INT(pid)));
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eUnsupported, "%s", e.what());
 	}
@@ -937,9 +956,9 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
 t_unwatch_pid
 *************/
 
-static VALUE t_unwatch_pid (VALUE self, VALUE sig)
+static VALUE t_unwatch_pid (VALUE self UNUSED, VALUE sig)
 {
-	evma_unwatch_pid(NUM2ULONG (sig));
+	evma_unwatch_pid(NUM2BSIG (sig));
 	return Qnil;
 }
 
@@ -948,21 +967,26 @@ static VALUE t_unwatch_pid (VALUE self, VALUE sig)
 t__epoll_p
 **********/
 
-static VALUE t__epoll_p (VALUE self)
+static VALUE t__epoll_p (VALUE self UNUSED)
 {
-  #ifdef HAVE_EPOLL
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
+	#ifdef HAVE_EPOLL
+	return Qtrue;
+	#else
+	return Qfalse;
+	#endif
 }
 
 /********
 t__epoll
 ********/
 
-static VALUE t__epoll (VALUE self)
+static VALUE t__epoll (VALUE self UNUSED)
 {
+	if (t__epoll_p(self) == Qfalse) {
+		rb_warn ("epoll is not supported on this platform");
+		return Qfalse;
+	}
+
 	evma_set_epoll (1);
 	return Qtrue;
 }
@@ -974,7 +998,7 @@ t__epoll_set
 static VALUE t__epoll_set (VALUE self, VALUE val)
 {
 	if (t__epoll_p(self) == Qfalse)
-		rb_raise (EM_eUnsupported, "%s", "epoll is not supported on this platform");
+		rb_warn ("epoll is not supported on this platform");
 
 	evma_set_epoll (val == Qtrue ? 1 : 0);
 	return val;
@@ -985,21 +1009,26 @@ static VALUE t__epoll_set (VALUE self, VALUE val)
 t__kqueue_p
 ***********/
 
-static VALUE t__kqueue_p (VALUE self)
+static VALUE t__kqueue_p (VALUE self UNUSED)
 {
-  #ifdef HAVE_KQUEUE
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
+	#ifdef HAVE_KQUEUE
+	return Qtrue;
+	#else
+	return Qfalse;
+	#endif
 }
 
 /*********
 t__kqueue
 *********/
 
-static VALUE t__kqueue (VALUE self)
+static VALUE t__kqueue (VALUE self UNUSED)
 {
+	if (t__kqueue_p(self) == Qfalse) {
+		rb_warn ("kqueue is not supported on this platform");
+		return Qfalse;
+	}
+
 	evma_set_kqueue (1);
 	return Qtrue;
 }
@@ -1011,7 +1040,7 @@ t__kqueue_set
 static VALUE t__kqueue_set (VALUE self, VALUE val)
 {
 	if (t__kqueue_p(self) == Qfalse)
-		rb_raise (EM_eUnsupported, "%s", "kqueue is not supported on this platform");
+		rb_warn ("kqueue is not supported on this platform");
 
 	evma_set_kqueue (val == Qtrue ? 1 : 0);
 	return val;
@@ -1022,13 +1051,13 @@ static VALUE t__kqueue_set (VALUE self, VALUE val)
 t__ssl_p
 ********/
 
-static VALUE t__ssl_p (VALUE self)
+static VALUE t__ssl_p (VALUE self UNUSED)
 {
-  #ifdef WITH_SSL
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
+	#ifdef WITH_SSL
+	return Qtrue;
+	#else
+	return Qfalse;
+	#endif
 }
 
 
@@ -1036,7 +1065,7 @@ static VALUE t__ssl_p (VALUE self)
 t_send_file_data
 ****************/
 
-static VALUE t_send_file_data (VALUE self, VALUE signature, VALUE filename)
+static VALUE t_send_file_data (VALUE self UNUSED, VALUE signature, VALUE filename)
 {
 
 	/* The current implementation of evma_send_file_data_to_connection enforces a strict
@@ -1047,14 +1076,14 @@ 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 (NUM2ULONG (signature), StringValuePtr(filename));
+	int b = evma_send_file_data_to_connection (NUM2BSIG (signature), StringValueCStr(filename));
 	if (b == -1)
 		rb_raise(rb_eRuntimeError, "%s", "File too large.  send_file_data() supports files under 32k.");
 	if (b > 0) {
 		char *err = strerror (b);
 		char buf[1024];
 		memset (buf, 0, sizeof(buf));
-		snprintf (buf, sizeof(buf)-1, ": %s %s", StringValuePtr(filename),(err?err:"???"));
+		snprintf (buf, sizeof(buf)-1, ": %s %s", StringValueCStr(filename),(err?err:"???"));
 
 		rb_raise (rb_eIOError, "%s", buf);
 	}
@@ -1067,7 +1096,7 @@ static VALUE t_send_file_data (VALUE self, VALUE signature, VALUE filename)
 t_set_rlimit_nofile
 *******************/
 
-static VALUE t_set_rlimit_nofile (VALUE self, VALUE arg)
+static VALUE t_set_rlimit_nofile (VALUE self UNUSED, VALUE arg)
 {
 	arg = (NIL_P(arg)) ? -1 : NUM2INT (arg);
 	return INT2NUM (evma_set_rlimit_nofile (arg));
@@ -1080,7 +1109,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 (NUM2ULONG (sig)));
+	return INT2NUM (evma_get_outbound_data_size (NUM2BSIG (sig)));
 }
 
 
@@ -1088,7 +1117,7 @@ static VALUE conn_get_outbound_data_size (VALUE self)
 conn_associate_callback_target
 ******************************/
 
-static VALUE conn_associate_callback_target (VALUE self, VALUE sig)
+static VALUE conn_associate_callback_target (VALUE self UNUSED, VALUE sig UNUSED)
 {
 	// No-op for the time being.
 	return Qnil;
@@ -1099,22 +1128,22 @@ static VALUE conn_associate_callback_target (VALUE self, VALUE sig)
 t_get_loop_time
 ****************/
 
-static VALUE t_get_loop_time (VALUE self)
+static VALUE t_get_loop_time (VALUE self UNUSED)
 {
-#ifndef HAVE_RB_TIME_NEW
-  static VALUE cTime = rb_path2class("Time");
-  static ID at = rb_intern("at");
-#endif
+	#ifndef HAVE_RB_TIME_NEW
+	static VALUE cTime = rb_path2class("Time");
+	static ID at = rb_intern("at");
+	#endif
 
-  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(current_time / 1000000), INT2NUM(current_time % 1000000));
-#else
-    return rb_time_new(current_time / 1000000, current_time % 1000000);
-#endif
-  }
-  return Qnil;
+	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(current_time / 1000000), INT2NUM(current_time % 1000000));
+	#else
+		return rb_time_new(current_time / 1000000, current_time % 1000000);
+	#endif
+	}
+	return Qnil;
 }
 
 
@@ -1122,10 +1151,10 @@ static VALUE t_get_loop_time (VALUE self)
 t_start_proxy
 **************/
 
-static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize, VALUE length)
+static VALUE t_start_proxy (VALUE self UNUSED, VALUE from, VALUE to, VALUE bufsize, VALUE length)
 {
 	try {
-		evma_start_proxy(NUM2ULONG (from), NUM2ULONG (to), NUM2ULONG(bufsize), NUM2ULONG(length));
+		evma_start_proxy(NUM2BSIG (from), NUM2BSIG (to), NUM2ULONG(bufsize), NUM2ULONG(length));
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
@@ -1137,10 +1166,10 @@ static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize, VAL
 t_stop_proxy
 *************/
 
-static VALUE t_stop_proxy (VALUE self, VALUE from)
+static VALUE t_stop_proxy (VALUE self UNUSED, VALUE from)
 {
 	try{
-		evma_stop_proxy(NUM2ULONG (from));
+		evma_stop_proxy(NUM2BSIG (from));
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
@@ -1151,10 +1180,10 @@ static VALUE t_stop_proxy (VALUE self, VALUE from)
 t_proxied_bytes
 ****************/
 
-static VALUE t_proxied_bytes (VALUE self, VALUE from)
+static VALUE t_proxied_bytes (VALUE self UNUSED, VALUE from)
 {
 	try{
-		return ULONG2NUM(evma_proxied_bytes(NUM2ULONG (from)));
+		return BSIG2NUM(evma_proxied_bytes(NUM2BSIG (from)));
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, "%s", e.what());
 	}
@@ -1165,14 +1194,14 @@ static VALUE t_proxied_bytes (VALUE self, VALUE from)
 t_get_idle_time
 ****************/
 
-static VALUE t_get_idle_time (VALUE self, VALUE from)
+static VALUE t_get_idle_time (VALUE self UNUSED, VALUE from)
 {
 	try{
 		uint64_t current_time = evma_get_current_loop_time();
-		uint64_t time = evma_get_last_activity_time(NUM2ULONG (from));
+		uint64_t time = evma_get_last_activity_time(NUM2BSIG (from));
 		if (current_time != 0 && time != 0) {
 			if (time >= current_time)
-				return ULONG2NUM(0);
+				return BSIG2NUM(0);
 			else {
 				uint64_t diff = current_time - time;
 				float seconds = diff / (1000.0*1000.0);
@@ -1190,7 +1219,7 @@ static VALUE t_get_idle_time (VALUE self, VALUE from)
 t_get_heartbeat_interval
 *************************/
 
-static VALUE t_get_heartbeat_interval (VALUE self)
+static VALUE t_get_heartbeat_interval (VALUE self UNUSED)
 {
 	return rb_float_new(evma_get_heartbeat_interval());
 }
@@ -1200,7 +1229,7 @@ static VALUE t_get_heartbeat_interval (VALUE self)
 t_set_heartbeat_interval
 *************************/
 
-static VALUE t_set_heartbeat_interval (VALUE self, VALUE interval)
+static VALUE t_set_heartbeat_interval (VALUE self UNUSED, VALUE interval)
 {
 	float iv = RFLOAT_VALUE(interval);
 	if (evma_set_heartbeat_interval(iv))
@@ -1251,8 +1280,9 @@ extern "C" void Init_rubyeventmachine()
 	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);
-	rb_define_module_function (EmModule, "run_machine_without_threads", (VALUE(*)(...))t_run_machine_without_threads, 0);
+	rb_define_module_function (EmModule, "run_machine_once", (VALUE(*)(...))t_run_machine_once, 0);
+	rb_define_module_function (EmModule, "run_machine", (VALUE(*)(...))t_run_machine, 0);
+	rb_define_module_function (EmModule, "run_machine_without_threads", (VALUE(*)(...))t_run_machine, 0);
 	rb_define_module_function (EmModule, "add_oneshot_timer", (VALUE(*)(...))t_add_oneshot_timer, 1);
 	rb_define_module_function (EmModule, "start_tcp_server", (VALUE(*)(...))t_start_server, 2);
 	rb_define_module_function (EmModule, "stop_tcp_server", (VALUE(*)(...))t_stop_server, 1);