eventmachine 0.12.2 → 0.12.4

data/ext/files.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: files.cpp 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     files.cpp
 Date:     26Aug06

data/ext/files.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: files.h 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     files.h
 Date:     26Aug06

data/ext/kb.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: kb.cpp 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     kb.cpp
 Date:     24Aug07

data/ext/page.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: page.cpp 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     page.cpp
 Date:     30Apr06

data/ext/page.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: page.h 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     page.h
 Date:     30Apr06

data/ext/pipe.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: pipe.cpp 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     pipe.cpp
 Date:     30May07
@@ -92,15 +92,22 @@ PipeDescriptor::~PipeDescriptor()
 	 * within other unbind calls. (Not sure if that's even possible.)
 	 */
 
-	struct timespec req = {0, 10000000};
-	kill (SubprocessPid, SIGTERM);
-	nanosleep (&req, NULL);
 	assert (MyEventMachine);
+
+	// check if the process is already dead
 	if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) == 0) {
-		kill (SubprocessPid, SIGKILL);
+		kill (SubprocessPid, SIGTERM);
+		// wait 0.25s for process to die
+		struct timespec req = {0, 250000000};
 		nanosleep (&req, NULL);
-		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) == 0)
-			throw std::runtime_error ("unable to reap subprocess");
+		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) == 0) {
+			kill (SubprocessPid, SIGKILL);
+			// wait 0.5s for process to die
+			struct timespec req = {0, 500000000};
+			nanosleep (&req, NULL);
+			if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) == 0)
+				throw std::runtime_error ("unable to reap subprocess");
+		}
 	}
 }
 

data/ext/project.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: project.h 686 2008-05-14 21:21:10Z francis $
+$Id$
 
 File:     project.h
 Date:     06Apr06

data/ext/rubymain.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: rubymain.cpp 785 2008-09-15 09:46:23Z francis $
+$Id$
 
 File:     rubymain.cpp
 Date:     06Apr06
@@ -463,7 +463,12 @@ t_invoke_popen
 
 static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 {
-	int len = RARRAY (cmd)->len;
+	// 1.8.7+
+	#ifdef RARRAY_LEN
+		int len = RARRAY_LEN(cmd);
+	#else
+		int len = RARRAY (cmd)->len;
+	#endif
 	if (len > 98)
 		rb_raise (rb_eRuntimeError, "too many arguments to popen");
 	char *strings [100];
@@ -510,6 +515,20 @@ static VALUE t__epoll (VALUE self)
 	return Qnil;
 }
 
+/**********
+t__epoll_p
+**********/
+
+static VALUE t__epoll_p (VALUE self)
+{
+  #ifdef HAVE_EPOLL
+  return Qtrue;
+  #else
+  return Qfalse;
+  #endif
+}
+
+
 /*********
 t__kqueue
 *********/
@@ -521,6 +540,19 @@ static VALUE t__kqueue (VALUE self)
 	return Qnil;
 }
 
+/***********
+t__kqueue_p
+***********/
+
+static VALUE t__kqueue_p (VALUE self)
+{
+  #ifdef HAVE_KQUEUE
+  return Qtrue;
+  #else
+  return Qfalse;
+  #endif
+}
+
 
 /****************
 t_send_file_data
@@ -585,6 +617,23 @@ static VALUE conn_associate_callback_target (VALUE self, VALUE sig)
 }
 
 
+/***************
+t_get_loop_time
+****************/
+
+static VALUE t_get_loop_time (VALUE self)
+{
+  VALUE cTime = rb_path2class("Time");
+  if (gCurrentLoopTime != 0) {
+    return rb_funcall(cTime,
+                      rb_intern("at"),
+                      1,
+                      INT2NUM(gCurrentLoopTime));
+  }
+  return Qnil;
+}
+
+
 /*********************
 Init_rubyeventmachine
 *********************/
@@ -634,6 +683,8 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "attach_fd", (VALUE (*)(...))t_attach_fd, 3);
 	rb_define_module_function (EmModule, "detach_fd", (VALUE (*)(...))t_detach_fd, 1);
 
+	rb_define_module_function (EmModule, "current_time", (VALUE(*)(...))t_get_loop_time, 0);
+
 	rb_define_module_function (EmModule, "open_udp_socket", (VALUE(*)(...))t_open_udp_socket, 2);
 	rb_define_module_function (EmModule, "read_keyboard", (VALUE(*)(...))t_read_keyboard, 0);
 	rb_define_module_function (EmModule, "release_machine", (VALUE(*)(...))t_release_machine, 0);
@@ -661,6 +712,9 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "epoll", (VALUE(*)(...))t__epoll, 0);
 	rb_define_module_function (EmModule, "kqueue", (VALUE(*)(...))t__kqueue, 0);
 
+	rb_define_module_function (EmModule, "epoll?", (VALUE(*)(...))t__epoll_p, 0);
+	rb_define_module_function (EmModule, "kqueue?", (VALUE(*)(...))t__kqueue_p, 0);
+
 	rb_define_method (EmConnection, "get_outbound_data_size", (VALUE(*)(...))conn_get_outbound_data_size, 0);
 	rb_define_method (EmConnection, "associate_callback_target", (VALUE(*)(...))conn_associate_callback_target, 1);
 

data/ext/sigs.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: sigs.cpp 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     sigs.cpp
 Date:     06Apr06

data/ext/sigs.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: sigs.h 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     sigs.h
 Date:     06Apr06

data/ext/ssl.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ssl.cpp 673 2008-01-05 04:33:01Z blackhedd $
+$Id$
 
 File:     ssl.cpp
 Date:     30Apr06

data/ext/ssl.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ssl.h 668 2008-01-04 23:00:34Z blackhedd $
+$Id$
 
 File:     ssl.h
 Date:     30Apr06

data/java/src/com/rubyeventmachine/Application.java

@@ -0,0 +1,196 @@
+/**
+ * $Id$
+ * 
+ * Author:: Francis Cianfrocca (gmail: blackhedd)
+ * Homepage::  http://rubyeventmachine.com
+ * Date:: 15 Jul 2007
+ * 
+ * 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.
+ *
+ *---------------------------------------------------------------------------
+ *
+ * 
+ */
+
+/**
+ * 
+ */
+package com.rubyeventmachine;
+
+import java.nio.ByteBuffer;
+import java.nio.channels.*;
+import java.util.*;
+import java.io.*;
+import java.net.*;
+import java.net.SocketAddress;
+
+/**
+ * @author francis
+ *
+ */
+public class Application {
+	
+	
+	public class Reactor extends EmReactor {
+
+		private Application application;
+		private TreeMap<String, Timer> timers;
+		private TreeMap<String, Connection> connections;
+		private TreeMap<String, ConnectionFactory> acceptors;
+		/**
+		 * 
+		 */
+		public Reactor (Application app) {
+			application = app;
+			timers = new TreeMap<String, Timer>();
+			connections = new TreeMap<String, Connection>();
+			acceptors = new TreeMap<String, ConnectionFactory>();
+		}
+
+
+		public void eventCallback (String sig, int eventType, ByteBuffer data) {
+			if (eventType == EM_TIMER_FIRED) {
+				String timersig = new String (data.array());
+				//System.out.println ("EVSIG "+sig + "..."+new String(data.array()));
+				Timer r = timers.remove(timersig);
+				if (r != null)
+					r._fire();
+				else
+					throw new RuntimeException ("unable to run unknown timer");
+			}
+			else if (eventType == EM_CONNECTION_COMPLETED) {
+				Connection c = connections.get(sig);
+				if (c != null) {
+					c.connectionCompleted();
+				}
+				else
+					throw new RuntimeException ("connection completed to unknown object");
+
+			}
+			else if (eventType == EM_CONNECTION_UNBOUND) {
+				Connection c = connections.get(sig);
+				if (c != null) {
+					c.unbind();
+				}
+				else
+					throw new RuntimeException ("unbind received on unknown object");
+			}
+			else if (eventType == EM_CONNECTION_ACCEPTED) {
+				ConnectionFactory f = acceptors.get(sig);
+				if (f != null) {
+					Connection c = f.connection();
+					c.signature = new String (data.array());
+					c.application = application;
+					connections.put(c.signature, c);
+					c.postInit();
+					//System.out.println (sig+"..."+new String(data.array()));
+				}
+				else
+					throw new RuntimeException ("received connection on unknown acceptor");
+			}
+			else if (eventType == EM_CONNECTION_READ) {
+				Connection c = connections.get(sig);
+				if (c != null) {
+					c.receiveData(data);
+				}
+				else throw new RuntimeException ("received data on unknown object");
+			}
+			else {
+				System.out.println ("unknown event type: " + eventType);
+			}
+		}
+	}
+
+
+	Reactor reactor;
+	
+	public Application() {
+		reactor = new Reactor (this);
+	}
+	public void addTimer (double seconds, Timer t) {
+		t.application = this;
+		t.interval = seconds;
+		String s = reactor.installOneshotTimer ((int)(seconds * 1000));
+		reactor.timers.put(s, t);
+		
+	}
+	
+	public void connect (String host, int port, Connection c) {
+		try {
+			String s = reactor.connectTcpServer(host, port);
+			c.application = this;
+			c.signature = s;
+			reactor.connections.put(s, c);
+			c.postInit();
+		} catch (ClosedChannelException e) {}
+	}
+	
+	public void startServer (SocketAddress sa, ConnectionFactory f) throws EmReactorException {
+		String s = reactor.startTcpServer(sa);
+		reactor.acceptors.put(s, f);
+	}
+	
+	public void stop() {
+		reactor.stop();
+	}
+	public void run() {
+		try {
+			reactor.run();
+		} catch (IOException e) {}
+	}
+	public void run (final Runnable r) {
+		addTimer(0, new Timer() {
+			public void fire() {
+				r.run();
+			}
+		});
+		run();
+	}
+	
+	public void sendData (String sig, ByteBuffer bb) {
+		try {
+			reactor.sendData(sig, bb);
+		} catch (IOException e) {}
+	}
+	
+	public void sendDatagram (String sig, ByteBuffer bb, InetSocketAddress target) {
+		reactor.sendDatagram(sig, bb, target.getHostName(), target.getPort());
+	}
+	
+	public void closeConnection (String sig, boolean afterWriting) {
+		try {
+			reactor.closeConnection(sig, afterWriting);
+		} catch (ClosedChannelException e) {}
+	}
+	
+	public void openDatagramSocket (Connection c) {
+		openDatagramSocket (new InetSocketAddress ("0.0.0.0", 0), c);
+	}
+	public void openDatagramSocket (InetSocketAddress addr, Connection c) {
+		try {
+			String s = reactor.openUdpSocket(addr);
+			c.application = this;
+			c.signature = s;
+			reactor.connections.put(s, c);
+			c.postInit();
+		} catch (ClosedChannelException e) {
+		} catch (IOException e) {
+			System.out.println ("Bad Datagram socket "+e+" "+addr);
+			/* TODO, can't catch this here, because it can happen on a bad address */
+		}
+	}
+}

data/java/src/com/rubyeventmachine/Connection.java

@@ -0,0 +1,74 @@
+/**
+ * $Id$
+ * 
+ * Author:: Francis Cianfrocca (gmail: blackhedd)
+ * Homepage::  http://rubyeventmachine.com
+ * Date:: 15 Jul 2007
+ * 
+ * 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.
+ *
+ *---------------------------------------------------------------------------
+ *
+ * 
+ */
+
+
+
+package com.rubyeventmachine;
+
+//import java.io.*;
+import java.nio.*;
+import java.net.*;
+//import java.nio.channels.*;
+
+public class Connection {
+	
+	public Application application;
+	public String signature;
+	
+	public void postInit() {}
+	public void connectionCompleted() {}
+	public void unbind() {}
+	public void receiveData (ByteBuffer bytebuffer) {}
+	
+	
+	/**
+	 * Called by user code.
+	 * @param bytebuffer
+	 */
+	public void sendData (ByteBuffer b) {
+		application.sendData(signature, b);
+	}
+	
+	/**
+	 * This is called by user code.
+	 * TODO: don't expose the exception here.
+	 */
+	public void close() {
+		application.closeConnection(signature, false);
+	}
+	/**
+	 * This is called by user code/
+	 */
+	public void closeAfterWriting() {
+		application.closeConnection(signature, true);
+	}
+	
+	public void sendDatagram (ByteBuffer bb, InetSocketAddress addr) {
+		application.sendDatagram (signature, bb, addr);
+	}
+}