eventmachine 0.10.0 → 0.12.0

data/ext/em.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.h 585 2007-11-27 14:29:34Z blackhedd $
+$Id: em.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     em.h
 Date:     06Apr06
@@ -79,6 +79,8 @@ class EventMachine_t
 
 		void Add (EventableDescriptor*);
 		void Modify (EventableDescriptor*);
+		void ArmKqueueWriter (EventableDescriptor*);
+		void ArmKqueueReader (EventableDescriptor*);
 
 		void SetTimerQuantum (int);
 		static void SetuidString (const char*);
@@ -88,6 +90,7 @@ class EventMachine_t
 
 		// Temporary:
 		void _UseEpoll();
+		void _UseKqueue();
 
 
 	private:
@@ -99,6 +102,7 @@ class EventMachine_t
 
 		bool _RunSelectOnce();
 		bool _RunEpollOnce();
+		bool _RunKqueueOnce();
 
 		void _ModifyEpollEvent (EventableDescriptor*);
 
@@ -133,9 +137,29 @@ class EventMachine_t
 	private:
 		bool bEpoll;
 		int epfd; // Epoll file-descriptor
+
+		bool bKqueue;
+		int kqfd; // Kqueue file-descriptor
 };
 
 
+/*******************
+struct SelectData_t
+*******************/
+
+struct SelectData_t
+{
+	SelectData_t();
+
+	int _Select();
+
+	int maxsocket;
+	fd_set fdreads;
+	fd_set fdwrites;
+	timeval tv;
+	int nSockets;
+};
+
 
 
 #endif // __EventMachine__H_

data/ext/emwin.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: emwin.cpp 327 2007-05-26 11:10:45Z blackhedd $
+$Id: emwin.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     emwin.cpp
 Date:     05May06

data/ext/emwin.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: emwin.h 318 2007-05-22 22:06:24Z blackhedd $
+$Id: emwin.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     emwin.h
 Date:     05May06

data/ext/epoll.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: epoll.cpp 352 2007-06-06 20:24:11Z blackhedd $
+$Id: epoll.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     epoll.cpp
 Date:     06Jun07

data/ext/epoll.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: epoll.h 352 2007-06-06 20:24:11Z blackhedd $
+$Id: epoll.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     epoll.h
 Date:     06Jun07

data/ext/eventmachine.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: eventmachine.h 584 2007-11-27 07:27:32Z blackhedd $
+$Id: eventmachine.h 679 2008-01-19 01:40:06Z blackhedd $
 
 File:     eventmachine.h
 Date:     15Apr06
@@ -47,6 +47,7 @@ extern "C" {
 	void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filenane);
 	void evma_start_tls (const char *binding);
 	int evma_get_peername (const char *binding, struct sockaddr*);
+	int evma_get_sockname (const char *binding, struct sockaddr*);
 	int evma_get_subprocess_pid (const char *binding, pid_t*);
 	int evma_get_subprocess_status (const char *binding, int*);
 	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
@@ -71,6 +72,7 @@ extern "C" {
 
 	// Temporary:
 	void evma__epoll();
+	void evma__kqueue();
 
 #if __cplusplus
 }

data/ext/eventmachine_cpp.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: eventmachine_cpp.h 474 2007-07-27 03:12:30Z blackhedd $
+$Id: eventmachine_cpp.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     eventmachine_cpp.h
 Date:     27Jul07

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-# $Id: extconf.rb 526 2007-09-11 17:43:23Z blackhedd $
+# $Id: extconf.rb 677 2008-01-08 20:37:24Z blackhedd $
 #
 #----------------------------------------------------------------------------
 #
@@ -77,10 +77,32 @@ when /solaris/
     CONFIG['CCDLFLAGS'] = "-fPIC"
   end
 
+when /openbsd/  
+  # OpenBSD branch contributed by Guillaume Sellier.
+  flags << '-DOS_UNIX'
+  flags << '-DBUILD_FOR_RUBY'
+   
+  dir_config('ssl') # here I don't know why we have to check -lcrypto before -lssl otherwise -lssl is not found
+  if have_library('crypto') and
+    	have_library('ssl') and
+    	have_header('openssl/ssl.h') and
+    	have_header('openssl/err.h')
+    flags << '-DWITH_SSL'
+  else
+    flags << '-DWITHOUT_SSL'
+  end
+  # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
+  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
+
+
 when /darwin/
   flags << '-DOS_UNIX'
   flags << '-DBUILD_FOR_RUBY'
 
+  if have_header("sys/event.h") and have_header("sys/queue.h")
+    flags << "-DHAVE_KQUEUE"
+  end
+
   dir_config('ssl')
   if have_library('ssl') and
 	  have_library('crypto') and
@@ -116,6 +138,10 @@ when /linux/
 	  flags << '-DHAVE_EPOLL' if e == 0
   end
 
+  if have_func('rb_thread_blocking_region') and have_macro('RB_UBF_DFL', 'ruby.h')
+	  flags << "-DHAVE_TBR"
+  end
+
   dir_config('ssl', "#{ENV['OPENSSL']}/include", ENV['OPENSSL'])
   # Check for libcrypto twice, before and after ssl. That's because on some platforms
   # and openssl versions, libssl will emit unresolved externals from crypto. It
@@ -149,6 +175,10 @@ else
   flags << '-DOS_UNIX'
   flags << '-DBUILD_FOR_RUBY'
 
+  if have_header("sys/event.h") and have_header("sys/queue.h")
+    flags << "-DHAVE_KQUEUE"
+  end
+
   dir_config('ssl')
   if have_library('ssl') and
 	  have_library('crypto') and

data/ext/files.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.cpp 250 2006-08-25 02:17:58Z blackhedd $
+$Id: files.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     files.cpp
 Date:     26Aug06

data/ext/files.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.h 243 2006-08-23 02:00:10Z blackhedd $
+$Id: files.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     files.h
 Date:     26Aug06

data/ext/kb.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: kb.cpp 502 2007-08-24 09:29:53Z blackhedd $
+$Id: kb.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     kb.cpp
 Date:     24Aug07
@@ -33,6 +33,9 @@ KeyboardDescriptor::KeyboardDescriptor (EventMachine_t *parent_em):
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = EPOLLIN;
 	#endif
+	#ifdef HAVE_KQUEUE
+	MyEventMachine->ArmKqueueReader (this);
+	#endif
 }
 
 

data/ext/page.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: page.cpp 318 2007-05-22 22:06:24Z blackhedd $
+$Id: page.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     page.cpp
 Date:     30Apr06

data/ext/page.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: page.h 318 2007-05-22 22:06:24Z blackhedd $
+$Id: page.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     page.h
 Date:     30Apr06

data/ext/pipe.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: pipe.cpp 585 2007-11-27 14:29:34Z blackhedd $
+$Id: pipe.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     pipe.cpp
 Date:     30May07
@@ -38,6 +38,9 @@ PipeDescriptor::PipeDescriptor (int fd, pid_t subpid, EventMachine_t *parent_em)
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = EPOLLIN;
 	#endif
+	#ifdef HAVE_KQUEUE
+	MyEventMachine->ArmKqueueReader (this);
+	#endif
 }
 
 

data/ext/project.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: project.h 490 2007-07-30 12:51:33Z blackhedd $
+$Id: project.h 686 2008-05-14 21:21:10Z francis $
 
 File:     project.h
 Date:     06Apr06
@@ -76,7 +76,8 @@ typedef int SOCKET;
 #ifdef OS_WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #include <rpc.h>
 #include <fcntl.h>
 #include <assert.h>
@@ -96,6 +97,11 @@ using namespace std;
 #include <sys/epoll.h>
 #endif
 
+#ifdef HAVE_KQUEUE
+#include <sys/event.h>
+#include <sys/queue.h>
+#endif
+
 #include "binder.h"
 #include "em.h"
 #include "epoll.h"

data/ext/rubymain.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: rubymain.cpp 584 2007-11-27 07:27:32Z blackhedd $
+$Id: rubymain.cpp 679 2008-01-19 01:40:06Z blackhedd $
 
 File:     rubymain.cpp
 Date:     06Apr06
@@ -31,6 +31,13 @@ static VALUE EmModule;
 static VALUE EmConnection;
 
 static VALUE Intern_at_signature;
+static VALUE Intern_at_timers;
+static VALUE Intern_at_conns;
+static VALUE Intern_event_callback;
+static VALUE Intern_run_deferred_callbacks;
+static VALUE Intern_delete;
+static VALUE Intern_call;
+static VALUE Intern_receive_data;
 
 
 /****************
@@ -39,7 +46,25 @@ t_event_callback
 
 static void event_callback (const char *a1, int a2, const char *a3, int a4)
 {
-	rb_funcall (EmModule, rb_intern ("event_callback"), 3, rb_str_new2(a1), (a2 << 1) | 1, rb_str_new(a3,a4));
+	if (a2 == EM_CONNECTION_READ) {
+		VALUE t = rb_ivar_get (EmModule, Intern_at_conns);
+		VALUE q = rb_hash_aref (t, rb_str_new2(a1));
+		if (q == Qnil)
+			rb_raise (rb_eRuntimeError, "no connection");
+		rb_funcall (q, Intern_receive_data, 1, rb_str_new (a3, a4));
+	}
+	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, rb_str_new(a3, a4));
+		if (q == Qnil)
+			rb_raise (rb_eRuntimeError, "no timer");
+		rb_funcall (q, Intern_call, 0);
+	}
+	else
+		rb_funcall (EmModule, Intern_event_callback, 3, rb_str_new2(a1), (a2 << 1) | 1, rb_str_new(a3,a4));
 }
 
 
@@ -167,6 +192,20 @@ static VALUE t_get_peername (VALUE self, VALUE signature)
 	return Qnil;
 }
 
+/**************
+t_get_sockname
+**************/
+
+static VALUE t_get_sockname (VALUE self, VALUE signature)
+{
+	struct sockaddr s;
+	if (evma_get_sockname (StringValuePtr (signature), &s)) {
+		return rb_str_new ((const char*)&s, sizeof(s));
+	}
+
+	return Qnil;
+}
+
 /********************
 t_get_subprocess_pid
 ********************/
@@ -434,6 +473,17 @@ static VALUE t__epoll (VALUE self)
 	return Qnil;
 }
 
+/*********
+t__kqueue
+*********/
+
+static VALUE t__kqueue (VALUE self)
+{
+	// Temporary.
+	evma__kqueue();
+	return Qnil;
+}
+
 
 /****************
 t_send_file_data
@@ -487,6 +537,16 @@ static VALUE conn_get_outbound_data_size (VALUE self)
 }
 
 
+/******************************
+conn_associate_callback_target
+******************************/
+
+static VALUE conn_associate_callback_target (VALUE self, VALUE sig)
+{
+	// No-op for the time being.
+	return Qnil;
+}
+
 
 /*********************
 Init_rubyeventmachine
@@ -496,6 +556,14 @@ extern "C" void Init_rubyeventmachine()
 {
 	// Tuck away some symbol values so we don't have to look 'em up every time we need 'em.
 	Intern_at_signature = rb_intern ("@signature");
+	Intern_at_timers = rb_intern ("@timers");
+	Intern_at_conns = rb_intern ("@conns");
+
+	Intern_event_callback = rb_intern ("event_callback");
+	Intern_run_deferred_callbacks = rb_intern ("run_deferred_callbacks");
+	Intern_delete = rb_intern ("delete");
+	Intern_call = rb_intern ("call");
+	Intern_receive_data = rb_intern ("receive_data");
 
 	// INCOMPLETE, we need to define class Connections inside module EventMachine
 	// run_machine and run_machine_without_threads are now identical.
@@ -538,6 +606,7 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "_write_file", (VALUE(*)(...))t__write_file, 1);
 
 	rb_define_module_function (EmModule, "get_peername", (VALUE(*)(...))t_get_peername, 1);
+	rb_define_module_function (EmModule, "get_sockname", (VALUE(*)(...))t_get_sockname, 1);
 	rb_define_module_function (EmModule, "get_subprocess_pid", (VALUE(*)(...))t_get_subprocess_pid, 1);
 	rb_define_module_function (EmModule, "get_subprocess_status", (VALUE(*)(...))t_get_subprocess_status, 1);
 	rb_define_module_function (EmModule, "get_comm_inactivity_timeout", (VALUE(*)(...))t_get_comm_inactivity_timeout, 1);
@@ -546,8 +615,10 @@ extern "C" void Init_rubyeventmachine()
 
 	// Temporary:
 	rb_define_module_function (EmModule, "epoll", (VALUE(*)(...))t__epoll, 0);
+	rb_define_module_function (EmModule, "kqueue", (VALUE(*)(...))t__kqueue, 0);
 
 	rb_define_method (EmConnection, "get_outbound_data_size", (VALUE(*)(...))conn_get_outbound_data_size, 0);
+	rb_define_method (EmConnection, "associate_callback_target", (VALUE(*)(...))conn_associate_callback_target, 1);
 
 	rb_define_const (EmModule, "TimerFired", INT2NUM(100));
 	rb_define_const (EmModule, "ConnectionData", INT2NUM(101));

data/ext/sigs.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: sigs.cpp 318 2007-05-22 22:06:24Z blackhedd $
+$Id: sigs.cpp 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     sigs.cpp
 Date:     06Apr06

data/ext/sigs.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: sigs.h 318 2007-05-22 22:06:24Z blackhedd $
+$Id: sigs.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     sigs.h
 Date:     06Apr06