eventmachine-maglev- 0.12.10 → 1.0.0.beta.4

data/ext/em.h

@@ -17,21 +17,11 @@ See the file COPYING for complete licensing information.
 
 *****************************************************************************/
 
-
-
-#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>
+#if defined(BUILD_FOR_RUBY)
+#include <ruby.h>
 #endif
 
 #if defined(BUILD_FOR_RUBY) && !defined(BUILD_FOR_MAGLEV)
@@ -60,16 +50,6 @@ See the file COPYING for complete licensing information.
   #define EmSelect select
 #endif
 
-
-#ifdef OS_UNIX
-typedef long long Int64;
-#endif
-#ifdef OS_WIN32
-typedef __int64 Int64;
-#endif
-
-extern Int64 gCurrentLoopTime;
-
 class EventableDescriptor;
 class InotifyDescriptor;
 
@@ -85,7 +65,7 @@ class EventMachine_t
 		static void SetMaxTimerCount (int);
 
 	public:
-		EventMachine_t (void(*event_callback)(const unsigned long, int, const char*, const unsigned long));
+		EventMachine_t (EMCallback);
 		virtual ~EventMachine_t();
 
 		void Run();
@@ -98,13 +78,13 @@ class EventMachine_t
 		const unsigned long CreateTcpServer (const char *, int);
 		const unsigned long OpenDatagramSocket (const char *, int);
 		const unsigned long CreateUnixDomainServer (const char*);
-		const unsigned long _OpenFileForWriting (const char*);
 		const unsigned long OpenKeyboard();
 		//const char *Popen (const char*, const char*);
 		const unsigned long Socketpair (char* const*);
 
 		void Add (EventableDescriptor*);
 		void Modify (EventableDescriptor*);
+		void Closing (EventableDescriptor*);
 
 		const unsigned long AttachFD (int, bool);
 		int DetachFD (EventableDescriptor*);
@@ -140,6 +120,8 @@ class EventMachine_t
 		void _HandleKqueuePidEvent (struct kevent*);
 		#endif
 
+		uint64_t GetCurrentLoopTime() { return MyCurrentLoopTime; }
+
 		// Temporary:
 		void _UseEpoll();
 		void _UseKqueue();
@@ -147,19 +129,28 @@ class EventMachine_t
 		bool UsingKqueue() { return bKqueue; }
 		bool UsingEpoll() { return bEpoll; }
 
+		void QueueHeartbeat(EventableDescriptor*);
+		void ClearHeartbeat(uint64_t, EventableDescriptor*);
+
+		uint64_t GetRealTime();
+
 	private:
 		bool _RunOnce();
-		bool _RunTimers();
+		void _RunTimers();
 		void _UpdateTime();
 		void _AddNewDescriptors();
 		void _ModifyDescriptors();
 		void _InitializeLoopBreaker();
+		void _CleanupSockets();
 
 		bool _RunSelectOnce();
 		bool _RunEpollOnce();
 		bool _RunKqueueOnce();
 
 		void _ModifyEpollEvent (EventableDescriptor*);
+		void _DispatchHeartbeats();
+		timeval _TimeTilNextEvent();
+		void _CleanBadDescriptors();
 
 	public:
 		void _ReadLoopBreaker();
@@ -171,19 +162,20 @@ class EventMachine_t
 			MaxEvents = 4096
 		};
 		int HeartbeatInterval;
-		void (*EventCallback)(const unsigned long, int, const char*, const unsigned long);
+		EMCallback EventCallback;
 
 		class Timer_t: public Bindable_t {
 		};
 
-		multimap<Int64, Timer_t> Timers;
+		multimap<uint64_t, Timer_t> Timers;
+		multimap<uint64_t, EventableDescriptor*> Heartbeats;
 		map<int, Bindable_t*> Files;
 		map<int, Bindable_t*> Pids;
 		vector<EventableDescriptor*> Descriptors;
 		vector<EventableDescriptor*> NewDescriptors;
 		set<EventableDescriptor*> ModifiedDescriptors;
 
-		Int64 NextHeartbeatTime;
+		uint64_t NextHeartbeatTime;
 
 		int LoopBreakerReader;
 		int LoopBreakerWriter;
@@ -193,7 +185,16 @@ class EventMachine_t
 
 		timeval Quantum;
 
+		uint64_t MyCurrentLoopTime;
+
+		#ifdef OS_WIN32
+		unsigned TickCountTickover;
+		unsigned LastTickCount;
+		#endif
+
 	private:
+		bool bTerminateSignalReceived;
+
 		bool bEpoll;
 		int epfd; // Epoll file-descriptor
 		#ifdef HAVE_EPOLL
@@ -228,8 +229,4 @@ struct SelectData_t
 	int nSockets;
 };
 
-
-
 #endif // __EventMachine__H_
-
-//#endif // OS_UNIX

data/ext/eventmachine.h

@@ -35,11 +35,12 @@ extern "C" {
 		EM_CONNECTION_NOTIFY_WRITABLE = 107,
 		EM_SSL_HANDSHAKE_COMPLETED = 108,
 		EM_SSL_VERIFY = 109,
-		EM_PROXY_TARGET_UNBOUND = 110
+		EM_PROXY_TARGET_UNBOUND = 110,
+		EM_PROXY_COMPLETED = 111
 
 	};
 
-	void evma_initialize_library (void(*)(const unsigned long, int, const char*, const unsigned long));
+	void evma_initialize_library (EMCallback);
 	void evma_run_machine();
 	void evma_release_library();
 	const unsigned long evma_install_oneshot_timer (int seconds);
@@ -71,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();
@@ -96,7 +97,6 @@ extern "C" {
 	float evma_get_heartbeat_interval();
 	int evma_set_heartbeat_interval(float);
 
-	const unsigned long evma__write_file (const char *filename);
 	const unsigned long evma_popen (char * const*cmd_strings);
 
 	const unsigned long evma_watch_filename (const char *fname);
@@ -105,7 +105,7 @@ extern "C" {
 	const unsigned long evma_watch_pid (int);
 	void evma_unwatch_pid (const unsigned long);
 
-	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long);
+	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long, const unsigned long);
 	void evma_stop_proxy(const unsigned long);
 
 	int evma_set_rlimit_nofile (int n_files);
@@ -113,6 +113,7 @@ extern "C" {
 	void evma_set_epoll (int use);
 	void evma_set_kqueue (int use);
 
+	uint64_t evma_get_current_loop_time();
 #if __cplusplus
 }
 #endif

data/ext/extconf.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'mkmf'
 
 def check_libs libs = [], fatal = false
@@ -12,12 +13,63 @@ def add_define(name)
   $defs.push("-D#{name}")
 end
 
+##
+# OpenSSL:
+
+# override append_library, so it actually appends (instead of prepending)
+# this fixes issues with linking ssl, since libcrypto depends on symbols in libssl
+def append_library(libs, lib)
+  libs + " " + format(LIBARG, lib)
+end
+
+def manual_ssl_config
+  ssl_libs_heads_args = {
+    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
+    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
+  }
+
+  dc_flags = ['ssl']
+  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM and ENV['OPENSSL']
+
+  libs, heads = case RUBY_PLATFORM
+  when /mswin/    ; ssl_libs_heads_args[:mswin]
+  else              ssl_libs_heads_args[:unix]
+  end
+  dir_config(*dc_flags)
+  check_libs(libs) and check_heads(heads)
+end
+
+if ENV['CROSS_COMPILING']
+  openssl_dir = File.expand_path("~/.rake-compiler/builds/openssl-1.0.0a/")
+  if File.exists?(openssl_dir)
+    FileUtils.mkdir_p Dir.pwd+"/openssl/"
+    FileUtils.cp Dir[openssl_dir+"/include/openssl/*.h"], Dir.pwd+"/openssl/", :verbose => true
+    FileUtils.cp Dir[openssl_dir+"/lib*.a"], Dir.pwd, :verbose => true
+    $INCFLAGS << " -I#{Dir.pwd}" # for the openssl headers
+  else
+    STDERR.puts
+    STDERR.puts "**************************************************************************************"
+    STDERR.puts "**** Cross-compiled OpenSSL not found"
+    STDERR.puts "**** Run: hg clone http://bitbucket.org/ged/ruby-pg && cd ruby-pg && rake openssl_libs"
+    STDERR.puts "**************************************************************************************"
+    STDERR.puts
+  end
+end
+
+# Try to use pkg_config first, fixes #73
+if pkg_config('openssl') || manual_ssl_config
+  add_define "WITH_SSL"
+else
+  add_define "WITHOUT_SSL"
+end
+
 add_define 'BUILD_FOR_RUBY'
 add_define 'HAVE_RBTRAP' if have_var('rb_trap_immediate', ['ruby.h', 'rubysig.h'])
 add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro('RUBY_UBF_IO', 'ruby.h')
 add_define "HAVE_INOTIFY" if inotify = have_func('inotify_init', 'sys/inotify.h')
 add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sys/syscall.h')
 add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
+
 have_func('rb_thread_check_ints')
 have_func('rb_time_new')
 
@@ -57,11 +109,13 @@ when /solaris/
   add_define 'OS_SOLARIS8'
   check_libs(%w[nsl socket], true)
 
-  # Patch by Tim Pease, fixes SUNWspro compile problems.
-  if CONFIG['CC'] == 'cc'
+  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
     # SUN CHAIN
-    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    add_define 'CC_SUNWspro'
+    $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
     CONFIG['CCDLFLAGS'] = "-KPIC"
+    CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
   else
     # GNU CHAIN
     # on Unix we need a g++ link, not gcc.
@@ -83,19 +137,6 @@ when /darwin/
 when /linux/
   add_define 'HAVE_EPOLL' if have_func('epoll_create', 'sys/epoll.h')
 
-  # Original epoll test is inadequate because 2.4 kernels have the header
-  # but not the code.
-  # add_define 'HAVE_EPOLL' if have_header('sys/epoll.h')
-  # if have_header('sys/epoll.h')
-  #   File.open("hasEpollTest.c", "w") {|f|
-  #     f.puts "#include <sys/epoll.h>"
-  #     f.puts "int main() { epoll_create(1024); return 0;}"
-  #   }
-  #   (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
-  #   `rm -f hasEpollTest.c hasEpollTest`
-  #   add_define 'HAVE_EPOLL' if e == 0
-  # end
-
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 
@@ -107,38 +148,6 @@ else
   CONFIG['LDSHARED'] = "$(CXX) -shared"
 end
 
-# OpenSSL:
-
-def manual_ssl_config
-  ssl_libs_heads_args = {
-    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :darwin => [%w[ssl crypto C], %w[openssl/ssl.h openssl/err.h]],
-    # openbsd and linux:
-    :crypto_hack => [%w[crypto ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
-  }
-
-  dc_flags = ['ssl']
-  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM
-
-  libs, heads = case RUBY_PLATFORM
-  when /mswin/    ; ssl_libs_heads_args[:mswin]
-  when /mingw/    ; ssl_libs_heads_args[:unix]
-  when /darwin/   ; ssl_libs_heads_args[:darwin]
-  when /openbsd/  ; ssl_libs_heads_args[:crypto_hack]
-  when /linux/    ; ssl_libs_heads_args[:crypto_hack]
-  else              ssl_libs_heads_args[:unix]
-  end
-  dir_config(*dc_flags)
-  check_libs(libs) and check_heads(heads)
-end
-
-# Try to use pkg_config first, fixes #73
-if pkg_config('openssl') || manual_ssl_config
-  add_define "WITH_SSL"
-else
-  add_define "WITHOUT_SSL"
-end
 
 # solaris c++ compiler doesn't have make_pair()
 TRY_LINK.sub!('$(CC)', '$(CXX)')

data/ext/fastfilereader/extconf.rb

@@ -44,11 +44,13 @@ when /solaris/
   add_define 'OS_SOLARIS8'
   check_libs(%w[nsl socket], true)
 
-  # Patch by Tim Pease, fixes SUNWspro compile problems.
-  if CONFIG['CC'] == 'cc'
+  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
     # SUN CHAIN
-    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    add_define 'CC_SUNWspro'
+    $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
     CONFIG['CCDLFLAGS'] = "-KPIC"
+    CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
   else
     # GNU CHAIN
     # on Unix we need a g++ link, not gcc.

data/ext/fastfilereader/mapper.cpp

@@ -88,7 +88,7 @@ void Mapper_t::Close()
 	// Can be called multiple times.
 	// Calls to GetChunk are invalid after a call to Close.
 	if (MapPoint) {
-		#ifdef OS_SOLARIS8
+		#ifdef CC_SUNWspro
 		munmap ((char*)MapPoint, FileSize);
 		#else
 		munmap ((void*)MapPoint, FileSize);

data/ext/fastfilereader/rubymain.cpp

@@ -118,7 +118,6 @@ extern "C" void Init_fastfilereaderext()
 	Mapper = rb_define_class_under (FastFileReader, "Mapper", rb_cObject);
 
 	rb_define_singleton_method (Mapper, "new", (VALUE(*)(...))mapper_new, 1);
-	rb_define_method (Mapper, "new", (VALUE(*)(...))mapper_new, 1);
 	rb_define_method (Mapper, "size", (VALUE(*)(...))mapper_size, 0);
 	rb_define_method (Mapper, "close", (VALUE(*)(...))mapper_close, 0);
 	rb_define_method (Mapper, "get_chunk", (VALUE(*)(...))mapper_get_chunk, 2);

data/ext/kb.cpp

@@ -26,9 +26,7 @@ KeyboardDescriptor::KeyboardDescriptor
 
 KeyboardDescriptor::KeyboardDescriptor (EventMachine_t *parent_em):
 	EventableDescriptor (0, parent_em),
-	bReadAttemptedAfterClose (false),
-	LastIo (gCurrentLoopTime),
-	InactivityTimeout (0)
+	bReadAttemptedAfterClose (false)
 {
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = EPOLLIN;

data/ext/pipe.cpp

@@ -30,8 +30,6 @@ PipeDescriptor::PipeDescriptor
 PipeDescriptor::PipeDescriptor (int fd, pid_t subpid, EventMachine_t *parent_em):
 	EventableDescriptor (fd, parent_em),
 	bReadAttemptedAfterClose (false),
-	LastIo (gCurrentLoopTime),
-	InactivityTimeout (0),
 	OutboundDataSize (0),
 	SubprocessPid (subpid)
 {
@@ -104,22 +102,22 @@ PipeDescriptor::~PipeDescriptor()
 	struct timespec req = {0, 50000000}; // 0.05s
 	int n;
 
-	// wait 0.25s for the process to die
-	for (n=0; n<5; n++) {
+	// wait 0.5s for the process to die
+	for (n=0; n<10; n++) {
 		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) != 0) return;
 		nanosleep (&req, NULL);
 	}
 
-	// send SIGTERM and wait another 0.5s
+	// send SIGTERM and wait another 1s
 	kill (SubprocessPid, SIGTERM);
-	for (n=0; n<10; n++) {
+	for (n=0; n<20; n++) {
 		nanosleep (&req, NULL);
 		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) != 0) return;
 	}
 
-	// send SIGKILL and wait another 1s
+	// send SIGKILL and wait another 5s
 	kill (SubprocessPid, SIGKILL);
-	for (n=0; n<20; n++) {
+	for (n=0; n<100; n++) {
 		nanosleep (&req, NULL);
 		if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) != 0) return;
 	}
@@ -143,7 +141,7 @@ void PipeDescriptor::Read()
 		return;
 	}
 
-	LastIo = gCurrentLoopTime;
+	LastActivity = MyEventMachine->GetCurrentLoopTime();
 
 	int total_bytes_read = 0;
 	char readbuffer [16 * 1024];
@@ -203,7 +201,7 @@ void PipeDescriptor::Write()
 	int sd = GetSocket();
 	assert (sd != INVALID_SOCKET);
 
-	LastIo = gCurrentLoopTime;
+	LastActivity = MyEventMachine->GetCurrentLoopTime();
 	char output_buffer [16 * 1024];
 	size_t nbytes = 0;
 
@@ -268,7 +266,7 @@ PipeDescriptor::Heartbeat
 void PipeDescriptor::Heartbeat()
 {
 	// If an inactivity timeout is defined, then check for it.
-	if (InactivityTimeout && ((gCurrentLoopTime - LastIo) >= InactivityTimeout))
+	if (InactivityTimeout && ((MyEventMachine->GetCurrentLoopTime() - LastActivity) >= InactivityTimeout))
 		ScheduleClose (false);
 		//bCloseNow = true;
 }

data/ext/project.h

@@ -55,8 +55,8 @@ See the file COPYING for complete licensing information.
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <pwd.h>
+#include <string.h>
 typedef int SOCKET;
-#define closesocket close
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR -1
 #ifdef OS_SOLARIS8
@@ -96,6 +96,9 @@ typedef int socklen_t;
 typedef int pid_t;
 #endif
 
+#if !defined(_MSC_VER) || _MSC_VER > 1400
+#include <stdint.h>
+#endif
 
 using namespace std;
 
@@ -134,18 +137,19 @@ static inline int inotify_rm_watch (int fd, __u32 wd) { return syscall (__NR_ino
 #include <sys/uio.h>
 #endif
 
+#if __cplusplus
+extern "C" {
+#endif
+  typedef void (*EMCallback)(const unsigned long, int, const char*, const unsigned long);
+#if __cplusplus
+}
+#endif
+
 #include "binder.h"
 #include "em.h"
-#include "epoll.h"
-#include "sigs.h"
 #include "ed.h"
-#include "files.h"
 #include "page.h"
 #include "ssl.h"
 #include "eventmachine.h"
-#include "eventmachine_cpp.h"
-
-
-
 
 #endif // __Project__H_