eventmachine 0.8.0 → 0.8.1

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-# $Id: extconf.rb 385 2007-06-16 11:38:59Z blackhedd $
+# $Id: extconf.rb 404 2007-07-13 01:07:28Z blackhedd $
 #
 #----------------------------------------------------------------------------
 #
@@ -71,6 +71,12 @@ when /solaris/
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 
+  # Patch by Tim Pease, fixes SUNWspro compile problems.
+  if CONFIG['CC'] == 'cc'
+    $CFLAGS = CONFIG['CFLAGS'] = "-g -O2 -fPIC"
+    CONFIG['CCDLFLAGS'] = "-fPIC"
+  end
+
 when /darwin/
   flags << '-DOS_UNIX'
   flags << '-DBUILD_FOR_RUBY'

data/ext/project.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: project.h 401 2007-07-11 12:54:06Z blackhedd $
+$Id: project.h 490 2007-07-30 12:51:33Z blackhedd $
 
 File:     project.h
 Date:     06Apr06
@@ -39,7 +39,10 @@ See the file COPYING for complete licensing information.
 #ifdef OS_UNIX
 #include <signal.h>
 #include <netdb.h>
+#include <time.h>
+#include <sys/time.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/resource.h>
@@ -62,8 +65,10 @@ typedef int SOCKET;
 #ifndef AF_LOCAL
 #define AF_LOCAL AF_UNIX
 #endif
-// The ff is superfluous on Solaris > 7. Thanks to Brett Eisenberg.
-//#define INADDR_NONE ((unsigned long)-1)
+// INADDR_NONE is undefined on Solaris < 8. Thanks to Brett Eisenberg and Tim Pease.
+#ifndef INADDR_NONE
+#define INADDR_NONE ((unsigned long)-1)
+#endif
 #endif
 #endif
 
@@ -100,6 +105,7 @@ using namespace std;
 #include "page.h"
 #include "ssl.h"
 #include "eventmachine.h"
+#include "eventmachine_cpp.h"
 
 
 

data/ext/rubymain.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: rubymain.cpp 377 2007-06-13 01:05:56Z blackhedd $
+$Id: rubymain.cpp 476 2007-07-27 03:32:51Z blackhedd $
 
 File:     rubymain.cpp
 Date:     06Apr06
@@ -92,6 +92,16 @@ static VALUE t_start_server (VALUE self, VALUE server, VALUE port)
 	return rb_str_new2 (f);
 }
 
+/*************
+t_stop_server
+*************/
+
+static VALUE t_stop_server (VALUE self, VALUE signature)
+{
+	evma_stop_tcp_server (StringValuePtr (signature));
+	return Qnil;
+}
+
 
 /*******************
 t_start_unix_server
@@ -363,6 +373,37 @@ static VALUE t__epoll (VALUE self)
 }
 
 
+/****************
+t_send_file_data
+****************/
+
+static VALUE t_send_file_data (VALUE self, VALUE signature, VALUE filename)
+{
+
+	/* The current implementation of evma_send_file_data_to_connection enforces a strict
+	 * upper limit on the file size it will transmit (currently 32K). The function returns
+	 * zero on success, -1 if the requested file exceeds its size limit, and a positive
+	 * number for other errors.
+	 * TODO: Positive return values are actually errno's, which is probably the wrong way to
+	 * do this. For one thing it's ugly. For another, we can't be sure zero is never a real errno.
+	 */
+
+	int b = evma_send_file_data_to_connection (StringValuePtr(signature), StringValuePtr(filename));
+	if (b == -1)
+		rb_raise(rb_eRuntimeError, "File too large.  send_file_data() supports files under 32k.");
+	if (b > 0) {
+		char *err = strerror (b);
+		char buf[1024];
+		memset (buf, 0, sizeof(buf));
+		snprintf (buf, sizeof(buf)-1, ": %s %s", StringValuePtr(filename),(err?err:"???"));
+
+		rb_raise (rb_eIOError, buf);
+	}
+
+	return INT2NUM (0);
+}
+
+
 /*******************
 t_set_rlimit_nofile
 *******************/
@@ -409,6 +450,7 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "run_machine_without_threads", (VALUE(*)(...))t_run_machine_without_threads, 0);
 	rb_define_module_function (EmModule, "add_oneshot_timer", (VALUE(*)(...))t_add_oneshot_timer, 1);
 	rb_define_module_function (EmModule, "start_tcp_server", (VALUE(*)(...))t_start_server, 2);
+	rb_define_module_function (EmModule, "stop_tcp_server", (VALUE(*)(...))t_stop_server, 1);
 	rb_define_module_function (EmModule, "start_unix_server", (VALUE(*)(...))t_start_unix_server, 1);
 	rb_define_module_function (EmModule, "start_tls", (VALUE(*)(...))t_start_tls, 1);
 	rb_define_module_function (EmModule, "send_data", (VALUE(*)(...))t_send_data, 3);
@@ -424,6 +466,7 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "set_timer_quantum", (VALUE(*)(...))t_set_timer_quantum, 1);
 	rb_define_module_function (EmModule, "setuid_string", (VALUE(*)(...))t_setuid_string, 1);
 	rb_define_module_function (EmModule, "invoke_popen", (VALUE(*)(...))t_invoke_popen, 1);
+	rb_define_module_function (EmModule, "send_file_data", (VALUE(*)(...))t_send_file_data, 2);
 
 	// Provisional:
 	rb_define_module_function (EmModule, "_write_file", (VALUE(*)(...))t__write_file, 1);

data/lib/em/deferrable.rb

@@ -1,4 +1,4 @@
-# $Id: deferrable.rb 320 2007-05-22 22:12:59Z blackhedd $
+# $Id: deferrable.rb 464 2007-07-22 12:56:27Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -34,7 +34,7 @@ module Deferrable
       block.call(*@deferred_args)
     else
       @callbacks ||= []
-      @callbacks << block
+      @callbacks.unshift block # << block
     end
   end
 
@@ -44,7 +44,7 @@ module Deferrable
       block.call(*@deferred_args)
     else
       @errbacks ||= []
-      @errbacks << block
+      @errbacks.unshift block # << block
     end
   end
 
@@ -66,19 +66,23 @@ module Deferrable
   # means that a callback can call #set_deferred_status and change the parameters
   # that will be sent to subsequent callbacks down the chain.
   #
+  # Changed @callbacks and @errbacks from push/shift to unshift/pop, per suggestion
+  # by Kirk Haines, to work around the memory leak bug that still exists in many Ruby
+  # versions.
+  #
   def set_deferred_status arg, *args
     @deferred_status = arg
     @deferred_args = args
     case @deferred_status
     when :succeeded
       if @callbacks
-        while cb = @callbacks.shift
+        while cb = @callbacks.pop #shift
           cb.call(*@deferred_args)
         end
       end
     when :failed
       if @errbacks
-        while eb = @errbacks.shift
+        while eb = @errbacks.pop #shift
           eb.call(*@deferred_args)
         end
       end
@@ -97,6 +101,27 @@ module Deferrable
 	  set_deferred_status :failed, *args
   end
 
+  # And still more sugar
+  #
+  def succeed *args
+	  set_deferred_success *args
+  end
+
+  # Can't get enough sugar
+  #
+  def fail *args
+	  set_deferred_failure *args
+  end
 end
+
+
+# DefaultDeferrable is an otherwise empty class that includes Deferrable.
+# This is very useful when you just need to return a Deferrable object
+# as a way of communicating deferred status to some other part of a program.
+#
+class DefaultDeferrable
+	include Deferrable
+end
+
 end
 

data/lib/em/streamer.rb

@@ -0,0 +1,114 @@
+# $Id: streamer.rb 476 2007-07-27 03:32:51Z blackhedd $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 16 Jul 2006
+# 
+# See EventMachine and EventMachine::Connection for documentation and
+# usage examples.
+#
+#----------------------------------------------------------------------------
+#
+# 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.
+#
+#---------------------------------------------------------------------------
+#
+# 
+
+
+module EventMachine
+	class FileStreamer
+		MappingThreshold = 16384
+		BackpressureLevel = 50000
+		ChunkSize = 16384
+
+		include Deferrable
+		def initialize connection, filename, args
+			@connection = connection
+			@http_chunks = args[:http_chunks]
+
+			if File.exist?(filename)
+				@size = File.size?(filename)
+				if @size <= MappingThreshold
+					stream_without_mapping filename
+				else
+					stream_with_mapping filename
+				end
+			else
+				fail "file not found"
+			end
+		end
+
+		def stream_without_mapping filename
+			if @http_chunks
+				#@connection.send_data "#{format("%x",@size)}\r\n"
+				@connection.send_data "#{@size.to_s(16)}\r\n"
+				@connection.send_file_data filename
+				@connection.send_data "\r\n0\r\n\r\n"
+			else
+				@connection.send_file_data filename
+			end
+			succeed
+		end
+		private :stream_without_mapping
+
+		def stream_with_mapping filename
+			ensure_mapping_extension_is_present
+
+			@position = 0
+			@mapping = EventMachine::FastFileReader::Mapper.new filename
+			stream_one_chunk
+		end
+		private :stream_with_mapping
+
+		def stream_one_chunk
+			loop {
+				if @position < @size
+					if @connection.get_outbound_data_size > BackpressureLevel
+						EventMachine::next_tick {stream_one_chunk}
+						break
+					else
+						len = @size - @position
+						len = ChunkSize if (len > ChunkSize)
+
+						#@connection.send_data( "#{format("%x",len)}\r\n" ) if @http_chunks
+						@connection.send_data( "#{len.to_s(16)}\r\n" ) if @http_chunks
+						@connection.send_data( @mapping.get_chunk( @position, len ))
+						@connection.send_data("\r\n") if @http_chunks
+
+						@position += len
+					end
+				else
+					@connection.send_data "0\r\n\r\n" if @http_chunks
+					@mapping.close
+					succeed
+					break
+				end
+			}
+		end
+
+		#--
+		# We use an outboard extension class to get memory-mapped files.
+		# It's outboard to avoid polluting the core distro, but that means
+		# there's a "hidden" dependency on it. The first time we get here in
+		# any run, try to load up the dependency extension. User code will see
+		# a LoadError if it's not available, but code that doesn't require
+		# mapped files will work fine without it. This is a somewhat difficult
+		# compromise between usability and proper modularization.
+		#
+		def ensure_mapping_extension_is_present
+			@@fastfilereader ||= (require 'fastfilereaderext')
+		end
+		private :ensure_mapping_extension_is_present
+
+	end
+end
+

data/lib/eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine.rb 393 2007-07-06 06:51:47Z blackhedd $
+# $Id: eventmachine.rb 489 2007-07-30 05:10:15Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -50,7 +50,14 @@ else
   end
 end
 =end
-require 'rubyeventmachine'
+
+
+if RUBY_PLATFORM =~ /java/
+	require 'java'
+	require 'jeventmachine'
+else
+	require 'rubyeventmachine'
+end
 
 
 require "eventmachine_version"
@@ -58,6 +65,7 @@ require 'em/deferrable'
 require 'em/future'
 require 'em/eventable'
 require 'em/messages'
+require 'em/streamer'
 
 require 'shellwords'
 
@@ -467,9 +475,19 @@ module EventMachine
 
     s = start_tcp_server server, port
     @acceptors[s] = [klass,block]
+    s
   end
 
 
+  # Stop a TCP server socket that was started with EventMachine#start_server.
+  #--
+  # Requested by Kirk Haines. TODO, this isn't OOP enough. We ought somehow
+  # to have #start_server return an object that has a close or a stop method on it.
+  #
+  def EventMachine::stop_server signature
+	  EventMachine::stop_tcp_server signature
+  end
+
   def EventMachine::start_unix_domain_server filename, handler=nil, &block
     klass = if (handler and handler.is_a?(Class))
       handler
@@ -1226,6 +1244,34 @@ class Connection
 	end
 
 
+	# Like EventMachine::Connection#send_data, this sends data to the remote end of
+	# the network connection.  EventMachine::Connection@send_file_data takes a
+	# filename as an argument, though, and sends the contents of the file, in one
+	# chunk. Contributed by Kirk Haines.
+	#
+	def send_file_data filename
+		EventMachine::send_file_data @signature, filename
+	end
+
+	# Open a file on the filesystem and send it to the remote peer. This returns an
+	# object of type EventMachine::Deferrable. The object's callbacks will be executed
+	# on the reactor main thread when the file has been completely scheduled for
+	# transmission to the remote peer. Its errbacks will be called in case of an error
+	# (such as file-not-found). #stream_file_data employs various strategems to achieve
+	# the fastest possible performance, balanced against minimum consumption of memory.
+	#
+	# You can control the behavior of #stream_file_data with the optional arguments parameter.
+	# Currently-supported arguments are:
+	# :http_chunks, a boolean flag which defaults false. If true, this flag streams the
+	# file data in a format compatible with the HTTP chunked-transfer encoding.
+	#
+	# Warning: this feature has an implicit dependency on an outboard extension,
+	# evma_fastfilereader. You must install this extension in order to use #stream_file_data
+	# with files larger than a certain size (currently 8192 bytes).
+	#
+	def stream_file_data filename, args={}
+		EventMachine::FileStreamer.new( self, filename, args )
+	end
 
 
 	# TODO, document this
@@ -1284,4 +1330,6 @@ require 'protocols/tcptest'
 require 'protocols/httpclient'
 require 'protocols/line_and_text'
 require 'protocols/header_and_content'
+require 'protocols/linetext2'
+require 'protocols/stomp'
 

data/lib/eventmachine_version.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine_version.rb 389 2007-06-25 02:07:04Z blackhedd $
+# $Id: eventmachine_version.rb 482 2007-07-28 19:11:03Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -25,7 +25,7 @@
 
 module EventMachine
 
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 
 end
 

data/lib/jeventmachine.rb

@@ -0,0 +1,106 @@
+# $Id: jeventmachine.rb 451 2007-07-21 13:34:28Z blackhedd $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 8 Apr 2006
+# 
+# See EventMachine and EventMachine::Connection for documentation and
+# usage examples.
+#
+#----------------------------------------------------------------------------
+#
+# 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.
+#
+#---------------------------------------------------------------------------
+#
+# 
+
+
+# This module provides "glue" for the Java version of the EventMachine reactor core.
+# For C++ EventMachines, the analogous functionality is found in ext/rubymain.cpp,
+# which is a garden-variety Ruby-extension glue module.
+
+
+require 'em_reactor'
+
+module EventMachine
+	# TODO: These event numbers are defined in way too many places.
+	# DRY them up.
+	TimerFired = 100
+	ConnectionData = 101
+	ConnectionUnbound = 102
+	ConnectionAccepted = 103
+	ConnectionCompleted = 104
+	LoopbreakSignalled = 105
+
+	class EM < com.rubyeventmachine.EmReactor
+		def eventCallback a1, a2, a3
+			s = String.from_java_bytes(a3.array[a3.position...a3.limit])
+			EventMachine::event_callback a1, a2, s
+		end
+	end
+	def self.initialize_event_machine
+		@em = EM.new
+	end
+	def self.release_machine
+		@em = nil
+	end
+	def self.add_oneshot_timer interval
+		@em.installOneshotTimer interval
+	end
+	def self.run_machine
+		@em.run
+	end
+	def self.stop
+		@em.stop
+	end
+	def self.start_tcp_server server, port
+		@em.startTcpServer server, port
+	end
+	def self.stop_tcp_server sig
+		@em.stopTcpServer sig
+	end
+	def self.send_data sig, data, length
+		@em.sendData sig, data, length
+	end
+	def self.send_datagram sig, data, length, address, port
+		@em.sendDatagram sig, data, length, address, port
+	end
+	def self.connect_server server, port
+		@em.connectTcpServer server, port
+	end
+	def self.close_connection sig, after_writing
+		@em.closeConnection sig, after_writing
+	end
+	def self.start_tls sig
+		@em.startTls sig
+	end
+	def self.signal_loopbreak
+		@em.signalLoopbreak
+	end
+	def self.set_timer_quantum q
+		@em.setTimerQuantum q
+	end
+	def self.epoll
+		# Epoll is a no-op for Java.
+		# The latest Java versions run epoll when possible in NIO.
+	end
+	def self.set_rlimit_nofile n_descriptors
+		# Currently a no-op for Java.
+	end
+	def self.open_udp_socket server, port
+		@em.openUdpSocket server, port
+	end
+	def self.library_type
+		:java
+	end
+end
+