eventmachine 1.0.0.beta.2-java → 1.0.0.beta.3-java

data/.yardopts

@@ -0,0 +1,3 @@
+--exclude jeventmachine --exclude pure_ruby
+-
+docs/DEFERRABLES docs/EPOLL docs/KEYBOARD

data/Gemfile

@@ -1 +1,2 @@
+source :rubygems
 gemspec

data/eventmachine.gemspec

@@ -2,8 +2,6 @@
 require File.expand_path('../lib/em/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.date = "2010-11-13"
-
   s.name = 'eventmachine'
   s.version = EventMachine::VERSION
   s.homepage = 'http://rubyeventmachine.com'
@@ -15,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
 
-  s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'rake-compiler', '0.7.6'
 
   s.summary = 'Ruby/EventMachine library'
   s.description = "EventMachine implements a fast, single-threaded engine for arbitrary network

data/ext/cmain.cpp

@@ -464,12 +464,12 @@ extern "C" void evma_accept_ssl_peer (const unsigned long binding)
 evma_get_peername
 *****************/
 
-extern "C" int evma_get_peername (const unsigned long binding, struct sockaddr *sa)
+extern "C" int evma_get_peername (const unsigned long binding, struct sockaddr *sa, socklen_t *len)
 {
 	ensure_eventmachine("evma_get_peername");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (ed) {
-		return ed->GetPeername (sa) ? 1 : 0;
+		return ed->GetPeername (sa, len) ? 1 : 0;
 	}
 	else
 		return 0;
@@ -479,12 +479,12 @@ extern "C" int evma_get_peername (const unsigned long binding, struct sockaddr *
 evma_get_sockname
 *****************/
 
-extern "C" int evma_get_sockname (const unsigned long binding, struct sockaddr *sa)
+extern "C" int evma_get_sockname (const unsigned long binding, struct sockaddr *sa, socklen_t *len)
 {
 	ensure_eventmachine("evma_get_sockname");
 	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
 	if (ed) {
-		return ed->GetSockname (sa) ? 1 : 0;
+		return ed->GetSockname (sa, len) ? 1 : 0;
 	}
 	else
 		return 0;

data/ext/ed.cpp

@@ -54,6 +54,7 @@ EventableDescriptor::EventableDescriptor (int sd, EventMachine_t *em):
 	bCloseNow (false),
 	bCloseAfterWriting (false),
 	MySocket (sd),
+	bWatchOnly (false),
 	EventCallback (NULL),
 	bCallbackUnbind (true),
 	UnbindReasonCode (0),
@@ -135,7 +136,7 @@ EventableDescriptor::Close
 void EventableDescriptor::Close()
 {
 	// Close the socket right now. Intended for emergencies.
-	if (MySocket != INVALID_SOCKET) {
+	if (MySocket != INVALID_SOCKET && !bWatchOnly) {
 		shutdown (MySocket, 1);
 		close (MySocket);
 		MySocket = INVALID_SOCKET;
@@ -298,7 +299,7 @@ uint64_t EventableDescriptor::GetNextHeartbeat()
 	NextHeartbeat = 0;
 
 	if (!ShouldDelete()) {
-		uint64_t time_til_next = GetCommInactivityTimeout() * 1000;
+		uint64_t time_til_next = InactivityTimeout;
 		if (IsConnectPending()) {
 			if (time_til_next == 0 || PendingConnectTimeout < time_til_next)
 				time_til_next = PendingConnectTimeout;
@@ -322,7 +323,6 @@ ConnectionDescriptor::ConnectionDescriptor (int sd, EventMachine_t *em):
 	bConnectPending (false),
 	bNotifyReadable (false),
 	bNotifyWritable (false),
-	bWatchOnly (false),
 	bReadAttemptedAfterClose (false),
 	bWriteAttemptedAfterClose (false),
 	OutboundDataSize (0),
@@ -1393,12 +1393,11 @@ void AcceptorDescriptor::Heartbeat()
 AcceptorDescriptor::GetSockname
 *******************************/
 
-bool AcceptorDescriptor::GetSockname (struct sockaddr *s)
+bool AcceptorDescriptor::GetSockname (struct sockaddr *s, socklen_t *len)
 {
 	bool ok = false;
 	if (s) {
-		socklen_t len = sizeof(*s);
-		int gp = getsockname (GetSocket(), s, &len);
+		int gp = getsockname (GetSocket(), s, len);
 		if (gp == 0)
 			ok = true;
 	}
@@ -1716,12 +1715,11 @@ int DatagramDescriptor::SendOutboundDatagram (const char *data, int length, cons
 ConnectionDescriptor::GetPeername
 *********************************/
 
-bool ConnectionDescriptor::GetPeername (struct sockaddr *s)
+bool ConnectionDescriptor::GetPeername (struct sockaddr *s, socklen_t *len)
 {
 	bool ok = false;
 	if (s) {
-		socklen_t len = sizeof(*s);
-		int gp = getpeername (GetSocket(), s, &len);
+		int gp = getpeername (GetSocket(), s, len);
 		if (gp == 0)
 			ok = true;
 	}
@@ -1732,12 +1730,11 @@ bool ConnectionDescriptor::GetPeername (struct sockaddr *s)
 ConnectionDescriptor::GetSockname
 *********************************/
 
-bool ConnectionDescriptor::GetSockname (struct sockaddr *s)
+bool ConnectionDescriptor::GetSockname (struct sockaddr *s, socklen_t *len)
 {
 	bool ok = false;
 	if (s) {
-		socklen_t len = sizeof(*s);
-		int gp = getsockname (GetSocket(), s, &len);
+		int gp = getsockname (GetSocket(), s, len);
 		if (gp == 0)
 			ok = true;
 	}
@@ -1770,10 +1767,11 @@ int ConnectionDescriptor::SetCommInactivityTimeout (uint64_t value)
 DatagramDescriptor::GetPeername
 *******************************/
 
-bool DatagramDescriptor::GetPeername (struct sockaddr *s)
+bool DatagramDescriptor::GetPeername (struct sockaddr *s, socklen_t *len)
 {
 	bool ok = false;
 	if (s) {
+		*len = sizeof(struct sockaddr);
 		memset (s, 0, sizeof(struct sockaddr));
 		memcpy (s, &ReturnAddress, sizeof(ReturnAddress));
 		ok = true;
@@ -1785,12 +1783,11 @@ bool DatagramDescriptor::GetPeername (struct sockaddr *s)
 DatagramDescriptor::GetSockname
 *******************************/
 
-bool DatagramDescriptor::GetSockname (struct sockaddr *s)
+bool DatagramDescriptor::GetSockname (struct sockaddr *s, socklen_t *len)
 {
 	bool ok = false;
 	if (s) {
-		socklen_t len = sizeof(*s);
-		int gp = getsockname (GetSocket(), s, &len);
+		int gp = getsockname (GetSocket(), s, len);
 		if (gp == 0)
 			ok = true;
 	}

data/ext/ed.h

@@ -56,7 +56,7 @@ class EventableDescriptor: public Bindable_t
 		bool ShouldDelete();
 		// Do we have any data to write? This is used by ShouldDelete.
 		virtual int GetOutboundDataSize() {return 0;}
-		virtual bool IsWatchOnly(){ return false; }
+		virtual bool IsWatchOnly(){ return bWatchOnly; }
 
 		virtual void ScheduleClose (bool after_writing);
 		bool IsCloseScheduled();
@@ -64,8 +64,8 @@ class EventableDescriptor: public Bindable_t
 
 		void SetEventCallback (EMCallback);
 
-		virtual bool GetPeername (struct sockaddr*) {return false;}
-		virtual bool GetSockname (struct sockaddr*) {return false;}
+		virtual bool GetPeername (struct sockaddr*, socklen_t*) {return false;}
+		virtual bool GetSockname (struct sockaddr*, socklen_t*) {return false;}
 		virtual bool GetSubprocessPid (pid_t*) {return false;}
 
 		virtual void StartTls() {}
@@ -102,6 +102,7 @@ class EventableDescriptor: public Bindable_t
 
 	protected:
 		int MySocket;
+		bool bWatchOnly;
 
 		EMCallback EventCallback;
 		void _GenericInboundDispatch(const char*, int);
@@ -174,7 +175,6 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		bool IsNotifyReadable(){ return bNotifyReadable; }
 		bool IsNotifyWritable(){ return bNotifyWritable; }
-		virtual bool IsWatchOnly(){ return bWatchOnly; }
 
 		virtual void Read();
 		virtual void Write();
@@ -197,8 +197,8 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		void SetServerMode() {bIsServer = true;}
 
-		virtual bool GetPeername (struct sockaddr*);
-		virtual bool GetSockname (struct sockaddr*);
+		virtual bool GetPeername (struct sockaddr*, socklen_t*);
+		virtual bool GetSockname (struct sockaddr*, socklen_t*);
 
 		virtual uint64_t GetCommInactivityTimeout();
 		virtual int SetCommInactivityTimeout (uint64_t value);
@@ -221,7 +221,6 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		bool bNotifyReadable;
 		bool bNotifyWritable;
-		bool bWatchOnly;
 
 		bool bReadAttemptedAfterClose;
 		bool bWriteAttemptedAfterClose;
@@ -279,8 +278,8 @@ class DatagramDescriptor: public EventableDescriptor
 		// Do we have any data to write? This is used by ShouldDelete.
 		virtual int GetOutboundDataSize() {return OutboundDataSize;}
 
-		virtual bool GetPeername (struct sockaddr*);
-		virtual bool GetSockname (struct sockaddr*);
+		virtual bool GetPeername (struct sockaddr*, socklen_t*);
+		virtual bool GetSockname (struct sockaddr*, socklen_t*);
 
 		virtual uint64_t GetCommInactivityTimeout();
 		virtual int SetCommInactivityTimeout (uint64_t value);
@@ -319,7 +318,7 @@ class AcceptorDescriptor: public EventableDescriptor
 		virtual bool SelectForRead() {return true;}
 		virtual bool SelectForWrite() {return false;}
 
-		virtual bool GetSockname (struct sockaddr*);
+		virtual bool GetSockname (struct sockaddr*, socklen_t*);
 
 		static void StopAcceptor (const unsigned long binding);
 };

data/ext/em.cpp

@@ -308,6 +308,10 @@ void EventMachine_t::_InitializeLoopBreaker()
 
 	LoopBreakerWriter = fd[1];
 	LoopBreakerReader = fd[0];
+
+	/* 16Jan11: Make sure the pipe is non-blocking, so more than 65k loopbreaks
+	 * in one tick do not fill up the pipe and block the process on write() */
+	SetSocketNonblocking (LoopBreakerWriter);
 	#endif
 
 	#ifdef OS_WIN32
@@ -351,6 +355,7 @@ EventMachine_t::GetRealTime
 uint64_t EventMachine_t::GetRealTime()
 {
 	uint64_t current_time;
+
 	#if defined(OS_UNIX)
 	struct timeval tv;
 	gettimeofday (&tv, NULL);
@@ -362,10 +367,12 @@ uint64_t EventMachine_t::GetRealTime()
 		TickCountTickover += 1;
 	LastTickCount = tick;
 	current_time = ((uint64_t)TickCountTickover << 32) + (uint64_t)tick;
+	current_time *= 1000; // convert to microseconds
 
 	#else
 	current_time = (uint64_t)time(NULL) * 1000000LL;
 	#endif
+
 	return current_time;
 }
 
@@ -578,6 +585,10 @@ bool EventMachine_t::_RunKqueueOnce()
 
 	timeval tv = _TimeTilNextEvent();
 
+	struct timespec ts;
+	ts.tv_sec = tv.tv_sec;
+	ts.tv_nsec = tv.tv_usec * 1000;
+
 	#ifdef BUILD_FOR_RUBY
 	int ret = 0;
 	fd_set fdreads;
@@ -594,12 +605,10 @@ bool EventMachine_t::_RunKqueueOnce()
 	}
 
 	TRAP_BEG;
-	k = kevent (kqfd, NULL, 0, Karray, MaxEvents, NULL);
+	ts.tv_sec = ts.tv_nsec = 0;
+	k = kevent (kqfd, NULL, 0, Karray, MaxEvents, &ts);
 	TRAP_END;
 	#else
-	struct timespec ts;
-	ts.tv_sec = tv.tv_sec;
-	ts.tv_nsec = tv.tv_usec * 1000;
 	k = kevent (kqfd, NULL, 0, Karray, MaxEvents, &ts);
 	#endif
 
@@ -1028,28 +1037,9 @@ const unsigned long EventMachine_t::InstallOneshotTimer (int milliseconds)
 {
 	if (Timers.size() > MaxOutstandingTimers)
 		return false;
-	// Don't use the global loop-time variable here, because we might
-	// get called before the main event machine is running.
 
-	// XXX This should be replaced with a call to _GetRealTime(), but I don't
-	// understand if this is a bug or not? For OS_UNIX we multiply the argument
-	// milliseconds by 1000, but for OS_WIN32 we do not? This needs to be sorted out.
-	#ifdef OS_UNIX
-	struct timeval tv;
-	gettimeofday (&tv, NULL);
-	uint64_t fire_at = (((uint64_t)(tv.tv_sec)) * 1000000LL) + ((uint64_t)(tv.tv_usec));
+	uint64_t fire_at = GetRealTime();
 	fire_at += ((uint64_t)milliseconds) * 1000LL;
-	#endif
-
-	#ifdef OS_WIN32
-	unsigned tick = GetTickCount();
-	if (tick < LastTickCount)
-		TickCountTickover += 1;
-	LastTickCount = tick;
-
-	uint64_t fire_at = ((uint64_t)TickCountTickover << 32) + (uint64_t)tick;
-	fire_at += (uint64_t)milliseconds;
-	#endif
 
 	Timer_t t;
 	#ifndef HAVE_MAKE_PAIR

data/ext/eventmachine.h

@@ -72,8 +72,8 @@ extern "C" {
 	void evma_accept_ssl_peer (const unsigned long binding);
 	#endif
 
-	int evma_get_peername (const unsigned long binding, struct sockaddr*);
-	int evma_get_sockname (const unsigned long binding, struct sockaddr*);
+	int evma_get_peername (const unsigned long binding, struct sockaddr*, socklen_t*);
+	int evma_get_sockname (const unsigned long binding, struct sockaddr*, socklen_t*);
 	int evma_get_subprocess_pid (const unsigned long binding, pid_t*);
 	int evma_get_subprocess_status (const unsigned long binding, int*);
 	int evma_get_connection_count();

data/ext/extconf.rb

@@ -154,4 +154,4 @@ add_define 'HAVE_MAKE_PAIR' if try_link(<<SRC, '-lstdc++')
 SRC
 TRY_LINK.sub!('$(CXX)', '$(CC)')
 
-create_makefile "rubyeventmachine"
+create_makefile "rubyeventmachine"

data/ext/rubymain.cpp

@@ -341,9 +341,10 @@ t_get_peername
 
 static VALUE t_get_peername (VALUE self, VALUE signature)
 {
-	struct sockaddr s;
-	if (evma_get_peername (NUM2ULONG (signature), &s)) {
-		return rb_str_new ((const char*)&s, sizeof(s));
+	char buf[1024];
+	socklen_t len = sizeof buf;
+	if (evma_get_peername (NUM2ULONG (signature), (struct sockaddr*)buf, &len)) {
+		return rb_str_new (buf, len);
 	}
 
 	return Qnil;
@@ -355,9 +356,10 @@ t_get_sockname
 
 static VALUE t_get_sockname (VALUE self, VALUE signature)
 {
-	struct sockaddr s;
-	if (evma_get_sockname (NUM2ULONG (signature), &s)) {
-		return rb_str_new ((const char*)&s, sizeof(s));
+	char buf[1024];
+	socklen_t len = sizeof buf;
+	if (evma_get_sockname (NUM2ULONG (signature), (struct sockaddr*)buf, &len)) {
+		return rb_str_new (buf, len);
 	}
 
 	return Qnil;

data/lib/em/connection.rb

@@ -405,7 +405,9 @@ module EventMachine
     #
     def send_datagram data, recipient_address, recipient_port
       data = data.to_s
-      EventMachine::send_datagram @signature, data, data.length, recipient_address, Integer(recipient_port)
+      size = data.bytesize if data.respond_to?(:bytesize)
+      size ||= data.size
+      EventMachine::send_datagram @signature, data, size, recipient_address, Integer(recipient_port)
     end
 
 

data/lib/em/pure_ruby.rb

@@ -34,7 +34,7 @@ require 'socket'
 require 'fcntl'
 require 'set'
 
-module EventMachine
+module EventMachine #:nodoc: all
   class << self
     # This is mostly useful for automated tests.
     # Return a distinctive symbol so the caller knows whether he's dealing
@@ -208,7 +208,7 @@ end
 
 #-----------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
 
   class Error < Exception; end
 
@@ -216,7 +216,7 @@ end
 
 #-----------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
   class Connection
     def get_outbound_data_size
       EventMachine::get_outbound_data_size @signature
@@ -226,7 +226,7 @@ end
 
 #-----------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
 
   # Factored out so we can substitute other implementations
   # here if desired, such as the one in ActiveRBAC.
@@ -243,7 +243,7 @@ end
 
 #-----------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
 
   TimerFired = 100
   ConnectionData = 101
@@ -256,7 +256,7 @@ end
 
 #-----------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
 class Reactor
   include Singleton
 
@@ -414,7 +414,7 @@ end
 
 #--------------------------------------------------------------
 
-class IO
+class IO #:nodoc: all
   extend Forwardable
   def_delegator :@my_selectable, :close_scheduled?
   def_delegator :@my_selectable, :select_for_reading?
@@ -433,7 +433,7 @@ end
 
 #--------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
   class Selectable
 
     attr_reader :io, :uuid
@@ -494,7 +494,7 @@ end
 #--------------------------------------------------------------
 
 
-module EventMachine
+module EventMachine #:nodoc: all
 
   class StreamObject < Selectable
     def initialize io
@@ -636,7 +636,7 @@ end
 
 
 
-module EventMachine
+module EventMachine #:nodoc: all
   class EvmaTCPClient < StreamObject
 
     def self.connect bind_addr, bind_port, host, port
@@ -687,7 +687,7 @@ end
 
 
 
-module EventMachine
+module EventMachine #:nodoc: all
   class EvmaKeyboard < StreamObject
 
     def self.open
@@ -717,7 +717,7 @@ end
 
 
 
-module EventMachine
+module EventMachine #:nodoc: all
   class EvmaUNIXClient < StreamObject
 
     def self.connect chain
@@ -765,7 +765,7 @@ end
 
 #--------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
   class EvmaTCPServer < Selectable
 
     # TODO, refactor and unify with EvmaUNIXServer.
@@ -820,7 +820,7 @@ end
 
 #--------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
   class EvmaUNIXServer < Selectable
 
     # TODO, refactor and unify with EvmaTCPServer.
@@ -876,7 +876,7 @@ end
 
 #--------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
   class LoopbreakReader < Selectable
 
     def select_for_reading?
@@ -894,7 +894,7 @@ end
 #--------------------------------------------------------------
 
 
-module EventMachine
+module EventMachine #:nodoc: all
 
   class DatagramObject < Selectable
     def initialize io
@@ -941,7 +941,7 @@ end
 
 #--------------------------------------------------------------
 
-module EventMachine
+module EventMachine #:nodoc: all
   class EvmaUDPSocket < DatagramObject
 
     class << self