eventmachine 0.12.2 → 0.12.4

data/ext/ed.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.h 785 2008-09-15 09:46:23Z francis $
+$Id$
 
 File:     ed.h
 Date:     06Apr06
@@ -85,7 +85,14 @@ class EventableDescriptor: public Bindable_t
 
 	protected:
 		enum {
-			PendingConnectTimeout = 4 // can easily be made an instance variable
+			// 4 seconds is too short, most other libraries default to OS settings
+			// which in 2.6 kernel defaults to a 60 second connect timeout. 
+			// 
+			// Curl-Multi: http://curl.haxx.se/mail/lib-2001-01/0019.html
+			//
+			// updating to 50 seconds, so we catch it before the OS does
+
+			PendingConnectTimeout = 50 // can easily be made an instance variable
 		};
 
 		void (*EventCallback)(const char*, int, const char*, int);
@@ -139,7 +146,7 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		int SendOutboundData (const char*, int);
 
-		void SetConnectPending (bool f) { bConnectPending = f; }
+		void SetConnectPending (bool f);
 
 		void SetNotifyReadable (bool readable) { bNotifyReadable = readable; }
 		void SetNotifyWritable (bool writable) { bNotifyWritable = writable; }

data/ext/em.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.cpp 785 2008-09-15 09:46:23Z francis $
+$Id$
 
 File:     em.cpp
 Date:     06Apr06
@@ -426,7 +426,16 @@ bool EventMachine_t::_RunEpollOnce()
 	#ifdef HAVE_EPOLL
 	assert (epfd != -1);
 	struct epoll_event ev [MaxEpollDescriptors];
-	int s = epoll_wait (epfd, ev, MaxEpollDescriptors, 50);
+	int s;
+
+	#ifdef BUILD_FOR_RUBY
+	TRAP_BEG;
+	#endif
+	s = epoll_wait (epfd, ev, MaxEpollDescriptors, 50);
+	#ifdef BUILD_FOR_RUBY
+	TRAP_END;
+	#endif
+
 	if (s > 0) {
 		for (int i=0; i < s; i++) {
 			EventableDescriptor *ed = (EventableDescriptor*) ev[i].data.ptr;
@@ -511,8 +520,11 @@ bool EventMachine_t::_RunEpollOnce()
 		}
 	}
 
-	timeval tv = {0,0};
-	EmSelect (0, NULL, NULL, NULL, &tv);
+	#ifdef BUILD_FOR_RUBY
+	if (!rb_thread_alone()) {
+		rb_thread_schedule();
+	}
+	#endif
 
 	return true;
 	#else
@@ -533,7 +545,14 @@ bool EventMachine_t::_RunKqueueOnce()
 	struct kevent Karray [maxKevents];
 	struct timespec ts = {0, 10000000}; // Too frequent. Use blocking_region
 
-	int k = kevent (kqfd, NULL, 0, Karray, maxKevents, &ts);
+	int k;
+	#ifdef BUILD_FOR_RUBY
+	TRAP_BEG;
+	#endif
+	k = kevent (kqfd, NULL, 0, Karray, maxKevents, &ts);
+	#ifdef BUILD_FOR_RUBY
+	TRAP_END;
+	#endif
 	struct kevent *ke = Karray;
 	while (k > 0) {
 		EventableDescriptor *ed = (EventableDescriptor*) (ke->udata);
@@ -587,8 +606,11 @@ bool EventMachine_t::_RunKqueueOnce()
 
 
 	// TODO, replace this with rb_thread_blocking_region for 1.9 builds.
-	timeval tv = {0,0};
-	EmSelect (0, NULL, NULL, NULL, &tv);
+	#ifdef BUILD_FOR_RUBY
+	if (!rb_thread_alone()) {
+		rb_thread_schedule();
+	}
+	#endif
 
 	return true;
 	#else
@@ -631,6 +653,7 @@ SelectData_t::SelectData_t()
 }
 
 
+#ifdef BUILD_FOR_RUBY
 /*****************
 _SelectDataSelect
 *****************/
@@ -651,7 +674,7 @@ SelectData_t::_Select
 int SelectData_t::_Select()
 {
 	#ifdef HAVE_TBR
-	rb_thread_blocking_region (_SelectDataSelect, (void*)this, RB_UBF_DFL, 0);
+	rb_thread_blocking_region (_SelectDataSelect, (void*)this, RUBY_UBF_IO, 0);
 	return nSockets;
 	#endif
 
@@ -659,6 +682,7 @@ int SelectData_t::_Select()
 	return EmSelect (maxsocket+1, &fdreads, &fdwrites, NULL, &tv);
 	#endif
 }
+#endif
 
 
 
@@ -738,7 +762,7 @@ bool EventMachine_t::_RunSelectOnce()
 		//timeval tv = Quantum;
 		SelectData.tv = Quantum;
 		int s = SelectData._Select();
-		//rb_thread_blocking_region(xxx,(void*)&SelectData,RB_UBF_DFL,0);
+		//rb_thread_blocking_region(xxx,(void*)&SelectData,RUBY_UBF_IO,0);
 		//int s = EmSelect (SelectData.maxsocket+1, &(SelectData.fdreads), &(SelectData.fdwrites), NULL, &(SelectData.tv));
 		//int s = SelectData.nSockets;
 		if (s > 0) {
@@ -1183,14 +1207,15 @@ const char *EventMachine_t::AttachFD (int fd, bool notify_readable, bool notify_
 	#endif
 
 	{// Check for duplicate descriptors
-		for (size_t i = 0; i < Descriptors.size(); i++) {
+		size_t i;
+		for (i = 0; i < Descriptors.size(); i++) {
 			EventableDescriptor *ed = Descriptors[i];
 			assert (ed);
 			if (ed->GetSocket() == fd)
 				throw std::runtime_error ("adding existing descriptor");
 		}
 
-		for (size_t i = 0; i < NewDescriptors.size(); i++) {
+		for (i = 0; i < NewDescriptors.size(); i++) {
 			EventableDescriptor *ed = NewDescriptors[i];
 			assert (ed);
 			if (ed->GetSocket() == fd)
@@ -1284,7 +1309,9 @@ struct sockaddr *name2address (const char *server, int port, int *family, int *b
 	// Return NULL if no resolution.
 
 	static struct sockaddr_in in4;
+	#ifndef __CYGWIN__
 	static struct sockaddr_in6 in6;
+	#endif
 	struct hostent *hp;
 
 	if (!server || !*server)
@@ -1301,7 +1328,7 @@ struct sockaddr *name2address (const char *server, int port, int *family, int *b
 		return (struct sockaddr*)&in4;
 	}
 
-	#ifdef OS_UNIX
+	#if defined(OS_UNIX) && !defined(__CYGWIN__)
 	memset (&in6, 0, sizeof(in6));
 	if (inet_pton (AF_INET6, server, in6.sin6_addr.s6_addr) > 0) {
 		if (family)

data/ext/em.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.h 785 2008-09-15 09:46:23Z francis $
+$Id$
 
 File:     em.h
 Date:     06Apr06
@@ -33,6 +33,18 @@ See the file COPYING for complete licensing information.
 #ifdef BUILD_FOR_RUBY
   #include <ruby.h>
   #define EmSelect rb_thread_select
+
+  #ifdef HAVE_RBTRAP
+    #include <rubysig.h>
+  #else
+    #define TRAP_BEG
+    #define TRAP_END
+  #endif
+
+  // 1.9.0 compat
+  #ifndef RUBY_UDF_IO
+    #define RUBY_UDF_IO RB_UDF_DFL
+  #endif
 #else
   #define EmSelect select
 #endif

data/ext/emwin.cpp

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

data/ext/emwin.h

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

data/ext/epoll.cpp

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

data/ext/epoll.h

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

data/ext/eventmachine.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: eventmachine.h 785 2008-09-15 09:46:23Z francis $
+$Id$
 
 File:     eventmachine.h
 Date:     15Apr06

data/ext/eventmachine_cpp.h

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

data/ext/extconf.rb

@@ -1,15 +1,15 @@
-# $Id: extconf.rb 677 2008-01-08 20:37:24Z blackhedd $
+# $Id$
 #
 #----------------------------------------------------------------------------
 #
 # Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
 # Gmail: blackhedd
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of either: 1) the GNU General Public License
 # as published by the Free Software Foundation; either version 2 of the
 # License, or (at your option) any later version; or 2) Ruby's License.
-# 
+#
 # See the file COPYING for complete licensing information.
 #
 #---------------------------------------------------------------------------
@@ -18,56 +18,59 @@
 # We have to munge LDSHARED because this code needs a C++ link.
 #
 
+def check_libs libs = [], fatal = false
+  libs.all? { |lib| have_library(lib) || (abort("could not find library: #{lib}") if fatal) }
+end
+
+def check_heads heads = [], fatal = false
+  heads.all? { |head| have_header(head) || (abort("could not find header: #{head}") if fatal)}
+end
+
+def add_define(name)
+  $defs.push("-D#{name}")
+end
+
 require 'mkmf'
 
-flags = []
+add_define 'BUILD_FOR_RUBY'
+add_define 'HAVE_RBTRAP' if have_var('rb_trap_immediate', ['ruby.h', 'rubysig.h'])
+add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro('RUBY_UBF_IO', 'ruby.h')
 
-case RUBY_PLATFORM.split('-',2)[1]
-when 'mswin32', 'mingw32', 'bccwin32'
-  unless have_header('windows.h') and
-      have_header('winsock.h') and
-      have_library('kernel32') and
-      have_library('rpcrt4') and
-      have_library('gdi32')
-    exit
-  end
+# Minor platform details between *nix and Windows:
 
-  flags << "-D OS_WIN32"
-  flags << '-D BUILD_FOR_RUBY'
-  flags << "-EHs"
-  flags << "-GR"
-
-  dir_config('ssl')
-  if have_library('ssleay32') and
-	  have_library('libeay32') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-D WITH_SSL'
-  else
-    flags << '-D WITHOUT_SSL'
-  end
+if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
+  GNU_CHAIN = $1 == 'mingw'
+  OS_WIN32 = true
+  add_define "OS_WIN32"
+else
+  GNU_CHAIN = true
+  OS_UNIX = true
+  add_define 'OS_UNIX'
 
-when /solaris/
-  unless have_library('pthread') and
-	have_library('nsl') and
-	have_library('socket')
-	  exit
-  end
+  add_define "HAVE_KQUEUE" if have_header("sys/event.h") and have_header("sys/queue.h")
+
+  # check_libs(%w[pthread], true)
+end
+
+# Main platform invariances:
 
-  flags << '-D OS_UNIX'
-  flags << '-D OS_SOLARIS8'
-  flags << '-D BUILD_FOR_RUBY'
+case RUBY_PLATFORM
+when /mswin32/, /mingw32/, /bccwin32/
+  check_heads(%w[windows.h winsock.h], true)
+  check_libs(%w[kernel32 rpcrt4 gdi32], true)
 
-  dir_config('ssl')
-  if have_library('ssl') and
-	  have_library('crypto') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-D WITH_SSL'
+  if GNU_CHAIN
+    CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
   else
-    flags << '-D WITHOUT_SSL'
+    $defs.push "-EHs"
+    $defs.push "-GR"
   end
 
+when /solaris/
+  check_libs(%w[nsl socket], true)
+
+  add_define 'OS_SOLARIS8'
+
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 
@@ -77,127 +80,71 @@ when /solaris/
     CONFIG['CCDLFLAGS'] = "-fPIC"
   end
 
-when /openbsd/  
+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
-	  have_library('C') 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.
   # Ff line contributed by Daniel Harple.
   CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
 
 when /linux/
-  unless have_library('pthread')
-	  exit
-  end
-
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_FOR_RUBY'
 
   # Original epoll test is inadequate because 2.4 kernels have the header
   # but not the code.
-  #flags << '-DHAVE_EPOLL' if have_header('sys/epoll.h')
+  # add_define 'HAVE_EPOLL' if have_header('sys/epoll.h')
   if have_header('sys/epoll.h')
-	  File.open("hasEpollTest.c", "w") {|f|
-		  f.puts "#include <sys/epoll.h>"
-		  f.puts "int main() { epoll_create(1024); return 0;}"
-	  }
-	  (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
-	  `rm -f hasEpollTest.c hasEpollTest`
-	  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"
+    File.open("hasEpollTest.c", "w") {|f|
+      f.puts "#include <sys/epoll.h>"
+      f.puts "int main() { epoll_create(1024); return 0;}"
+    }
+    (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
+    `rm -f hasEpollTest.c hasEpollTest`
+    add_define 'HAVE_EPOLL' if e == 0
   end
 
-  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
-  # would be cleaner to simply check crypto first, but that doesn't always work in 
-  # Ruby. The order we check them doesn't seem to control the order in which they're
-  # emitted into the link command. This is pretty weird, I have to admit.
-  if have_library('crypto') and
-	  have_library('ssl') and
-	  have_library('crypto') 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.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
-
-  # Modify the mkmf constant LINK_SO so the generated shared object is stripped.
-  # You might think modifying CONFIG['LINK_SO'] would be a better way to do this,
-  # but it doesn't work because mkmf doesn't look at CONFIG['LINK_SO'] again after
-  # it initializes.
-  linkso = Object.send :remove_const, "LINK_SO"
-  LINK_SO = linkso + "; strip $@"
-
 else
-  unless have_library('pthread')
-	  exit
-  end
-
-  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
-	  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.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
+end
 
+# OpenSSL:
+
+def manual_ssl_config
+  ssl_libs_heads_args = {
+    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
+    :darwin => [%w[ssl crypto C], %w[openssl/ssl.h openssl/err.h]],
+    # openbsd and linux:
+    :crypto_hack => [%w[crypto ssl crypto], %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
+
+  libs, heads = case RUBY_PLATFORM
+  when /mswin/    ; ssl_libs_heads_args[:mswin]
+  when /mingw/    ; ssl_libs_heads_args[:unix]
+  when /darwin/   ; ssl_libs_heads_args[:darwin]
+  when /openbsd/  ; ssl_libs_heads_args[:crypto_hack]
+  when /linux/    ; ssl_libs_heads_args[:crypto_hack]
+  else              ssl_libs_heads_args[:unix]
+  end
+  dir_config(*dc_flags)
+  check_libs(libs) and check_heads(heads)
 end
 
-if $CPPFLAGS
-  $CPPFLAGS += ' ' + flags.join(' ')
+# Try to use pkg_config first, fixes #73
+if pkg_config('openssl') || manual_ssl_config
+  add_define "WITH_SSL"
 else
-  $CFLAGS += ' ' + flags.join(' ')
+  add_define "WITHOUT_SSL"
 end
 
-
-create_makefile "rubyeventmachine"
+create_makefile "rubyeventmachine"