eventmachine 0.12.8-java → 0.12.10-java

data/.gitignore

@@ -10,4 +10,5 @@ Makefile
 *.o
 *.log
 *.def
-*.pdb
+*.pdb
+java/src/.project

data/Rakefile

@@ -20,7 +20,7 @@
 # # both contain the proper references to OPENSSL. Use the static version
 # # of the libraries, not the dynamic, otherwise we expose the user to a
 # # runtime dependency.
-# 
+#
 # # To build a binary gem for win32, first build rubyeventmachine.so
 # # using VC6 outside of the build tree (the normal way: ruby extconf.rb,
 # # and then nmake). Then copy rubyeventmachine.so into the lib directory,
@@ -29,7 +29,6 @@
 
 require 'rubygems'  unless defined?(Gem)
 require 'rake'      unless defined?(Rake)
-require 'rake/gempackagetask'
 
 Package = false # Build zips and tarballs?
 Dir.glob('tasks/*.rake').each { |r| Rake.application.add_import r }
@@ -44,17 +43,8 @@ else
   'make'
 end
 
-# If running under rubygems...
-__DIR__ ||= File.expand_path(File.dirname(__FILE__))
-if Gem.path.map{|path| Dir.chdir(path){ Dir.pwd } rescue path }.any? {|path| %r(^#{Regexp.escape path}) =~ __DIR__}
-  task :default => :gem_build
-else
-  desc "Build gemspec, then build eventmachine, then run tests."
-  task :default => [:build, :test]
-end
-
-desc ":default build when running under rubygems."
-task :gem_build => :build
+desc "Build gemspec, then build eventmachine, then run tests."
+task :default => [:build, :test]
 
 desc "Build extension (or EVENTMACHINE_LIBRARY) and place in lib"
 build_task = 'ext:build'
@@ -68,6 +58,12 @@ end
 
 task :dummy_build
 
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'tests/**/test_*.rb'
+  t.warning = true
+end
+
 # Basic clean definition, this is enhanced by imports aswell.
 task :clean do
   chdir 'ext' do
@@ -94,7 +90,7 @@ Spec = Gem::Specification.new do |s|
 
   s.require_path      = 'lib'
 
-  # TODO / XXX - should we enable this? rubygems fails the install if anything 
+  # TODO / XXX - should we enable this? rubygems fails the install if anything
   # is broken. What we could do is CI submission, though, and always terminate
   # with a positive code...
   # s.test_file         = "tests/testem.rb"
@@ -195,31 +191,32 @@ end
 namespace :ext do
   ext_sources = FileList['ext/*.{h,cpp,rb,c}']
   ffr_sources = FileList['ext/fastfilereader/*.{h,cpp,rb}']
+  file ext_extconf = 'ext/extconf.rb'
+  file ffr_extconf = 'ext/fastfilereader/extconf.rb'
+  ext_libname = "lib/rubyeventmachine.#{Config::CONFIG['DLEXT']}"
+  ffr_libname = "lib/fastfilereaderext.#{Config::CONFIG['DLEXT']}"
+
+  file ext_libname => ext_sources + ['ext/Makefile'] do
+    chdir('ext') { sh MAKE }
+  end
   
+  file ffr_libname => ffr_sources + ['ext/fastfilereader/Makefile'] do
+    chdir('ext/fastfilereader') { sh MAKE }
+  end
+
   desc "Build C++ extension"
   task :build => [:make]
-  
-  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'
-  file 'ext/Makefile' => ext_sources do
+
+  task :make => ext_libname
+  task :make => ffr_libname
+
+  file 'ext/Makefile' => ext_extconf do
     chdir 'ext' do
       ruby 'extconf.rb'
     end
   end
 
-  desc 'Compile fastfilereader makefile'
-  file 'ext/fastfilereader/Makefile' => ffr_sources do
+  file 'ext/fastfilereader/Makefile' => ffr_extconf do
     chdir 'ext/fastfilereader' do
       ruby 'extconf.rb'
     end
@@ -231,34 +228,147 @@ namespace :java do
   # This step is required before executing the jgem task.
   desc "Build java extension"
   task :build => [:jar] do |t|
-    chdir('java/src') do
-      mv 'em_reactor.jar', '../../lib/em_reactor.jar'
-    end
+    mv 'java/em_reactor.jar', 'lib/'
   end
-  
-  desc "compile .java to .class"
+
   task :compile do
-    chdir('java/src') do
-      sh 'javac com/rubyeventmachine/*.java'
+    chdir('java') do
+      mkdir_p "build"
+      sh 'javac src/com/rubyeventmachine/*.java -d build'
     end
   end
-  
-  desc "compile .classes to .jar"
+
   task :jar => [:compile] do
-    chdir('java/src') do
-      sh "jar -cf em_reactor.jar com/rubyeventmachine/*.class"
+    chdir('java/build') do
+      sh "jar -cf ../em_reactor.jar com/rubyeventmachine/*.class"
     end
   end
 
   desc "build a java binary gem"
   task :gem => :build do
+    Spec.platform = 'java'
+    Spec.files += %w[ lib/em_reactor.jar ]
+    Spec.extensions = nil
+
     Rake::Task['gem'].invoke
   end
 end
 
-task :gemspec => :clobber do
-  open("eventmachine.gemspec", 'w') { |f| f.write Spec.to_ruby }
+namespace :osx do
+  desc "Build OSX binary gem"
+  task :gem do
+    Spec.platform = RUBY_PLATFORM.sub(/darwin.+$/, 'darwin')
+    Spec.files += %w[ lib/rubyeventmachine.bundle lib/fastfilereaderext.bundle ]
+    Spec.extensions = nil
+
+    Rake::Task['build'].invoke
+    Rake::Task['gem'].invoke
+  end
+
+  # XXX gcc will still prefer the shared libssl on the system, so we need to hack the extconf
+  # XXX to use the static library to make this actually work
+  task :static_gem => [:build_openssl, :gem]
+
+  task :build_openssl do
+    mkdir_p 'build'
+    chdir 'build' do
+      unless File.exists?('openssl-0.9.8j')
+        sh 'curl http://www.openssl.org/source/openssl-0.9.8j.tar.gz > openssl-0.9.8j.tar.gz'
+        sh 'tar zxvf openssl-0.9.8j.tar.gz'
+      end
+
+      mkdir_p 'local'
+      chdir 'openssl-0.9.8j' do
+        local_dir = File.expand_path(File.join(File.dirname(__FILE__),'build','local'))
+        sh "./config --prefix=#{local_dir}"
+        sh 'make'
+        sh 'make install'
+      end
+
+      chdir '../ext' do
+        sh 'git clean -fd .'
+      end
+
+      mv 'local/include/openssl', '../ext/'
+      mv 'local/lib/libssl.a', '../ext/'
+      mv 'local/lib/libcrypto.a', '../ext/'
+    end
+  end
+end
+
+require 'rake/clean'
+
+rdoc_task_type = begin
+  require 'rdoc/task'
+  RDoc::Task
+rescue LoadError
+  require 'rake/rdoctask'
+  Rake::RDocTask
+end
+df = begin; require 'rdoc/generator/darkfish'; true; rescue LoadError; end
+rdtask = rdoc_task_type.new do |rd|
+  rd.title = Spec.name
+  rd.rdoc_dir = 'rdoc'
+  rd.main = "README"
+  rd.rdoc_files.include("lib/**/*.rb", *Spec.extra_rdoc_files)
+  rd.rdoc_files.exclude(*%w(lib/em/version lib/emva lib/evma/ lib/pr_eventmachine lib/jeventmachine))
+  rd.template = 'darkfish' if df
+end
+Rake::Task[:clean].enhance [:clobber_rdoc]
+
+desc 'Generate and open documentation'
+task :docs => :rdoc do
+  case RUBY_PLATFORM
+  when /darwin/       ; sh 'open rdoc/index.html'
+  when /mswin|mingw/  ; sh 'start rdoc\index.html'
+  else 
+    sh 'firefox rdoc/index.html'
+  end
+end
+
+def windows?; RUBY_PLATFORM =~ /mswin|mingw/; end
+def sudo(cmd)
+  if windows? || (require 'etc'; Etc.getpwuid.uid == 0)
+    sh cmd
+  else
+    sh "sudo #{cmd}"
+  end
+end
+def gem_cmd(action, name, *args)
+  rb = Gem.ruby rescue nil
+  rb ||= (require 'rbconfig'; File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']))
+  sudo "#{rb} -r rubygems -e 'require %{rubygems/gem_runner}; Gem::GemRunner.new.run(%w{#{action} #{name} #{args.join(' ')}})'"
+end
+
+begin
+  require 'rubygems/package_task'
+  Gem::PackageTask
+rescue LoadError
+  require 'rake/gempackagetask'
+  Rake::GemPackageTask
+end.new(Spec) do |pkg|
+  pkg.need_tar, pkg.need_tar_gz, pkg.need_zip = true, true, true if Package
+  pkg.gem_spec = Spec
+end
+
+Rake::Task[:clean].enhance [:clobber_package]
+
+namespace :gem do
+  desc 'Install gem (and sudo if required)'
+  task :install => :package do 
+    gem_cmd(:install, "pkg/#{Spec.name}-#{Spec.version}.gem")
+  end
+
+  desc 'Uninstall gem (and sudo if required)'
+  task :uninstall do
+    gem_cmd(:uninstall, "#{Spec.name}", "-v=#{Spec.version}")
+  end
+  
+  desc "Generate new gemspec"
+  task :spec => :clobber do
+    open("eventmachine.gemspec", 'w') { |f| f.write Spec.to_ruby }
+  end
 end
 
 task :clobber => :clean
-task :test => :build
+task :test => :build

data/eventmachine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eventmachine}
-  s.version = "0.12.8"
+  s.version = "0.12.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Cianfrocca"]
-  s.date = %q{2009-05-22}
+  s.date = %q{2009-10-24}
   s.description = %q{EventMachine implements a fast, single-threaded engine for arbitrary network
 communications. It's extremely easy to use in Ruby. EventMachine wraps all
 interactions with IP sockets, allowing programs to concentrate on the
@@ -20,13 +20,12 @@ using TCP/IP, especially if custom protocols are required.
 }
   s.email = %q{garbagecat10@gmail.com}
   s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
-  s.has_rdoc = true
-  s.files = [".gitignore", "README", "Rakefile", "docs/COPYING", "docs/ChangeLog", "docs/DEFERRABLES", "docs/EPOLL", "docs/GNU", "docs/INSTALL", "docs/KEYBOARD", "docs/LEGAL", "docs/LIGHTWEIGHT_CONCURRENCY", "docs/PURE_RUBY", "docs/RELEASE_NOTES", "docs/SMTP", "docs/SPAWNED_PROCESSES", "docs/TODO", "eventmachine.gemspec", "examples/ex_channel.rb", "examples/ex_queue.rb", "examples/helper.rb", "ext/binder.cpp", "ext/binder.h", "ext/cmain.cpp", "ext/cplusplus.cpp", "ext/ed.cpp", "ext/ed.h", "ext/em.cpp", "ext/em.h", "ext/emwin.cpp", "ext/emwin.h", "ext/epoll.cpp", "ext/epoll.h", "ext/eventmachine.h", "ext/eventmachine_cpp.h", "ext/extconf.rb", "ext/fastfilereader/extconf.rb", "ext/fastfilereader/mapper.cpp", "ext/fastfilereader/mapper.h", "ext/fastfilereader/rubymain.cpp", "ext/files.cpp", "ext/files.h", "ext/kb.cpp", "ext/page.cpp", "ext/page.h", "ext/pipe.cpp", "ext/project.h", "ext/rubymain.cpp", "ext/sigs.cpp", "ext/sigs.h", "ext/ssl.cpp", "ext/ssl.h", "java/.classpath", "java/.project", "java/src/com/rubyeventmachine/Application.java", "java/src/com/rubyeventmachine/Connection.java", "java/src/com/rubyeventmachine/ConnectionFactory.java", "java/src/com/rubyeventmachine/DefaultConnectionFactory.java", "java/src/com/rubyeventmachine/EmReactor.java", "java/src/com/rubyeventmachine/EmReactorException.java", "java/src/com/rubyeventmachine/EventableChannel.java", "java/src/com/rubyeventmachine/EventableDatagramChannel.java", "java/src/com/rubyeventmachine/EventableSocketChannel.java", "java/src/com/rubyeventmachine/PeriodicTimer.java", "java/src/com/rubyeventmachine/Timer.java", "java/src/com/rubyeventmachine/tests/ApplicationTest.java", "java/src/com/rubyeventmachine/tests/ConnectTest.java", "java/src/com/rubyeventmachine/tests/EMTest.java", "java/src/com/rubyeventmachine/tests/TestDatagrams.java", "java/src/com/rubyeventmachine/tests/TestServers.java", "java/src/com/rubyeventmachine/tests/TestTimers.java", "lib/em/buftok.rb", "lib/em/callback.rb", "lib/em/channel.rb", "lib/em/connection.rb", "lib/em/deferrable.rb", "lib/em/file_watch.rb", "lib/em/future.rb", "lib/em/messages.rb", "lib/em/process_watch.rb", "lib/em/processes.rb", "lib/em/protocols.rb", "lib/em/protocols/header_and_content.rb", "lib/em/protocols/httpclient.rb", "lib/em/protocols/httpclient2.rb", "lib/em/protocols/line_and_text.rb", "lib/em/protocols/linetext2.rb", "lib/em/protocols/memcache.rb", "lib/em/protocols/object_protocol.rb", "lib/em/protocols/postgres3.rb", "lib/em/protocols/saslauth.rb", "lib/em/protocols/smtpclient.rb", "lib/em/protocols/smtpserver.rb", "lib/em/protocols/stomp.rb", "lib/em/protocols/tcptest.rb", "lib/em/queue.rb", "lib/em/spawnable.rb", "lib/em/streamer.rb", "lib/em/timers.rb", "lib/em/version.rb", "lib/eventmachine.rb", "lib/evma.rb", "lib/evma/callback.rb", "lib/evma/container.rb", "lib/evma/factory.rb", "lib/evma/protocol.rb", "lib/evma/reactor.rb", "lib/jeventmachine.rb", "lib/pr_eventmachine.rb", "setup.rb", "tasks/cpp.rake", "tasks/project.rake", "tasks/tests.rake", "tests/client.crt", "tests/client.key", "tests/test_attach.rb", "tests/test_basic.rb", "tests/test_channel.rb", "tests/test_connection_count.rb", "tests/test_defer.rb", "tests/test_epoll.rb", "tests/test_error_handler.rb", "tests/test_errors.rb", "tests/test_exc.rb", "tests/test_file_watch.rb", "tests/test_futures.rb", "tests/test_handler_check.rb", "tests/test_hc.rb", "tests/test_httpclient.rb", "tests/test_httpclient2.rb", "tests/test_inactivity_timeout.rb", "tests/test_kb.rb", "tests/test_ltp.rb", "tests/test_ltp2.rb", "tests/test_next_tick.rb", "tests/test_object_protocol.rb", "tests/test_process_watch.rb", "tests/test_processes.rb", "tests/test_proxy_connection.rb", "tests/test_pure.rb", "tests/test_queue.rb", "tests/test_running.rb", "tests/test_sasl.rb", "tests/test_send_file.rb", "tests/test_servers.rb", "tests/test_smtpclient.rb", "tests/test_smtpserver.rb", "tests/test_spawn.rb", "tests/test_ssl_args.rb", "tests/test_ssl_methods.rb", "tests/test_ssl_verify.rb", "tests/test_timers.rb", "tests/test_ud.rb", "tests/testem.rb", "web/whatis"]
+  s.files = [".gitignore", "README", "Rakefile", "docs/COPYING", "docs/ChangeLog", "docs/DEFERRABLES", "docs/EPOLL", "docs/GNU", "docs/INSTALL", "docs/KEYBOARD", "docs/LEGAL", "docs/LIGHTWEIGHT_CONCURRENCY", "docs/PURE_RUBY", "docs/RELEASE_NOTES", "docs/SMTP", "docs/SPAWNED_PROCESSES", "docs/TODO", "eventmachine.gemspec", "examples/ex_channel.rb", "examples/ex_queue.rb", "examples/helper.rb", "ext/binder.cpp", "ext/binder.h", "ext/cmain.cpp", "ext/cplusplus.cpp", "ext/ed.cpp", "ext/ed.h", "ext/em.cpp", "ext/em.h", "ext/emwin.cpp", "ext/emwin.h", "ext/epoll.cpp", "ext/epoll.h", "ext/eventmachine.h", "ext/eventmachine_cpp.h", "ext/extconf.rb", "ext/fastfilereader/extconf.rb", "ext/fastfilereader/mapper.cpp", "ext/fastfilereader/mapper.h", "ext/fastfilereader/rubymain.cpp", "ext/files.cpp", "ext/files.h", "ext/kb.cpp", "ext/page.cpp", "ext/page.h", "ext/pipe.cpp", "ext/project.h", "ext/rubymain.cpp", "ext/sigs.cpp", "ext/sigs.h", "ext/ssl.cpp", "ext/ssl.h", "java/.classpath", "java/.project", "java/src/com/rubyeventmachine/EmReactor.java", "java/src/com/rubyeventmachine/EmReactorException.java", "java/src/com/rubyeventmachine/EventableChannel.java", "java/src/com/rubyeventmachine/EventableDatagramChannel.java", "java/src/com/rubyeventmachine/EventableSocketChannel.java", "java/src/com/rubyeventmachine/application/Application.java", "java/src/com/rubyeventmachine/application/Connection.java", "java/src/com/rubyeventmachine/application/ConnectionFactory.java", "java/src/com/rubyeventmachine/application/DefaultConnectionFactory.java", "java/src/com/rubyeventmachine/application/PeriodicTimer.java", "java/src/com/rubyeventmachine/application/Timer.java", "java/src/com/rubyeventmachine/tests/ApplicationTest.java", "java/src/com/rubyeventmachine/tests/ConnectTest.java", "java/src/com/rubyeventmachine/tests/EMTest.java", "java/src/com/rubyeventmachine/tests/TestDatagrams.java", "java/src/com/rubyeventmachine/tests/TestServers.java", "java/src/com/rubyeventmachine/tests/TestTimers.java", "lib/em/buftok.rb", "lib/em/callback.rb", "lib/em/channel.rb", "lib/em/connection.rb", "lib/em/deferrable.rb", "lib/em/file_watch.rb", "lib/em/future.rb", "lib/em/messages.rb", "lib/em/process_watch.rb", "lib/em/processes.rb", "lib/em/protocols.rb", "lib/em/protocols/header_and_content.rb", "lib/em/protocols/httpclient.rb", "lib/em/protocols/httpclient2.rb", "lib/em/protocols/line_and_text.rb", "lib/em/protocols/linetext2.rb", "lib/em/protocols/memcache.rb", "lib/em/protocols/object_protocol.rb", "lib/em/protocols/postgres3.rb", "lib/em/protocols/saslauth.rb", "lib/em/protocols/smtpclient.rb", "lib/em/protocols/smtpserver.rb", "lib/em/protocols/socks4.rb", "lib/em/protocols/stomp.rb", "lib/em/protocols/tcptest.rb", "lib/em/queue.rb", "lib/em/spawnable.rb", "lib/em/streamer.rb", "lib/em/timers.rb", "lib/em/version.rb", "lib/eventmachine.rb", "lib/evma.rb", "lib/evma/callback.rb", "lib/evma/container.rb", "lib/evma/factory.rb", "lib/evma/protocol.rb", "lib/evma/reactor.rb", "lib/jeventmachine.rb", "lib/pr_eventmachine.rb", "setup.rb", "tasks/cpp.rake_example", "tests/client.crt", "tests/client.key", "tests/test_attach.rb", "tests/test_basic.rb", "tests/test_channel.rb", "tests/test_connection_count.rb", "tests/test_defer.rb", "tests/test_epoll.rb", "tests/test_error_handler.rb", "tests/test_errors.rb", "tests/test_exc.rb", "tests/test_file_watch.rb", "tests/test_futures.rb", "tests/test_get_sock_opt.rb", "tests/test_handler_check.rb", "tests/test_hc.rb", "tests/test_httpclient.rb", "tests/test_httpclient2.rb", "tests/test_inactivity_timeout.rb", "tests/test_kb.rb", "tests/test_ltp.rb", "tests/test_ltp2.rb", "tests/test_next_tick.rb", "tests/test_object_protocol.rb", "tests/test_pause.rb", "tests/test_pending_connect_timeout.rb", "tests/test_process_watch.rb", "tests/test_processes.rb", "tests/test_proxy_connection.rb", "tests/test_pure.rb", "tests/test_queue.rb", "tests/test_running.rb", "tests/test_sasl.rb", "tests/test_send_file.rb", "tests/test_servers.rb", "tests/test_smtpclient.rb", "tests/test_smtpserver.rb", "tests/test_spawn.rb", "tests/test_ssl_args.rb", "tests/test_ssl_methods.rb", "tests/test_ssl_verify.rb", "tests/test_timers.rb", "tests/test_ud.rb", "tests/testem.rb", "web/whatis"]
   s.homepage = %q{http://rubyeventmachine.com}
   s.rdoc_options = ["--title", "EventMachine", "--main", "README", "--line-numbers", "-x", "lib/em/version", "-x", "lib/emva", "-x", "lib/evma/", "-x", "lib/pr_eventmachine", "-x", "lib/jeventmachine"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{eventmachine}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby/EventMachine library}
 
   if s.respond_to? :specification_version then

data/ext/binder.cpp

@@ -22,13 +22,22 @@ See the file COPYING for complete licensing information.
 #define DEV_URANDOM "/dev/urandom"
 
 
-map<string, Bindable_t*> Bindable_t::BindingBag;
+map<unsigned long, Bindable_t*> Bindable_t::BindingBag;
 
 
 /********************************
 STATIC Bindable_t::CreateBinding
 ********************************/
 
+unsigned long Bindable_t::CreateBinding()
+{
+	// XXX use atomic_t to prevent thread-safety issues
+	static unsigned long num = 0;
+	while(BindingBag[++num]);
+	return num;
+}
+
+#if 0
 string Bindable_t::CreateBinding()
 {
 	static int index = 0;
@@ -76,25 +85,15 @@ string Bindable_t::CreateBinding()
 	ss << seed << (++index);
 	return ss.str();
 }
-
-
-/*****************************
-STATIC: Bindable_t::GetObject
-*****************************/
-
-Bindable_t *Bindable_t::GetObject (const char *binding)
-{
-  string s (binding ? binding : "");
-  return GetObject (s);
-}
+#endif
 
 /*****************************
 STATIC: Bindable_t::GetObject
 *****************************/
 
-Bindable_t *Bindable_t::GetObject (const string &binding)
+Bindable_t *Bindable_t::GetObject (const unsigned long binding)
 {
-  map<string, Bindable_t*>::const_iterator i = BindingBag.find (binding);
+  map<unsigned long, Bindable_t*>::const_iterator i = BindingBag.find (binding);
   if (i != BindingBag.end())
     return i->second;
   else

data/ext/binder.h

@@ -24,20 +24,18 @@ See the file COPYING for complete licensing information.
 class Bindable_t
 {
 	public:
-		static string CreateBinding();
-		static Bindable_t *GetObject (const string&);
-		static Bindable_t *GetObject (const char*);
-		static map<string, Bindable_t*> BindingBag;
+		static unsigned long CreateBinding();
+		static Bindable_t *GetObject (const unsigned long);
+		static map<unsigned long, Bindable_t*> BindingBag;
 
 	public:
 		Bindable_t();
 		virtual ~Bindable_t();
 
-		const string &GetBinding() {return Binding;}
-		const char *GetBindingChars() {return Binding.c_str();}
+		const unsigned long GetBinding() {return Binding;}
 
 	private:
-		string Binding;
+		unsigned long Binding;
 };
 
 

data/ext/cmain.cpp

@@ -19,6 +19,13 @@ See the file COPYING for complete licensing information.
 
 #include "project.h"
 
+/* 21Sep09: ruby 1.9 defines macros for common i/o functions that point to rb_w32_* implementations.
+   We need to undef the stat to fix a build failure in evma_send_file_data_to_connection.
+   See http://groups.google.com/group/eventmachine/browse_thread/thread/fc60d9bb738ffc71
+*/
+#if defined(BUILD_FOR_RUBY) && defined(OS_WIN32)
+#undef stat
+#endif
 
 static EventMachine_t *EventMachine;
 static int bUseEpoll = 0;
@@ -31,7 +38,7 @@ extern "C" void ensure_eventmachine (const char *caller = "unknown caller")
 		char err_string[err_size];
 		snprintf (err_string, err_size, "eventmachine not initialized: %s", caller);
 		#ifdef BUILD_FOR_RUBY
-			rb_raise(rb_eRuntimeError, err_string);
+			rb_raise(rb_eRuntimeError, "%s", err_string);
 		#else
 			throw std::runtime_error (err_string);
 		#endif
@@ -42,7 +49,7 @@ extern "C" void ensure_eventmachine (const char *caller = "unknown caller")
 evma_initialize_library
 ***********************/
 
-extern "C" void evma_initialize_library (void(*cb)(const char*, int, const char*, int))
+extern "C" void evma_initialize_library (void(*cb)(const unsigned long, int, const char*, const unsigned long))
 {
 	// Probably a bad idea to mess with the signal mask of a process
 	// we're just being linked into.
@@ -88,7 +95,7 @@ extern "C" void evma_run_machine()
 evma_install_oneshot_timer
 **************************/
 
-extern "C" const char *evma_install_oneshot_timer (int seconds)
+extern "C" const unsigned long evma_install_oneshot_timer (int seconds)
 {
 	ensure_eventmachine("evma_install_oneshot_timer");
 	return EventMachine->InstallOneshotTimer (seconds);
@@ -99,7 +106,7 @@ extern "C" const char *evma_install_oneshot_timer (int seconds)
 evma_connect_to_server
 **********************/
 
-extern "C" const char *evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port)
+extern "C" const unsigned long evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port)
 {
 	ensure_eventmachine("evma_connect_to_server");
 	return EventMachine->ConnectToServer (bind_addr, bind_port, server, port);
@@ -109,7 +116,7 @@ extern "C" const char *evma_connect_to_server (const char *bind_addr, int bind_p
 evma_connect_to_unix_server
 ***************************/
 
-extern "C" const char *evma_connect_to_unix_server (const char *server)
+extern "C" const unsigned long evma_connect_to_unix_server (const char *server)
 {
 	ensure_eventmachine("evma_connect_to_unix_server");
 	return EventMachine->ConnectToUnixServer (server);
@@ -119,19 +126,19 @@ extern "C" const char *evma_connect_to_unix_server (const char *server)
 evma_attach_fd
 **************/
 
-extern "C" const char *evma_attach_fd (int file_descriptor, int notify_readable, int notify_writable)
+extern "C" const unsigned long evma_attach_fd (int file_descriptor, int watch_mode)
 {
 	ensure_eventmachine("evma_attach_fd");
-	return EventMachine->AttachFD (file_descriptor, (notify_readable ? true : false), (notify_writable ? true : false));
+	return EventMachine->AttachFD (file_descriptor, watch_mode ? true : false);
 }
 
 /**************
 evma_detach_fd
 **************/
 
-extern "C" int evma_detach_fd (const char *binding)
+extern "C" int evma_detach_fd (const unsigned long binding)
 {
-	ensure_eventmachine("evma_dettach_fd");
+	ensure_eventmachine("evma_detach_fd");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (ed)
 		return EventMachine->DetachFD (ed);
@@ -143,11 +150,114 @@ extern "C" int evma_detach_fd (const char *binding)
 		#endif
 }
 
+/************************
+evma_get_file_descriptor
+************************/
+
+extern "C" int evma_get_file_descriptor (const unsigned long binding)
+{
+	ensure_eventmachine("evma_get_file_descriptor");
+	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
+	if (ed)
+		return ed->GetSocket();
+	else
+		#ifdef BUILD_FOR_RUBY
+			rb_raise(rb_eRuntimeError, "invalid binding to get_fd");
+		#else
+			throw std::runtime_error ("invalid binding to get_fd");
+		#endif
+}
+
+/***********************
+evma_is_notify_readable
+***********************/
+
+extern "C" int evma_is_notify_readable (const unsigned long binding)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		return cd->IsNotifyReadable() ? 1 : 0;
+	return -1;
+}
+
+/************************
+evma_set_notify_readable
+************************/
+
+extern "C" void evma_set_notify_readable (const unsigned long binding, int mode)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		cd->SetNotifyReadable (mode ? true : false);
+}
+
+/***********************
+evma_is_notify_writable
+***********************/
+
+extern "C" int evma_is_notify_writable (const unsigned long binding)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		return cd->IsNotifyWritable() ? 1 : 0;
+	return -1;
+}
+
+/************************
+evma_set_notify_writable
+************************/
+
+extern "C" void evma_set_notify_writable (const unsigned long binding, int mode)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		cd->SetNotifyWritable (mode ? true : false);
+}
+
+/**********
+evma_pause
+**********/
+
+extern "C" int evma_pause (const unsigned long binding)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		return cd->Pause() ? 1 : 0;
+
+	return 0;
+}
+
+/***********
+evma_resume
+***********/
+
+extern "C" int evma_resume (const unsigned long binding)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		return cd->Resume() ? 1 : 0;
+
+	return 0;
+}
+
+/**************
+evma_is_paused
+**************/
+
+extern "C" int evma_is_paused (const unsigned long binding)
+{
+	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
+	if (cd)
+		return cd->IsPaused() ? 1 : 0;
+
+	return 0;
+}
+
 /**********************
 evma_create_tcp_server
 **********************/
 
-extern "C" const char *evma_create_tcp_server (const char *address, int port)
+extern "C" const unsigned long evma_create_tcp_server (const char *address, int port)
 {
 	ensure_eventmachine("evma_create_tcp_server");
 	return EventMachine->CreateTcpServer (address, port);
@@ -157,7 +267,7 @@ extern "C" const char *evma_create_tcp_server (const char *address, int port)
 evma_create_unix_domain_server
 ******************************/
 
-extern "C" const char *evma_create_unix_domain_server (const char *filename)
+extern "C" const unsigned long evma_create_unix_domain_server (const char *filename)
 {
 	ensure_eventmachine("evma_create_unix_domain_server");
 	return EventMachine->CreateUnixDomainServer (filename);
@@ -167,7 +277,7 @@ extern "C" const char *evma_create_unix_domain_server (const char *filename)
 evma_open_datagram_socket
 *************************/
 
-extern "C" const char *evma_open_datagram_socket (const char *address, int port)
+extern "C" const unsigned long evma_open_datagram_socket (const char *address, int port)
 {
 	ensure_eventmachine("evma_open_datagram_socket");
 	return EventMachine->OpenDatagramSocket (address, port);
@@ -177,7 +287,7 @@ extern "C" const char *evma_open_datagram_socket (const char *address, int port)
 evma_open_keyboard
 ******************/
 
-extern "C" const char *evma_open_keyboard()
+extern "C" const unsigned long evma_open_keyboard()
 {
 	ensure_eventmachine("evma_open_keyboard");
 	return EventMachine->OpenKeyboard();
@@ -187,7 +297,7 @@ extern "C" const char *evma_open_keyboard()
 evma_watch_filename
 *******************/
 
-extern "C" const char *evma_watch_filename (const char *fname)
+extern "C" const unsigned long evma_watch_filename (const char *fname)
 {
 	ensure_eventmachine("evma_watch_filename");
 	return EventMachine->WatchFile(fname);
@@ -197,7 +307,7 @@ extern "C" const char *evma_watch_filename (const char *fname)
 evma_unwatch_filename
 *********************/
 
-extern "C" void evma_unwatch_filename (const char *sig)
+extern "C" void evma_unwatch_filename (const unsigned long sig)
 {
 	ensure_eventmachine("evma_unwatch_file");
 	EventMachine->UnwatchFile(sig);
@@ -207,7 +317,7 @@ extern "C" void evma_unwatch_filename (const char *sig)
 evma_watch_pid
 **************/
 
-extern "C" const char *evma_watch_pid (int pid)
+extern "C" const unsigned long evma_watch_pid (int pid)
 {
 	ensure_eventmachine("evma_watch_pid");
 	return EventMachine->WatchPid(pid);
@@ -217,7 +327,7 @@ extern "C" const char *evma_watch_pid (int pid)
 evma_unwatch_pid
 ****************/
 
-extern "C" void evma_unwatch_pid (const char *sig)
+extern "C" void evma_unwatch_pid (const unsigned long sig)
 {
 	ensure_eventmachine("evma_unwatch_pid");
 	EventMachine->UnwatchPid(sig);
@@ -227,7 +337,7 @@ extern "C" void evma_unwatch_pid (const char *sig)
 evma_send_data_to_connection
 ****************************/
 
-extern "C" int evma_send_data_to_connection (const char *binding, const char *data, int data_length)
+extern "C" int evma_send_data_to_connection (const unsigned long binding, const char *data, int data_length)
 {
 	ensure_eventmachine("evma_send_data_to_connection");
 	return ConnectionDescriptor::SendDataToConnection (binding, data, data_length);
@@ -237,7 +347,7 @@ extern "C" int evma_send_data_to_connection (const char *binding, const char *da
 evma_send_datagram
 ******************/
 
-extern "C" int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port)
+extern "C" int evma_send_datagram (const unsigned long binding, const char *data, int data_length, const char *address, int port)
 {
 	ensure_eventmachine("evma_send_datagram");
 	return DatagramDescriptor::SendDatagram (binding, data, data_length, address, port);
@@ -248,7 +358,7 @@ extern "C" int evma_send_datagram (const char *binding, const char *data, int da
 evma_close_connection
 *********************/
 
-extern "C" void evma_close_connection (const char *binding, int after_writing)
+extern "C" void evma_close_connection (const unsigned long binding, int after_writing)
 {
 	ensure_eventmachine("evma_close_connection");
 	ConnectionDescriptor::CloseConnection (binding, (after_writing ? true : false));
@@ -258,7 +368,7 @@ extern "C" void evma_close_connection (const char *binding, int after_writing)
 evma_report_connection_error_status
 ***********************************/
 
-extern "C" int evma_report_connection_error_status (const char *binding)
+extern "C" int evma_report_connection_error_status (const unsigned long binding)
 {
 	ensure_eventmachine("evma_report_connection_error_status");
 	return ConnectionDescriptor::ReportErrorStatus (binding);
@@ -268,7 +378,7 @@ extern "C" int evma_report_connection_error_status (const char *binding)
 evma_stop_tcp_server
 ********************/
 
-extern "C" void evma_stop_tcp_server (const char *binding)
+extern "C" void evma_stop_tcp_server (const unsigned long binding)
 {
 	ensure_eventmachine("evma_stop_tcp_server");
 	AcceptorDescriptor::StopAcceptor (binding);
@@ -290,7 +400,7 @@ extern "C" void evma_stop_machine()
 evma_start_tls
 **************/
 
-extern "C" void evma_start_tls (const char *binding)
+extern "C" void evma_start_tls (const unsigned long binding)
 {
 	ensure_eventmachine("evma_start_tls");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -302,7 +412,7 @@ extern "C" void evma_start_tls (const char *binding)
 evma_set_tls_parms
 ******************/
 
-extern "C" void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filename, int verify_peer)
+extern "C" void evma_set_tls_parms (const unsigned long binding, const char *privatekey_filename, const char *certchain_filename, int verify_peer)
 {
 	ensure_eventmachine("evma_set_tls_parms");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -315,7 +425,7 @@ evma_get_peer_cert
 ******************/
 
 #ifdef WITH_SSL
-extern "C" X509 *evma_get_peer_cert (const char *binding)
+extern "C" X509 *evma_get_peer_cert (const unsigned long binding)
 {
 	ensure_eventmachine("evma_get_peer_cert");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -330,7 +440,7 @@ evma_accept_ssl_peer
 ********************/
 
 #ifdef WITH_SSL
-extern "C" void evma_accept_ssl_peer (const char *binding)
+extern "C" void evma_accept_ssl_peer (const unsigned long binding)
 {
 	ensure_eventmachine("evma_accept_ssl_peer");
 	ConnectionDescriptor *cd = dynamic_cast <ConnectionDescriptor*> (Bindable_t::GetObject (binding));
@@ -343,7 +453,7 @@ extern "C" void evma_accept_ssl_peer (const char *binding)
 evma_get_peername
 *****************/
 
-extern "C" int evma_get_peername (const char *binding, struct sockaddr *sa)
+extern "C" int evma_get_peername (const unsigned long binding, struct sockaddr *sa)
 {
 	ensure_eventmachine("evma_get_peername");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -358,7 +468,7 @@ extern "C" int evma_get_peername (const char *binding, struct sockaddr *sa)
 evma_get_sockname
 *****************/
 
-extern "C" int evma_get_sockname (const char *binding, struct sockaddr *sa)
+extern "C" int evma_get_sockname (const unsigned long binding, struct sockaddr *sa)
 {
 	ensure_eventmachine("evma_get_sockname");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -373,7 +483,7 @@ extern "C" int evma_get_sockname (const char *binding, struct sockaddr *sa)
 evma_get_subprocess_pid
 ***********************/
 
-extern "C" int evma_get_subprocess_pid (const char *binding, pid_t *pid)
+extern "C" int evma_get_subprocess_pid (const unsigned long binding, pid_t *pid)
 {
 	ensure_eventmachine("evma_get_subprocess_pid");
 	#ifdef OS_UNIX
@@ -396,7 +506,7 @@ extern "C" int evma_get_subprocess_pid (const char *binding, pid_t *pid)
 evma_get_subprocess_status
 **************************/
 
-extern "C" int evma_get_subprocess_status (const char *binding, int *status)
+extern "C" int evma_get_subprocess_status (const unsigned long binding, int *status)
 {
 	ensure_eventmachine("evma_get_subprocess_status");
 	if (status) {
@@ -433,7 +543,7 @@ extern "C" void evma_signal_loopbreak()
 evma__write_file
 ****************/
 
-extern "C" const char *evma__write_file (const char *filename)
+extern "C" const unsigned long evma__write_file (const char *filename)
 {
 	ensure_eventmachine("evma__write_file");
 	return EventMachine->_OpenFileForWriting (filename);
@@ -444,7 +554,7 @@ extern "C" const char *evma__write_file (const char *filename)
 evma_get_comm_inactivity_timeout
 ********************************/
 
-extern "C" float evma_get_comm_inactivity_timeout (const char *binding)
+extern "C" float evma_get_comm_inactivity_timeout (const unsigned long binding)
 {
 	ensure_eventmachine("evma_get_comm_inactivity_timeout");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -459,7 +569,7 @@ extern "C" float evma_get_comm_inactivity_timeout (const char *binding)
 evma_set_comm_inactivity_timeout
 ********************************/
 
-extern "C" int evma_set_comm_inactivity_timeout (const char *binding, float value)
+extern "C" int evma_set_comm_inactivity_timeout (const unsigned long binding, float value)
 {
 	ensure_eventmachine("evma_set_comm_inactivity_timeout");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -471,6 +581,38 @@ extern "C" int evma_set_comm_inactivity_timeout (const char *binding, float valu
 }
 
 
+/********************************
+evma_get_pending_connect_timeout
+********************************/
+
+extern "C" float evma_get_pending_connect_timeout (const unsigned long binding)
+{
+	ensure_eventmachine("evma_get_pending_connect_timeout");
+	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
+	if (ed) {
+		return ed->GetPendingConnectTimeout();
+	}
+	else
+		return 0.0;
+}
+
+
+/********************************
+evma_set_pending_connect_timeout
+********************************/
+
+extern "C" int evma_set_pending_connect_timeout (const unsigned long binding, float value)
+{
+	ensure_eventmachine("evma_set_pending_connect_timeout");
+	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
+	if (ed) {
+		return ed->SetPendingConnectTimeout (value);
+	}
+	else
+		return 0;
+}
+
+
 /**********************
 evma_set_timer_quantum
 **********************/
@@ -524,7 +666,7 @@ extern "C" void evma_setuid_string (const char *username)
 evma_popen
 **********/
 
-extern "C" const char *evma_popen (char * const*cmd_strings)
+extern "C" const unsigned long evma_popen (char * const*cmd_strings)
 {
 	ensure_eventmachine("evma_popen");
 	return EventMachine->Socketpair (cmd_strings);
@@ -535,7 +677,7 @@ extern "C" const char *evma_popen (char * const*cmd_strings)
 evma_get_outbound_data_size
 ***************************/
 
-extern "C" int evma_get_outbound_data_size (const char *binding)
+extern "C" int evma_get_outbound_data_size (const unsigned long binding)
 {
 	ensure_eventmachine("evma_get_outbound_data_size");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
@@ -576,7 +718,7 @@ extern "C" int evma_set_rlimit_nofile (int nofiles)
 evma_send_file_data_to_connection
 *********************************/
 
-extern "C" int evma_send_file_data_to_connection (const char *binding, const char *filename)
+extern "C" int evma_send_file_data_to_connection (const unsigned long binding, const char *filename)
 {
 	/* This is a sugaring over send_data_to_connection that reads a file into a
 	 * locally-allocated buffer, and sends the file data to the remote peer.
@@ -592,7 +734,7 @@ extern "C" int evma_send_file_data_to_connection (const char *binding, const cha
 	 * Modified 25Jul07. This now returns -1 on file-too-large; 0 for success, and a positive
 	 * errno in case of other errors.
 	 *
-	/* Contributed by Kirk Haines.
+	 * Contributed by Kirk Haines.
 	 */
 
 	char data[32*1024];
@@ -613,12 +755,12 @@ extern "C" int evma_send_file_data_to_connection (const char *binding, const cha
 		return e;
 	}
 
-	int filesize = st.st_size;
+	off_t filesize = st.st_size;
 	if (filesize <= 0) {
 		close (Fd);
 		return 0;
 	}
-	else if (filesize > sizeof(data)) {
+	else if (filesize > (off_t) sizeof(data)) {
 		close (Fd);
 		return -1;
 	}
@@ -641,12 +783,12 @@ extern "C" int evma_send_file_data_to_connection (const char *binding, const cha
 evma_start_proxy
 *****************/
 
-extern "C" void evma_start_proxy (const char *from, const char *to)
+extern "C" void evma_start_proxy (const unsigned long from, const unsigned long to, const unsigned long bufsize)
 {
 	ensure_eventmachine("evma_start_proxy");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));
 	if (ed)
-		ed->StartProxy(to);
+		ed->StartProxy(to, bufsize);
 }
 
 
@@ -654,7 +796,7 @@ extern "C" void evma_start_proxy (const char *from, const char *to)
 evma_stop_proxy
 ****************/
 
-extern "C" void evma_stop_proxy (const char *from)
+extern "C" void evma_stop_proxy (const unsigned long from)
 {
 	ensure_eventmachine("evma_stop_proxy");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));