eventmachine-eventmachine 0.12.3 → 0.12.4

data/Rakefile

@@ -46,11 +46,11 @@ end
 
 # If running under rubygems...
 __DIR__ ||= File.expand_path(File.dirname(__FILE__))
-if Gem.path.any? {|path| %r(^#{Regexp.escape path}) =~ __DIR__}
+if Gem.path.map{|path| Dir.chdir(path){ Dir.pwd } }.any? {|path| %r(^#{Regexp.escape path}) =~ __DIR__}
   task :default => :gem_build
 else
   desc "Build gemspec, then build eventmachine, then run tests."
-  task :default => [:gemspec, :build, :test]
+  task :default => [:build, :test]
 end
 
 desc ":default build when running under rubygems."
@@ -61,7 +61,7 @@ build_task = 'ext:build'
 build_task = 'java:build' if $eventmachine_library == :java
 build_task = :dummy_build if $eventmachine_library == :pure_ruby
 task :build => build_task do |t|
-  Dir.glob('{ext,java/src}/*.{so,bundle,dll,jar}').each do |f|
+  Dir.glob('{ext,java/src,ext/fastfilereader}/*.{so,bundle,dll,jar}').each do |f|
     mv f, "lib"
   end
 end
@@ -73,8 +73,12 @@ task :clean do
   chdir 'ext' do
     sh "#{MAKE} clean" if test ?e, 'Makefile'
   end
+  chdir 'ext/fastfilereader' do
+    sh "#{MAKE} clean" if test ?e, 'Makefile'
+  end
   Dir.glob('**/Makefile').each { |file| rm file }
   Dir.glob('**/*.{o,so,bundle,class,jar,dll,log}').each { |file| rm file }
+  Dir.glob('ext/**/conftest.dSYM').each{ |file| rm_rf file }
 end
 
 Spec = Gem::Specification.new do |s|
@@ -121,22 +125,37 @@ using TCP/IP, especially if custom protocols are required.
 end
 
 namespace :ext do
+  ext_sources = FileList['ext/*.{h,cpp,rb,c}']
+  ffr_sources = FileList['ext/fastfilereader/*.{h,cpp,rb}']
+  
   desc "Build C++ extension"
-  task :build => [:clean, :make]
+  task :build => [:make]
   
-  desc "make extension"
-  task :make => [:makefile] do
+  desc "make extensions"
+  task :make => ext_sources + ['ext/Makefile'] do
     chdir 'ext' do
       sh MAKE
     end
   end
-
+  task :make => ffr_sources + ['ext/fastfilereader/Makefile'] do
+    chdir 'ext/fastfilereader' do
+      sh MAKE
+    end
+  end
+  
   desc 'Compile the makefile'
-  task :makefile do |t|
+  file 'ext/Makefile' => ext_sources do
     chdir 'ext' do
       ruby 'extconf.rb'
     end
   end
+
+  desc 'Compile fastfilereader makefile'
+  file 'ext/fastfilereader/Makefile' => ffr_sources do
+    chdir 'ext/fastfilereader' do
+      ruby 'extconf.rb'
+    end
+  end
 end
   
 namespace :java do
@@ -164,6 +183,9 @@ namespace :java do
   end
 end
 
-task :gemspec => :clean do
+task :gemspec => :clobber do
   open("eventmachine.gemspec", 'w') { |f| f.write Spec.to_ruby }
 end
+
+task :clobber => :clean
+task :test => :build

data/ext/cmain.cpp

@@ -30,7 +30,11 @@ extern "C" void ensure_eventmachine (const char *caller = "unknown caller")
 		const int err_size = 128;
 		char err_string[err_size];
 		snprintf (err_string, err_size, "eventmachine not initialized: %s", caller);
-		throw std::runtime_error (err_string);
+		#ifdef BUILD_FOR_RUBY
+			rb_raise(rb_eRuntimeError, err_string);
+		#else
+			throw std::runtime_error (err_string);
+		#endif
 	}
 }
 
@@ -44,7 +48,11 @@ extern "C" void evma_initialize_library (void(*cb)(const char*, int, const char*
 	// we're just being linked into.
 	//InstallSignalHandlers();
 	if (EventMachine)
-		throw std::runtime_error ("eventmachine already initialized: evma_initialize_library");
+		#ifdef BUILD_FOR_RUBY
+			rb_raise(rb_eRuntimeError, "eventmachine already initialized: evma_initialize_library");
+		#else
+			throw std::runtime_error ("eventmachine already initialized: evma_initialize_library");
+		#endif
 	EventMachine = new EventMachine_t (cb);
 	if (bUseEpoll)
 		EventMachine->_UseEpoll();
@@ -113,8 +121,7 @@ evma_attach_fd
 
 extern "C" const char *evma_attach_fd (int file_descriptor, int notify_readable, int notify_writable)
 {
-	if (!EventMachine)
-		throw std::runtime_error ("not initialized");
+	ensure_eventmachine("evma_attach_fd");
 	return EventMachine->AttachFD (file_descriptor, (notify_readable ? true : false), (notify_writable ? true : false));
 }
 
@@ -124,14 +131,16 @@ evma_detach_fd
 
 extern "C" int evma_detach_fd (const char *binding)
 {
-	if (!EventMachine)
-		throw std::runtime_error ("not initialized");
-
+	ensure_eventmachine("evma_dettach_fd");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (ed)
 		return EventMachine->DetachFD (ed);
 	else
-		throw std::runtime_error ("invalid binding to detach");
+		#ifdef BUILD_FOR_RUBY
+			rb_raise(rb_eRuntimeError, "invalid binding to detach");
+		#else
+			throw std::runtime_error ("invalid binding to detach");
+		#endif
 }
 
 /**********************
@@ -396,8 +405,13 @@ evma_set_max_timer_count
 extern "C" void evma_set_max_timer_count (int ct)
 {
 	// This may only be called if the reactor is not running.
+
 	if (EventMachine)
-		throw std::runtime_error ("eventmachine already initialized: evma_set_max_timer_count");
+		#ifdef BUILD_FOR_RUBY
+			rb_raise(rb_eRuntimeError, "eventmachine already initialized: evma_set_max_timer_count");
+		#else
+			throw std::runtime_error ("eventmachine already initialized: evma_set_max_timer_count");
+		#endif
 	EventMachine_t::SetMaxTimerCount (ct);
 }
 

data/ext/ed.cpp

@@ -189,9 +189,7 @@ ConnectionDescriptor::ConnectionDescriptor (int sd, EventMachine_t *em):
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = EPOLLOUT;
 	#endif
-	#ifdef HAVE_KQUEUE
-	MyEventMachine->ArmKqueueWriter (this);
-	#endif
+	// 22Jan09: Moved ArmKqueueWriter into SetConnectPending() to fix assertion failure in _WriteOutboundData()
 }
 
 
@@ -263,6 +261,17 @@ int ConnectionDescriptor::ReportErrorStatus (const char *binding)
 	return -1;
 }
 
+/***************************************
+ConnectionDescriptor::SetConnectPending
+****************************************/
+
+void ConnectionDescriptor::SetConnectPending(bool f)
+{
+	bConnectPending = f;
+	#ifdef HAVE_KQUEUE
+	MyEventMachine->ArmKqueueWriter (this);
+	#endif
+}
 
 
 /**************************************
@@ -624,29 +633,36 @@ void ConnectionDescriptor::_WriteOutboundData()
 	assert (GetSocket() != INVALID_SOCKET);
 	int bytes_written = send (GetSocket(), output_buffer, nbytes, 0);
 
-	if (bytes_written > 0) {
-		OutboundDataSize -= bytes_written;
-		if ((size_t)bytes_written < nbytes) {
-			int len = nbytes - bytes_written;
-			char *buffer = (char*) malloc (len + 1);
-			if (!buffer)
-				throw std::runtime_error ("bad alloc throwing back data");
-			memcpy (buffer, output_buffer + bytes_written, len);
-			buffer [len] = 0;
-			OutboundPages.push_front (OutboundPage (buffer, len));
-		}
+	bool err = false;
+	if (bytes_written < 0) {
+		err = true;
+		bytes_written = 0;
+	}
 
-		#ifdef HAVE_EPOLL
-		EpollEvent.events = (EPOLLIN | (SelectForWrite() ? EPOLLOUT : 0));
-		assert (MyEventMachine);
-		MyEventMachine->Modify (this);
-		#endif
-		#ifdef HAVE_KQUEUE
-		if (SelectForWrite())
-			MyEventMachine->ArmKqueueWriter (this);
-		#endif
+	assert (bytes_written >= 0);
+	OutboundDataSize -= bytes_written;
+	if ((size_t)bytes_written < nbytes) {
+		int len = nbytes - bytes_written;
+		char *buffer = (char*) malloc (len + 1);
+		if (!buffer)
+			throw std::runtime_error ("bad alloc throwing back data");
+		memcpy (buffer, output_buffer + bytes_written, len);
+		buffer [len] = 0;
+		OutboundPages.push_front (OutboundPage (buffer, len));
 	}
-	else {
+
+	#ifdef HAVE_EPOLL
+	EpollEvent.events = (EPOLLIN | (SelectForWrite() ? EPOLLOUT : 0));
+	assert (MyEventMachine);
+	MyEventMachine->Modify (this);
+	#endif
+	#ifdef HAVE_KQUEUE
+	if (SelectForWrite())
+		MyEventMachine->ArmKqueueWriter (this);
+	#endif
+
+
+	if (err) {
 		#ifdef OS_UNIX
 		if ((errno != EINPROGRESS) && (errno != EWOULDBLOCK) && (errno != EINTR))
 		#endif

data/ext/ed.h

@@ -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

@@ -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

data/ext/em.h

@@ -33,6 +33,13 @@ 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
 #else
   #define EmSelect select
 #endif

data/ext/extconf.rb

@@ -33,7 +33,7 @@ end
 require 'mkmf'
 
 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('RB_UBF_DFL', 'ruby.h')
 
 # Minor platform details between *nix and Windows:

data/ext/fastfilereader/extconf.rb

@@ -0,0 +1,161 @@
+# $Id: extconf.rb 4526 2007-07-03 18:04:34Z francis $
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+# Gmail: garbagecat10
+# 
+# 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.
+#
+#---------------------------------------------------------------------------
+#
+# extconf.rb for Fast File Reader
+# We have to munge LDSHARED because this code needs a C++ link.
+#
+
+require 'mkmf'
+
+flags = []
+
+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
+
+  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
+
+when /solaris/
+  unless have_library('pthread') and
+	have_library('nsl') and
+	have_library('socket')
+	  exit
+  end
+
+  flags << '-D OS_UNIX'
+  flags << '-D OS_SOLARIS8'
+  flags << '-D BUILD_FOR_RUBY'
+
+  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'
+  else
+    flags << '-D WITHOUT_SSL'
+  end
+
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) -shared"
+
+when /darwin/
+  flags << '-DOS_UNIX'
+  flags << '-DBUILD_FOR_RUBY'
+
+  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')
+  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
+
+  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"
+
+  # 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'
+
+  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
+
+if $CPPFLAGS
+  $CPPFLAGS += ' ' + flags.join(' ')
+else
+  $CFLAGS += ' ' + flags.join(' ')
+end
+
+
+create_makefile "fastfilereaderext"