eventmachine 0.5.1 → 0.5.2

data/README

@@ -1,13 +1,14 @@
-$Id: README 2279 2006-04-13 01:31:36Z francis $
+$Id: README 2484 2006-05-12 16:55:59Z francis $
 
-Preliminary README for RUBY/EventMachine
+= RUBY/EventMachine
 
-Author:: blackhedd (gmail address: garbagecat20).
-Date:: 8 Apr 2006
+Homepage::  http://rubyeventmachine.com
+Copyright:: (C) 2006 by Francis Cianfrocca. All Rights Reserved.
+Email:: gmail address: garbagecat10
 
- Copyright (C) 2006 by Francis Cianfrocca
- All Rights Reserved
- This program is made available under the terms of the GPL version 2
+This program is made available under the terms of the Lesser-GPL version 2.
+See EventMachine and EventMachine::Connection for documentation and
+usage examples.
 
 EventMachine implements a fast, single-threaded engine for arbitrary network
 communications. It's extremely easy to use in Ruby. EventMachine wraps all
@@ -50,7 +51,7 @@ for Linux will use <tt>epoll(4)</tt> and will thus require a Linux 2.6 kernel.
 Here's a fully-functional echo server written with EventMachine:
 
       require 'rubygems'
-      require_gem 'eventmachine'
+      require 'eventmachine'
 
       module EchoServer
         def receive_data data
@@ -63,7 +64,5 @@ Here's a fully-functional echo server written with EventMachine:
         EventMachine::start_server "192.168.0.100", 8081, EchoServer
       }
 
-EventMachine is licensed under GPL. We will be adding full support for
-SSL/TLS-encryption based on OpenSSL in the near future.
-
 
+# vim: sts=2 sw=2 ts=4 et ai tw=77

data/RELEASE_NOTES

@@ -1,7 +1,15 @@
-$Id: RELEASE_NOTES 2459 2006-05-05 17:11:04Z francis $
+$Id: RELEASE_NOTES 2477 2006-05-11 13:22:39Z francis $
 
 RUBY/EventMachine RELEASE NOTES
 
+--------------------------------------------------
+Version: 0.5.2, released 05May06
+Made several nonvisible improvements to the Windows
+implementation.
+Added an exception-handling patch contributed by Jeff Rose, jeff@rosejn.net.
+Added a dir-config patch contributed anonymously.
+Supported builds on Solaris.
+
 --------------------------------------------------
 Version: 0.5.1, released 05May06
 Made it possible to pass a Class rather than a Module

data/ext/ed.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.cpp 2457 2006-05-05 14:57:21Z francis $
+$Id: ed.cpp 2491 2006-05-12 20:24:19Z francis $
 
 File:     ed.cpp
 Date:     06Apr06
@@ -162,7 +162,9 @@ ConnectionDescriptor::ConnectionDescriptor (int sd):
   EventableDescriptor (sd),
   bConnectPending (false),
   OutboundDataSize (0),
+	#ifdef WITH_SSL
 	SslBox (NULL),
+	#endif
 	bIsServer (false)
 {
 }
@@ -178,8 +180,10 @@ ConnectionDescriptor::~ConnectionDescriptor()
 	for (size_t i=0; i < OutboundPages.size(); i++)
 		OutboundPages[i].Free();
 
+	#ifdef WITH_SSL
 	if (SslBox)
 		delete SslBox;
+	#endif
 }
 
 
@@ -220,6 +224,7 @@ ConnectionDescriptor::SendOutboundData
 
 int ConnectionDescriptor::SendOutboundData (const char *data, int length)
 {
+	#ifdef WITH_SSL
 	if (SslBox) {
 		if (length > 0) {
 			int w = SslBox->PutPlaintext (data, length);
@@ -232,6 +237,7 @@ int ConnectionDescriptor::SendOutboundData (const char *data, int length)
 		return 1; // That's a wild guess, almost certainly wrong.
 	}
 	else
+	#endif
 		return _SendRawOutboundData (data, length);
 }
 
@@ -382,6 +388,7 @@ ConnectionDescriptor::_DispatchInboundData
 
 void ConnectionDescriptor::_DispatchInboundData (const char *buffer, int size)
 {
+	#ifdef WITH_SSL
 	if (SslBox) {
 		SslBox->PutCiphertext (buffer, size);
 
@@ -399,6 +406,12 @@ void ConnectionDescriptor::_DispatchInboundData (const char *buffer, int size)
 			if (EventCallback)
 				(*EventCallback)(GetBinding().c_str(), EventMachine_t::CONNECTION_READ, buffer, size);
 	}
+	#endif
+
+	#ifdef WITHOUT_SSL
+	if (EventCallback)
+		(*EventCallback)(GetBinding().c_str(), EventMachine_t::CONNECTION_READ, buffer, size);
+	#endif
 }
 
 
@@ -519,11 +532,17 @@ ConnectionDescriptor::StartTls
 
 void ConnectionDescriptor::StartTls()
 {
+	#ifdef WITH_SSL
 	if (SslBox)
 		throw std::runtime_error ("SSL/TLS already running on connection");
 
 	SslBox = new SslBox_t (bIsServer);
 	_DispatchCiphertext();
+	#endif
+
+	#ifdef WITHOUT_SSL
+	throw std::runtime_error ("Encryption not available on this event-machine");
+	#endif
 }
 
 
@@ -531,7 +550,7 @@ void ConnectionDescriptor::StartTls()
 /*****************************************
 ConnectionDescriptor::_DispatchCiphertext
 *****************************************/
-
+#ifdef WITH_SSL
 void ConnectionDescriptor::_DispatchCiphertext()
 {
 	assert (SslBox);
@@ -588,7 +607,7 @@ void ConnectionDescriptor::_DispatchCiphertext()
 	} while (did_work);
 
 }
-
+#endif
 
 
 
@@ -683,7 +702,7 @@ void AcceptorDescriptor::Read()
 
 		// Disable slow-start (Nagle algorithm). Eventually make this configurable.
 		int one = 1;
-		setsockopt (sd, IPPROTO_TCP, TCP_NODELAY, (const char*) &one, sizeof(one));
+		setsockopt (sd, IPPROTO_TCP, TCP_NODELAY, (char*) &one, sizeof(one));
 
 
 		ConnectionDescriptor *cd = new ConnectionDescriptor (sd);
@@ -838,7 +857,8 @@ void DatagramDescriptor::Write()
 			break;
 		OutboundPage *op = &(OutboundPages[0]);
 
-		int s = sendto (sd, op->Buffer, op->Length, 0, (struct sockaddr*)&(op->From), sizeof(op->From));
+		// The nasty cast to (char*) is needed because Windows is brain-dead.
+		int s = sendto (sd, (char*)op->Buffer, op->Length, 0, (struct sockaddr*)&(op->From), sizeof(op->From));
 		int e = errno;
 
 		OutboundDataSize -= op->Length;
@@ -916,7 +936,8 @@ int DatagramDescriptor::SendOutboundDatagram (const char *data, int length, cons
 
 	HostAddr = inet_addr (address);
 	if (HostAddr == INADDR_NONE) {
-		hostent *hp = gethostbyname (address);
+		// The nasty cast to (char*) is because Windows is brain-dead.
+		hostent *hp = gethostbyname ((char*)address);
 		if (!hp)
 			return 0;
 		HostAddr = ((in_addr*)(hp->h_addr))->s_addr;

data/ext/ed.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ed.h 2445 2006-05-04 21:05:44Z francis $
+$Id: ed.h 2473 2006-05-11 06:37:31Z francis $
 
 File:     ed.h
 Date:     06Apr06
@@ -29,8 +29,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 class EventMachine_t; // forward reference
+#ifdef WITH_SSL
 class SslBox_t; // forward reference
-
+#endif
 
 bool SetSocketNonblocking (SOCKET);
 
@@ -131,7 +132,9 @@ class ConnectionDescriptor: public EventableDescriptor
 		deque<OutboundPage> OutboundPages;
 		int OutboundDataSize;
 
+		#ifdef WITH_SSL
 		SslBox_t *SslBox;
+		#endif
 		bool bIsServer;
 
 	private:

data/ext/em.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.cpp 2457 2006-05-05 14:57:21Z francis $
+$Id: em.cpp 2491 2006-05-12 20:24:19Z francis $
 
 File:     ed.cpp
 Date:     06Apr06
@@ -24,6 +24,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 *****************************************************************************/
 
+// THIS ENTIRE FILE WILL EVENTUALLY BE FOR UNIX BUILDS ONLY.
+//#ifdef OS_UNIX
+
+
 #include "project.h"
 
 // Keep a global variable floating around
@@ -83,6 +87,8 @@ EventMachine_t::Run
 void EventMachine_t::Run()
 {
 	#ifdef OS_WIN32
+	WSADATA w;
+	WSAStartup (MAKEWORD (1, 1), &w);
 	HookControlC (true);
 	#endif
 
@@ -121,7 +127,7 @@ bool EventMachine_t::_RunOnce()
 	if (Descriptors.size() == 0) {
 		#ifdef OS_UNIX
 		timeval tv = {0, 200 * 1000};
-		select (0, NULL, NULL, NULL, &tv);
+		EmSelect (0, NULL, NULL, NULL, &tv);
 		#endif
 		#ifdef OS_WIN32
 		Sleep (200);
@@ -155,7 +161,7 @@ bool EventMachine_t::_RunOnce()
 
 	{ // read and write the sockets
 		timeval tv = {1, 0}; // Solaris fails if the microseconds member is >= 1000000.
-		int s = select (maxsocket+1, &fdreads, &fdwrites, NULL, &tv);
+		int s = EmSelect (maxsocket+1, &fdreads, &fdwrites, NULL, &tv);
 		if (s > 0) {
 			for (i=0; i < Descriptors.size(); i++) {
 				EventableDescriptor *ed = Descriptors[i];
@@ -175,7 +181,7 @@ bool EventMachine_t::_RunOnce()
 			// If the error was EINTR, we probaby caught SIGCHLD or something,
 			// so keep the wait short.
 			timeval tv = {0, ((errno == EINTR) ? 5 : 50) * 1000};
-			select (0, NULL, NULL, NULL, &tv);
+			EmSelect (0, NULL, NULL, NULL, &tv);
 		}
 	}
 
@@ -295,7 +301,7 @@ const char *EventMachine_t::ConnectToServer (const char *server, int port)
 
 	HostAddr = inet_addr (server);
 	if (HostAddr == INADDR_NONE) {
-		hostent *hp = gethostbyname (server);
+		hostent *hp = gethostbyname ((char*)server); // Windows requires (char*)
 		if (!hp)
 			return NULL;
 		HostAddr = ((in_addr*)(hp->h_addr))->s_addr;
@@ -416,7 +422,7 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 	if (server && *server) {
 		sin.sin_addr.s_addr = inet_addr (server);
 		if (sin.sin_addr.s_addr == INADDR_NONE) {
-			hostent *hp = gethostbyname (server);
+			hostent *hp = gethostbyname ((char*)server); // Windows requires the cast.
 			if (hp == NULL) {
 				//__warning ("hostname not resolved: ", server);
 				goto fail;
@@ -503,7 +509,7 @@ const char *EventMachine_t::OpenDatagramSocket (const char *address, int port)
 	if (address && *address) {
 		sin.sin_addr.s_addr = inet_addr (address);
 		if (sin.sin_addr.s_addr == INADDR_NONE) {
-			hostent *hp = gethostbyname (address);
+			hostent *hp = gethostbyname ((char*)address); // Windows requires the cast.
 			if (hp == NULL)
 				goto fail;
 			sin.sin_addr.s_addr = ((in_addr*)(hp->h_addr))->s_addr;
@@ -550,7 +556,7 @@ void EventMachine_t::Add (EventableDescriptor *ed)
 {
 	if (!ed)
 		throw std::runtime_error ("added bad descriptor");
-  ed->SetEventCallback (EventCallback);
+	ed->SetEventCallback (EventCallback);
 	NewDescriptors.push_back (ed);
 }
 
@@ -578,3 +584,5 @@ void EventMachine_t::_AddNewDescriptors()
 }
 
 
+//#endif // OS_UNIX
+

data/ext/em.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: em.h 2412 2006-04-29 01:18:59Z francis $
+$Id: em.h 2469 2006-05-10 18:11:10Z francis $
 
 File:     ed.h
 Date:     06Apr06
@@ -25,9 +25,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *****************************************************************************/
 
 
+
+#ifdef OS_WIN32
+#include "emwin.h"
+#endif
+
+
+// THIS ENTIRE FILE WILL EVENTUALLY BE FOR UNIX BUILDS ONLY.
+//#ifdef OS_UNIX
+
 #ifndef __EventMachine__H_
 #define __EventMachine__H_
 
+#ifdef BUILD_FOR_RUBY
+  #include <ruby.h>
+  #define EmSelect rb_thread_select
+#else
+  #define EmSelect select
+#endif
 
 extern time_t gCurrentLoopTime;
 
@@ -89,3 +104,4 @@ class EventMachine_t
 
 #endif // __EventMachine__H_
 
+//#endif // OS_UNIX

data/ext/emwin.cpp

@@ -0,0 +1,307 @@
+/*****************************************************************************
+
+$Id: em.cpp 2457 2006-05-05 14:57:21Z francis $
+
+File:     edwin.cpp
+Date:     05May06
+
+Copyright (C) 2006 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 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.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*****************************************************************************/
+
+
+// THIS ENTIRE FILE IS FOR WINDOWS BUILDS ONLY
+// INCOMPLETE AND DISABLED FOR NOW.
+#ifdef xOS_WIN32
+
+#include "project.h"
+
+
+// Keep a global variable floating around
+// with the current loop time as set by the Event Machine.
+// This avoids the need for frequent expensive calls to time(NULL);
+time_t gCurrentLoopTime;
+
+
+/******************************
+EventMachine_t::EventMachine_t
+******************************/
+
+EventMachine_t::EventMachine_t (void (*event_callback)(const char*, int, const char*, int)):
+	EventCallback (event_callback),
+	NextHeartbeatTime (0)
+{
+	gTerminateSignalReceived = false;
+	Iocp = NULL;
+}
+
+
+/*******************************
+EventMachine_t::~EventMachine_t
+*******************************/
+
+EventMachine_t::~EventMachine_t()
+{
+	cerr << "EM __dt\n";
+	if (Iocp)
+		CloseHandle (Iocp);
+}
+
+
+/****************************
+EventMachine_t::ScheduleHalt
+****************************/
+
+void EventMachine_t::ScheduleHalt()
+{
+  /* This is how we stop the machine.
+   * This can be called by clients. Signal handlers will probably
+   * set the global flag.
+   * For now this means there can only be one EventMachine ever running at a time.
+   */
+	gTerminateSignalReceived = true;
+}
+
+
+
+/*******************
+EventMachine_t::Run
+*******************/
+
+void EventMachine_t::Run()
+{
+	HookControlC (true);
+
+	Iocp = CreateIoCompletionPort (INVALID_HANDLE_VALUE, NULL, 0, 0);
+	if (Iocp == NULL)
+		throw std::runtime_error ("no completion port");
+
+
+	DWORD nBytes, nCompletionKey;
+	LPOVERLAPPED Overlapped;
+
+	do {
+		gCurrentLoopTime = time(NULL);
+		// Have some kind of strategy that will dequeue maybe up to 10 completions 
+		// without running the timers as long as they are available immediately.
+		// Otherwise in a busy server we're calling them every time through the loop.
+		if (!_RunTimers())
+			break;
+		if (GetQueuedCompletionStatus (Iocp, &nBytes, &nCompletionKey, &Overlapped, 1000)) {
+		}
+		cerr << "+";
+	} while (!gTerminateSignalReceived);
+
+
+	/*
+	while (true) {
+		gCurrentLoopTime = time(NULL);
+		if (!_RunTimers())
+			break;
+		_AddNewDescriptors();
+		if (!_RunOnce())
+			break;
+		if (gTerminateSignalReceived)
+			break;
+	}
+	*/
+
+	HookControlC (false);
+}
+
+
+/**************************
+EventMachine_t::_RunTimers
+**************************/
+
+bool EventMachine_t::_RunTimers()
+{
+	// These are caller-defined timer handlers.
+	// Return T/F to indicate whether we should continue the main loop.
+	// We rely on the fact that multimaps sort by their keys to avoid
+	// inspecting the whole list every time we come here.
+	// Just keep inspecting and processing the list head until we hit
+	// one that hasn't expired yet.
+
+	while (true) {
+		multimap<time_t,Timer_t>::iterator i = Timers.begin();
+		if (i == Timers.end())
+			break;
+		if (i->first > gCurrentLoopTime)
+			break;
+		if (EventCallback)
+			(*EventCallback) ("", TIMER_FIRED, i->second.GetBinding().c_str(), i->second.GetBinding().length());
+		Timers.erase (i);
+	}
+	return true;
+}
+
+
+/***********************************
+EventMachine_t::InstallOneshotTimer
+***********************************/
+
+const char *EventMachine_t::InstallOneshotTimer (int seconds)
+{
+	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.
+
+	Timer_t t;
+	Timers.insert (make_pair (time(NULL) + seconds, t));
+	return t.GetBinding().c_str();
+}
+
+
+/**********************************
+EventMachine_t::OpenDatagramSocket
+**********************************/
+
+const char *EventMachine_t::OpenDatagramSocket (const char *address, int port)
+{
+	cerr << "OPEN DATAGRAM SOCKET\n";
+	return "Unimplemented";
+}
+
+
+/*******************************
+EventMachine_t::CreateTcpServer
+*******************************/
+
+const char *EventMachine_t::CreateTcpServer (const char *server, int port)
+{
+	/* Create a TCP-acceptor (server) socket and add it to the event machine.
+	 * Return the binding of the new acceptor to the caller.
+	 * This binding will be referenced when the new acceptor sends events
+	 * to indicate accepted connections.
+	 */
+
+	const char *output_binding = NULL;
+
+	struct sockaddr_in sin;
+
+	SOCKET sd_accept = socket (AF_INET, SOCK_STREAM, 0);
+	if (sd_accept == INVALID_SOCKET) {
+		goto fail;
+	}
+
+	memset (&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_addr.s_addr = INADDR_ANY;
+	sin.sin_port = htons (port);
+
+	if (server && *server) {
+		sin.sin_addr.s_addr = inet_addr (server);
+		if (sin.sin_addr.s_addr == INADDR_NONE) {
+			hostent *hp = gethostbyname (server);
+			if (hp == NULL) {
+				//__warning ("hostname not resolved: ", server);
+				goto fail;
+			}
+			sin.sin_addr.s_addr = ((in_addr*)(hp->h_addr))->s_addr;
+		}
+	}
+
+
+	// No need to set reuseaddr on Windows.
+
+
+	if (bind (sd_accept, (struct sockaddr*)&sin, sizeof(sin))) {
+		//__warning ("binding failed");
+		goto fail;
+	}
+
+	if (listen (sd_accept, 100)) {
+		//__warning ("listen failed");
+		goto fail;
+	}
+
+	{ // Looking good.
+		AcceptorDescriptor *ad = new AcceptorDescriptor (this, sd_accept);
+		if (!ad)
+			throw std::runtime_error ("unable to allocate acceptor");
+		Add (ad);
+		output_binding = ad->GetBinding().c_str();
+
+		CreateIoCompletionPort ((HANDLE)sd_accept, Iocp, NULL, 0);
+		SOCKET sd = socket (AF_INET, SOCK_STREAM, 0);
+		CreateIoCompletionPort ((HANDLE)sd, Iocp, NULL, 0);
+		AcceptEx (sd_accept, sd, 
+	}
+
+	return output_binding;
+
+	fail:
+	if (sd_accept != INVALID_SOCKET)
+		closesocket (sd_accept);
+	return NULL;
+}
+
+
+/*******************************
+EventMachine_t::ConnectToServer
+*******************************/
+
+const char *EventMachine_t::ConnectToServer (const char *server, int port)
+{
+	if (!server || !*server || !port)
+		return NULL;
+
+	sockaddr_in pin;
+	unsigned long HostAddr;
+
+	HostAddr = inet_addr (server);
+	if (HostAddr == INADDR_NONE) {
+		hostent *hp = gethostbyname (server);
+		if (!hp)
+			return NULL;
+		HostAddr = ((in_addr*)(hp->h_addr))->s_addr;
+	}
+
+	memset (&pin, 0, sizeof(pin));
+	pin.sin_family = AF_INET;
+	pin.sin_addr.s_addr = HostAddr;
+	pin.sin_port = htons (port);
+
+	int sd = socket (AF_INET, SOCK_STREAM, 0);
+	if (sd == INVALID_SOCKET)
+		return NULL;
+
+
+	LPOVERLAPPED olap = (LPOVERLAPPED) calloc (1, sizeof (OVERLAPPED));
+	cerr << "I'm dying now\n";
+	throw runtime_error ("UNIMPLEMENTED!!!\n");
+
+}
+
+
+
+/*******************
+EventMachine_t::Add
+*******************/
+
+void EventMachine_t::Add (EventableDescriptor *ed)
+{
+	cerr << "ADD\n";
+}
+
+
+
+#endif // OS_WIN32
+

data/ext/emwin.h

@@ -0,0 +1,99 @@
+/*****************************************************************************
+
+$Id: em.h 2362 2006-04-23 13:57:09Z francis $
+
+File:     edwin.h
+Date:     05May06
+
+Copyright (C) 2006 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 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.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*****************************************************************************/
+
+
+// THIS ENTIRE FILE IS FOR WINDOWS BUILDS ONLY.
+// INCOMPLETE AND DISABLED FOR NOW.
+#ifdef xOS_WIN32
+
+#ifndef __EventMachine__H_
+#define __EventMachine__H_
+
+
+extern time_t gCurrentLoopTime;
+
+class EventableDescriptor;
+
+
+/********************
+class EventMachine_t
+********************/
+
+class EventMachine_t
+{
+	public:
+		EventMachine_t (void(*event_callback)(const char*, int, const char*, int));
+		virtual ~EventMachine_t();
+
+		void Run();
+		void ScheduleHalt();
+		const char *InstallOneshotTimer (int);
+		const char *ConnectToServer (const char *, int);
+		const char *CreateTcpServer (const char *, int);
+		const char *OpenDatagramSocket (const char *, int);
+
+		void Add (EventableDescriptor*);
+
+	public:
+		enum { // Event names
+			TIMER_FIRED = 100,
+			CONNECTION_READ = 101,
+			CONNECTION_UNBOUND = 102,
+			CONNECTION_ACCEPTED = 103
+		};
+
+	private:
+		HANDLE Iocp;
+
+	private:
+		bool _RunOnce();
+		bool _RunTimers();
+		void _AddNewDescriptors();
+
+	private:
+		enum {
+			MaxOutstandingTimers = 40,
+			HeartbeatInterval = 2
+		};
+		void (*EventCallback)(const char*, int, const char*, int);
+
+		class Timer_t: public Bindable_t {
+		};
+
+		multimap<time_t, Timer_t> Timers;
+		vector<EventableDescriptor*> Descriptors;
+		vector<EventableDescriptor*> NewDescriptors;
+
+		time_t NextHeartbeatTime;
+};
+
+
+
+
+#endif // __EventMachine__H_
+
+#endif // OS_WIN32
+

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-# $Id: extconf.rb 2451 2006-05-05 03:16:31Z francis $
+# $Id: extconf.rb 2493 2006-05-12 20:57:03Z francis $
 #
 #----------------------------------------------------------------------------
 #
@@ -41,6 +41,7 @@ when 'mswin32', 'mingw32', 'bccwin32'
   end
 
   flags << "-D OS_WIN32"
+  flags << '-D BUILD_FOR_RUBY'
   flags << "-GX"
   flags << "-GR"
 
@@ -52,13 +53,57 @@ when 'mswin32', 'mingw32', 'bccwin32'
   else
     flags << '-D WITHOUT_SSL'
   end
+
+when 'solaris2.8'
+  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 'darwin8.0'
+  flags << '-D OS_UNIX'
+  flags << '-D BUILD_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 << '-D WITH_SSL'
+  else
+    flags << '-D WITHOUT_SSL'
+  end
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) $(RC_CFLAGS) -bundle"
+
 else
   unless have_library('pthread')
 	  exit
   end
 
   flags << '-D OS_UNIX'
+  flags << '-D BUILD_FOR_RUBY'
 
+  dir_config('ssl')
   if have_library('ssl') and
 	  have_library('crypto') and
 	  have_header('openssl/ssl.h') and

data/ext/project.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: project.h 2452 2006-05-05 03:57:39Z francis $
+$Id: project.h 2473 2006-05-11 06:37:31Z francis $
 
 File:     project.h
 Date:     06Apr06
@@ -58,6 +58,9 @@ typedef int SOCKET;
 #define closesocket close
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR -1
+#ifdef OS_SOLARIS8
+#define INADDR_NONE ((unsigned long)-1)
+#endif
 #endif
 
 
@@ -74,9 +77,10 @@ typedef int socklen_t;
 
 using namespace std;
 
+#ifdef WITH_SSL
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-
+#endif
 
 #include "binder.h"
 #include "em.h"

data/ext/rubymain.cpp

@@ -128,10 +128,15 @@ t_run_machine
 
 static VALUE t_run_machine (VALUE self)
 {
+	// This whole method and the whole UseThreads mechanism is
+	// tentatively OBSOLETE. If we replace calls to select with
+	// rb_thread_select, then we appear able to interoperate with
+	// Ruby threads.
+
 	#ifdef OS_UNIX
 	UseThreads = true;
 
-	int sp = socketpair (AF_LOCAL, SOCK_STREAM, 0, SyncSockets);
+	int sp = socketpair (AF_UNIX, SOCK_STREAM, 0, SyncSockets);
 	if (sp)
 		throw std::runtime_error ("no socket pair");
 
@@ -354,10 +359,12 @@ Init_rubyeventmachine
 
 extern "C" void Init_rubyeventmachine()
 {
-	// INCOMPLETE, we need to define class Connectons inside module EventMachine
+	// INCOMPLETE, we need to define class Connections inside module EventMachine
+	// run_machine and run_machine_without_threads are now identical.
+	// Must deprecate the without_threads variant.
 	EmModule = rb_define_module ("EventMachine");
 	rb_define_module_function (EmModule, "initialize_event_machine", (VALUE(*)(...))t_initialize_event_machine, 0);
-	rb_define_module_function (EmModule, "run_machine", (VALUE(*)(...))t_run_machine, 0);
+	rb_define_module_function (EmModule, "run_machine", (VALUE(*)(...))t_run_machine_without_threads, 0);
 	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);
@@ -370,11 +377,9 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "release_machine", (VALUE(*)(...))t_release_machine, 0);
 	rb_define_module_function (EmModule, "stop", (VALUE(*)(...))t_stop, 0);
 
-	// Why am I missing the rb_ function that converts a class/module name to a VALUE?
-	VALUE exception = rb_eval_string ("Exception");
-	rb_define_class_under (EmModule, "ConnectionNotBound", exception);
-	rb_define_class_under (EmModule, "NoHandlerForAcceptedConnection", exception);
-	rb_define_class_under (EmModule, "UnknownTimerFired", exception);
+	rb_define_class_under (EmModule, "ConnectionNotBound", rb_eException);
+	rb_define_class_under (EmModule, "NoHandlerForAcceptedConnection", rb_eException);
+	rb_define_class_under (EmModule, "UnknownTimerFired", rb_eException);
 
 	rb_define_const (EmModule, "TimerFired", (100 << 1) | 1);
 	rb_define_const (EmModule, "ConnectionData", (101 << 1) | 1);

data/ext/ssl.cpp

@@ -1,12 +1,12 @@
 /*****************************************************************************
 
-$Id: ssl.cpp 2458 2006-05-05 17:07:17Z francis $
+$Id: ssl.cpp 2491 2006-05-12 20:24:19Z francis $
 
 File:     ssl.cpp
 Date:     30Apr06
 
 Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-Gmail: garbagecat20
+Gmail: garbagecat10
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *****************************************************************************/
 
 
+#ifdef WITH_SSL
+
 #include "project.h"
 
 
@@ -36,45 +38,45 @@ static void InitializeDefaultCredentials();
 static EVP_PKEY *DefaultPrivateKey = NULL;
 static X509 *DefaultCertificate = NULL;
 
-static char PrivateMaterials[] = {"\
------BEGIN RSA PRIVATE KEY-----\n\
-MIICXAIBAAKBgQDCYYhcw6cGRbhBVShKmbWm7UVsEoBnUf0cCh8AX+MKhMxwVDWV\n\
-Igdskntn3cSJjRtmgVJHIK0lpb/FYHQB93Ohpd9/Z18pDmovfFF9nDbFF0t39hJ/\n\
-AqSzFB3GiVPoFFZJEE1vJqh+3jzsSF5K56bZ6azz38VlZgXeSozNW5bXkQIDAQAB\n\
-AoGALA89gIFcr6BIBo8N5fL3aNHpZXjAICtGav+kTUpuxSiaym9cAeTHuAVv8Xgk\n\
-H2Wbq11uz+6JMLpkQJH/WZ7EV59DPOicXrp0Imr73F3EXBfR7t2EQDYHPMthOA1D\n\
-I9EtCzvV608Ze90hiJ7E3guGrGppZfJ+eUWCPgy8CZH1vRECQQDv67rwV/oU1aDo\n\
-6/+d5nqjeW6mWkGqTnUU96jXap8EIw6B+0cUKskwx6mHJv+tEMM2748ZY7b0yBlg\n\
-w4KDghbFAkEAz2h8PjSJG55LwqmXih1RONSgdN9hjB12LwXL1CaDh7/lkEhq0PlK\n\
-PCAUwQSdM17Sl0Xxm2CZiekTSlwmHrtqXQJAF3+8QJwtV2sRJp8u2zVe37IeH1cJ\n\
-xXeHyjTzqZ2803fnjN2iuZvzNr7noOA1/Kp+pFvUZUU5/0G2Ep8zolPUjQJAFA7k\n\
-xRdLkzIx3XeNQjwnmLlncyYPRv+qaE3FMpUu7zftuZBnVCJnvXzUxP3vPgKTlzGa\n\
-dg5XivDRfsV+okY5uQJBAMV4FesUuLQVEKb6lMs7rzZwpeGQhFDRfywJzfom2TLn\n\
-2RdJQQ3dcgnhdVDgt5o1qkmsqQh8uJrJ9SdyLIaZQIc=\n\
------END RSA PRIVATE KEY-----\n\
------BEGIN CERTIFICATE-----\n\
-MIID6TCCA1KgAwIBAgIJANm4W/Tzs+s+MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD\n\
-VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRYw\n\
-FAYDVQQKEw1TdGVhbWhlYXQubmV0MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEdMBsG\n\
-A1UEAxMUb3BlbmNhLnN0ZWFtaGVhdC5uZXQxKDAmBgkqhkiG9w0BCQEWGWVuZ2lu\n\
-ZWVyaW5nQHN0ZWFtaGVhdC5uZXQwHhcNMDYwNTA1MTcwNjAzWhcNMjQwMjIwMTcw\n\
-NjAzWjCBqjELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQH\n\
-EwhOZXcgWW9yazEWMBQGA1UEChMNU3RlYW1oZWF0Lm5ldDEUMBIGA1UECxMLRW5n\n\
-aW5lZXJpbmcxHTAbBgNVBAMTFG9wZW5jYS5zdGVhbWhlYXQubmV0MSgwJgYJKoZI\n\
-hvcNAQkBFhllbmdpbmVlcmluZ0BzdGVhbWhlYXQubmV0MIGfMA0GCSqGSIb3DQEB\n\
-AQUAA4GNADCBiQKBgQDCYYhcw6cGRbhBVShKmbWm7UVsEoBnUf0cCh8AX+MKhMxw\n\
-VDWVIgdskntn3cSJjRtmgVJHIK0lpb/FYHQB93Ohpd9/Z18pDmovfFF9nDbFF0t3\n\
-9hJ/AqSzFB3GiVPoFFZJEE1vJqh+3jzsSF5K56bZ6azz38VlZgXeSozNW5bXkQID\n\
-AQABo4IBEzCCAQ8wHQYDVR0OBBYEFPJvPd1Fcmd8o/Tm88r+NjYPICCkMIHfBgNV\n\
-HSMEgdcwgdSAFPJvPd1Fcmd8o/Tm88r+NjYPICCkoYGwpIGtMIGqMQswCQYDVQQG\n\
-EwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRYwFAYD\n\
-VQQKEw1TdGVhbWhlYXQubmV0MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEdMBsGA1UE\n\
-AxMUb3BlbmNhLnN0ZWFtaGVhdC5uZXQxKDAmBgkqhkiG9w0BCQEWGWVuZ2luZWVy\n\
-aW5nQHN0ZWFtaGVhdC5uZXSCCQDZuFv087PrPjAMBgNVHRMEBTADAQH/MA0GCSqG\n\
-SIb3DQEBBQUAA4GBAC1CXey/4UoLgJiwcEMDxOvW74plks23090iziFIlGgcIhk0\n\
-Df6hTAs7H3MWww62ddvR8l07AWfSzSP5L6mDsbvq7EmQsmPODwb6C+i2aF3EDL8j\n\
-uw73m4YIGI0Zw2XdBpiOGkx2H56Kya6mJJe/5XORZedh1wpI7zki01tHYbcy\n\
------END CERTIFICATE-----\n"};
+static char PrivateMaterials[] = {
+"-----BEGIN RSA PRIVATE KEY-----\n"
+"MIICXAIBAAKBgQDCYYhcw6cGRbhBVShKmbWm7UVsEoBnUf0cCh8AX+MKhMxwVDWV\n"
+"Igdskntn3cSJjRtmgVJHIK0lpb/FYHQB93Ohpd9/Z18pDmovfFF9nDbFF0t39hJ/\n"
+"AqSzFB3GiVPoFFZJEE1vJqh+3jzsSF5K56bZ6azz38VlZgXeSozNW5bXkQIDAQAB\n"
+"AoGALA89gIFcr6BIBo8N5fL3aNHpZXjAICtGav+kTUpuxSiaym9cAeTHuAVv8Xgk\n"
+"H2Wbq11uz+6JMLpkQJH/WZ7EV59DPOicXrp0Imr73F3EXBfR7t2EQDYHPMthOA1D\n"
+"I9EtCzvV608Ze90hiJ7E3guGrGppZfJ+eUWCPgy8CZH1vRECQQDv67rwV/oU1aDo\n"
+"6/+d5nqjeW6mWkGqTnUU96jXap8EIw6B+0cUKskwx6mHJv+tEMM2748ZY7b0yBlg\n"
+"w4KDghbFAkEAz2h8PjSJG55LwqmXih1RONSgdN9hjB12LwXL1CaDh7/lkEhq0PlK\n"
+"PCAUwQSdM17Sl0Xxm2CZiekTSlwmHrtqXQJAF3+8QJwtV2sRJp8u2zVe37IeH1cJ\n"
+"xXeHyjTzqZ2803fnjN2iuZvzNr7noOA1/Kp+pFvUZUU5/0G2Ep8zolPUjQJAFA7k\n"
+"xRdLkzIx3XeNQjwnmLlncyYPRv+qaE3FMpUu7zftuZBnVCJnvXzUxP3vPgKTlzGa\n"
+"dg5XivDRfsV+okY5uQJBAMV4FesUuLQVEKb6lMs7rzZwpeGQhFDRfywJzfom2TLn\n"
+"2RdJQQ3dcgnhdVDgt5o1qkmsqQh8uJrJ9SdyLIaZQIc=\n"
+"-----END RSA PRIVATE KEY-----\n"
+"-----BEGIN CERTIFICATE-----\n"
+"MIID6TCCA1KgAwIBAgIJANm4W/Tzs+s+MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD\n"
+"VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRYw\n"
+"FAYDVQQKEw1TdGVhbWhlYXQubmV0MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEdMBsG\n"
+"A1UEAxMUb3BlbmNhLnN0ZWFtaGVhdC5uZXQxKDAmBgkqhkiG9w0BCQEWGWVuZ2lu\n"
+"ZWVyaW5nQHN0ZWFtaGVhdC5uZXQwHhcNMDYwNTA1MTcwNjAzWhcNMjQwMjIwMTcw\n"
+"NjAzWjCBqjELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQH\n"
+"EwhOZXcgWW9yazEWMBQGA1UEChMNU3RlYW1oZWF0Lm5ldDEUMBIGA1UECxMLRW5n\n"
+"aW5lZXJpbmcxHTAbBgNVBAMTFG9wZW5jYS5zdGVhbWhlYXQubmV0MSgwJgYJKoZI\n"
+"hvcNAQkBFhllbmdpbmVlcmluZ0BzdGVhbWhlYXQubmV0MIGfMA0GCSqGSIb3DQEB\n"
+"AQUAA4GNADCBiQKBgQDCYYhcw6cGRbhBVShKmbWm7UVsEoBnUf0cCh8AX+MKhMxw\n"
+"VDWVIgdskntn3cSJjRtmgVJHIK0lpb/FYHQB93Ohpd9/Z18pDmovfFF9nDbFF0t3\n"
+"9hJ/AqSzFB3GiVPoFFZJEE1vJqh+3jzsSF5K56bZ6azz38VlZgXeSozNW5bXkQID\n"
+"AQABo4IBEzCCAQ8wHQYDVR0OBBYEFPJvPd1Fcmd8o/Tm88r+NjYPICCkMIHfBgNV\n"
+"HSMEgdcwgdSAFPJvPd1Fcmd8o/Tm88r+NjYPICCkoYGwpIGtMIGqMQswCQYDVQQG\n"
+"EwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRYwFAYD\n"
+"VQQKEw1TdGVhbWhlYXQubmV0MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEdMBsGA1UE\n"
+"AxMUb3BlbmNhLnN0ZWFtaGVhdC5uZXQxKDAmBgkqhkiG9w0BCQEWGWVuZ2luZWVy\n"
+"aW5nQHN0ZWFtaGVhdC5uZXSCCQDZuFv087PrPjAMBgNVHRMEBTADAQH/MA0GCSqG\n"
+"SIb3DQEBBQUAA4GBAC1CXey/4UoLgJiwcEMDxOvW74plks23090iziFIlGgcIhk0\n"
+"Df6hTAs7H3MWww62ddvR8l07AWfSzSP5L6mDsbvq7EmQsmPODwb6C+i2aF3EDL8j\n"
+"uw73m4YIGI0Zw2XdBpiOGkx2H56Kya6mJJe/5XORZedh1wpI7zki01tHYbcy\n"
+"-----END CERTIFICATE-----\n"};
 
 /* These private materials were made with:
  * openssl req -new -x509 -keyout cakey.pem -out cacert.pem -nodes -days 6500
@@ -375,3 +377,6 @@ int SslBox_t::PutPlaintext (const char *buf, int bufsize)
 		return 0;
 }
 
+
+#endif // WITH_SSL
+

data/ext/ssl.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ssl.h 2421 2006-04-29 23:48:49Z francis $
+$Id: ssl.h 2473 2006-05-11 06:37:31Z francis $
 
 File:     ssl.h
 Date:     30Apr06
@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 
+#ifdef WITH_SSL
 
 /******************
 class SslContext_t
@@ -85,7 +86,7 @@ class SslBox_t
 
 		PageList OutboundQ;
 };
-
+#endif // WITH_SSL
 
 
 #endif // __SslBox__H_

data/lib/eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine.rb 2431 2006-04-30 22:17:20Z francis $
+# $Id: eventmachine.rb 2469 2006-05-10 18:11:10Z francis $
 #
 # Author:: blackhedd (gmail address: garbagecat20).
 # Date:: 8 Apr 2006
@@ -163,23 +163,30 @@ module EventMachine
   #
   # See the description of stop_event_loop for an extremely simple client example.
   #
-
-  def EventMachine::run use_threads = true, &block
+  #--
+  # Obsoleted the use_threads mechanism.
+  #
+  def EventMachine::run &block
+  #def EventMachine::run use_threads = true, &block
     @conns = {}
     @acceptors = {}
     @timers = {}
     initialize_event_machine
     block and add_timer 0, block
-    use_threads ? run_machine : run_machine_without_threads
+    #use_threads ? run_machine : run_machine_without_threads
+    run_machine
     release_machine
   end
 
+  # +deprecated+
+  #--
   # EventMachine#run_without_threads is semantically identical
   # to EventMachine#run, but it runs somewhat faster.
   # However, it must not be used in applications that spin
   # Ruby threads.
   def EventMachine::run_without_threads &block
-    EventMachine::run false, &block
+    #EventMachine::run false, &block
+    EventMachine::run &block
   end
 
   # EventMachine#add_timer adds a one-shot timer to the event loop.

metadata

@@ -3,16 +3,15 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2006-05-05 00:00:00 -04:00
+  version: 0.5.2
+date: 2006-05-12 00:00:00 -04:00
 summary: Ruby/EventMachine socket engine library
 require_paths: 
 - lib
-- ext
 email: garbagecat10@gmail.com
-homepage: http://rubyforge.org/projects/eventmachine
-rubyforge_project: 
-description: 
+homepage: http://rubyeventmachine.com
+rubyforge_project: eventmachine
+description: ""
 autorequire: 
 default_executable: 
 bindir: bin
@@ -26,8 +25,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
-authors: []
-
+authors: 
+- Francis Cianfrocca
 files: 
 - tests/testem.rb
 - lib/eventmachine.rb
@@ -41,11 +40,13 @@ files:
 - ext/binder.h
 - ext/em.h
 - ext/ed.h
+- ext/emwin.h
 - ext/ssl.cpp
 - ext/project.h
 - ext/eventmachine.h
 - ext/em.cpp
 - ext/extconf.rb
+- ext/emwin.cpp
 - ext/page.cpp
 - ext/ssl.h
 - README
@@ -53,8 +54,12 @@ files:
 - COPYING
 test_files: 
 - tests/testem.rb
-rdoc_options: []
-
+rdoc_options: 
+- --title
+- EventMachine
+- --main
+- README
+- --line-numbers
 extra_rdoc_files: 
 - README
 - RELEASE_NOTES