eventmachine-eventmachine 0.12.4 → 0.12.5

data/ext/em.cpp

@@ -674,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
 
@@ -762,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) {

data/ext/em.h

@@ -40,6 +40,11 @@ See the file COPYING for complete licensing information.
     #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/extconf.rb

@@ -34,7 +34,7 @@ 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')
+add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro('RUBY_UBF_IO', 'ruby.h')
 
 # Minor platform details between *nix and Windows:
 

data/lib/eventmachine_version.rb

@@ -25,7 +25,7 @@
 
 module EventMachine
 
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 
 end
 

data/tasks/tests.rake

@@ -26,7 +26,7 @@ desc "Run tests for #{Spec.name}."
 task :test do |t|
   # run_tests t
   # Rake +/ friends leave threads, etc, less stable test runs.
-  ruby "-Ilib -Iext -Ijava tests/testem.rb #{'-v' if ENV['VERBOSE']}"
+  ruby "-Ilib -Iext -Iext/fastfilereader -Ijava tests/testem.rb #{'-v' if ENV['VERBOSE']}"
 end
 
 namespace :test do
@@ -51,7 +51,7 @@ namespace :test do
       "test_pure.rb",
       "test_running.rb",
       "test_sasl.rb",
-      #"test_send_file.rb",
+      "test_send_file.rb",
       "test_servers.rb",
       "test_smtpclient.rb",
       "test_smtpserver.rb",

data/tests/test_epoll.rb

@@ -61,7 +61,7 @@ class TestEpoll < Test::Unit::TestCase
 	# On most systems, the default value is 1024.
 	# Java doesn't (currently) implement this.
 	def test_rlimit
-		unless RUBY_PLATFORM =~ /java/
+		unless RUBY_PLATFORM =~ /java/ or EM.set_descriptor_table_size >= 1024
 			a = EM.set_descriptor_table_size
 			assert( a <= 1024 )
 			a = EM.set_descriptor_table_size( 1024 )

data/tests/test_eventables.rb

@@ -27,10 +27,6 @@
 $:.unshift "../lib"
 require 'eventmachine'
 
-require 'test/unit/testsuite'
-require 'test/unit/ui/console/testrunner'
-
-
 class TestEventables < Test::Unit::TestCase
 
   class EvTest
@@ -68,6 +64,9 @@ end
 #--------------------------------------
 
 if __FILE__ == $0
+  require 'test/unit/testsuite'
+  require 'test/unit/ui/console/testrunner'
+
   runner = Test::Unit::UI::Console::TestRunner
   suite = Test::Unit::TestSuite.new("name")
   ObjectSpace.each_object(Class) do |testcase|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine-eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors: 
 - Francis Cianfrocca