eventmachine 0.12.4 → 0.12.6

data/ext/em.cpp

@@ -45,6 +45,15 @@ static int MaxOutstandingTimers = 1000;
  */
 static struct sockaddr *name2address (const char *server, int port, int *family, int *bind_size);
 
+/***************************************
+STATIC EventMachine_t::GetMaxTimerCount
+***************************************/
+
+int EventMachine_t::GetMaxTimerCount()
+{
+	return MaxOutstandingTimers;
+}
+
 
 /***************************************
 STATIC EventMachine_t::SetMaxTimerCount
@@ -77,6 +86,7 @@ EventMachine_t::EventMachine_t (void (*event_callback)(const char*, int, const c
 	LoopBreakerWriter (-1),
 	bEpoll (false),
 	bKqueue (false),
+	kqfd (-1),
 	epfd (-1)
 {
 	// Default time-slice is just smaller than one hundred mills.
@@ -923,8 +933,11 @@ const char *EventMachine_t::InstallOneshotTimer (int milliseconds)
 	#endif
 
 	Timer_t t;
-	multimap<Int64,Timer_t>::iterator i =
-		Timers.insert (make_pair (fire_at, t));
+	#ifdef OS_SOLARIS8
+	multimap<Int64,Timer_t>::iterator i = Timers.insert (multimap<Int64,Timer_t>::value_type (fire_at, t));
+	#else
+	multimap<Int64,Timer_t>::iterator i = Timers.insert (make_pair (fire_at, t));
+	#endif
 	return i->second.GetBindingChars();
 }
 
@@ -1227,7 +1240,7 @@ const char *EventMachine_t::AttachFD (int fd, bool notify_readable, bool notify_
 	if (!cd)
 		throw std::runtime_error ("no connection allocated");
 
-	cd->SetConnectPending (true);
+	cd->SetConnectPending (false);
 	cd->SetNotifyReadable (notify_readable);
 	cd->SetNotifyWritable (notify_writable);
 
@@ -1910,7 +1923,14 @@ const char *EventMachine_t::OpenKeyboard()
 }
 
 
+/**********************************
+EventMachine_t::GetConnectionCount
+**********************************/
 
+int EventMachine_t::GetConnectionCount ()
+{
+	return Descriptors.size();
+}
 
 
 //#endif // OS_UNIX

data/ext/em.h

@@ -42,8 +42,8 @@ See the file COPYING for complete licensing information.
   #endif
 
   // 1.9.0 compat
-  #ifndef RUBY_UDF_IO
-    #define RUBY_UDF_IO RB_UDF_DFL
+  #ifndef RUBY_UBF_IO
+    #define RUBY_UBF_IO RB_UBF_DFL
   #endif
 #else
   #define EmSelect select
@@ -69,6 +69,7 @@ class EventMachine_t
 class EventMachine_t
 {
 	public:
+		static int GetMaxTimerCount();
 		static void SetMaxTimerCount (int);
 
 	public:
@@ -101,8 +102,11 @@ class EventMachine_t
 		static void SetuidString (const char*);
 		static int SetRlimitNofile (int);
 
+		pid_t SubprocessPid;
 		int SubprocessExitStatus;
 
+		int GetConnectionCount();
+
 		// Temporary:
 		void _UseEpoll();
 		void _UseKqueue();

data/ext/eventmachine.h

@@ -32,7 +32,8 @@ extern "C" {
 		EM_CONNECTION_COMPLETED = 104,
 		EM_LOOPBREAK_SIGNAL = 105,
 		EM_CONNECTION_NOTIFY_READABLE = 106,
-		EM_CONNECTION_NOTIFY_WRITABLE = 107
+		EM_CONNECTION_NOTIFY_WRITABLE = 107,
+		EM_SSL_HANDSHAKE_COMPLETED = 108
 
 	};
 
@@ -53,10 +54,16 @@ extern "C" {
 	const char *evma_open_keyboard();
 	void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filenane);
 	void evma_start_tls (const char *binding);
+
+	#ifdef WITH_SSL
+	X509 *evma_get_peer_cert (const char *binding);
+	#endif
+
 	int evma_get_peername (const char *binding, struct sockaddr*);
 	int evma_get_sockname (const char *binding, struct sockaddr*);
 	int evma_get_subprocess_pid (const char *binding, pid_t*);
 	int evma_get_subprocess_status (const char *binding, int*);
+	int evma_get_connection_count();
 	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
 	int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);
 	int evma_get_comm_inactivity_timeout (const char *binding, /*out*/int *value);
@@ -68,6 +75,7 @@ extern "C" {
 	int evma_report_connection_error_status (const char *binding);
 	void evma_signal_loopbreak();
 	void evma_set_timer_quantum (int);
+	int evma_get_max_timer_count();
 	void evma_set_max_timer_count (int);
 	void evma_setuid_string (const char *username);
 	void evma_stop_machine();

data/ext/eventmachine_cpp.h

@@ -48,6 +48,7 @@ namespace EM {
 			virtual void Accept (const char*) {}
 			virtual void Unbind() {}
 			virtual void PostInit() {}
+			virtual void SslHandshakeCompleted() {}
 
 			void StopReactor() {EM::StopReactor();}
 	};

data/ext/extconf.rb

@@ -1,22 +1,4 @@
-# $Id$
-#
-#----------------------------------------------------------------------------
-#
-# 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.
-#
-#---------------------------------------------------------------------------
-#
-# extconf.rb for Ruby/EventMachine
-# We have to munge LDSHARED because this code needs a C++ link.
-#
+require 'mkmf'
 
 def check_libs libs = [], fatal = false
   libs.all? { |lib| have_library(lib) || (abort("could not find library: #{lib}") if fatal) }
@@ -30,8 +12,6 @@ def add_define(name)
   $defs.push("-D#{name}")
 end
 
-require 'mkmf'
-
 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')
@@ -48,8 +28,6 @@ else
   add_define 'OS_UNIX'
 
   add_define "HAVE_KQUEUE" if have_header("sys/event.h") and have_header("sys/queue.h")
-
-  # check_libs(%w[pthread], true)
 end
 
 # Main platform invariances:
@@ -71,15 +49,16 @@ when /solaris/
 
   add_define 'OS_SOLARIS8'
 
-  # 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"
+    # SUN CHAIN
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    CONFIG['CCDLFLAGS'] = "-KPIC"
+  else
+    # GNU CHAIN
+    # on Unix we need a g++ link, not gcc.
+    CONFIG['LDSHARED'] = "$(CXX) -shared"
   end
-
 when /openbsd/
   # OpenBSD branch contributed by Guillaume Sellier.
 

data/ext/fastfilereader/extconf.rb

@@ -1,161 +1,77 @@
-# $Id: extconf.rb 4526 2007-07-03 18:04:34Z francis $
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 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 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.
-#
-#---------------------------------------------------------------------------
-#
-# extconf.rb for Fast File Reader
-# We have to munge LDSHARED because this code needs a C++ link.
-#
-
 require 'mkmf'
 
-flags = []
+def check_libs libs = [], fatal = false
+  libs.all? { |lib| have_library(lib) || (abort("could not find library: #{lib}") if fatal) }
+end
 
-case RUBY_PLATFORM.split('-',2)[1]
-when 'mswin32', 'mingw32', 'bccwin32'
-  unless have_header('windows.h') and
-      have_header('winsock.h') and
-      have_library('kernel32') and
-      have_library('rpcrt4') and
-      have_library('gdi32')
-    exit
-  end
+def check_heads heads = [], fatal = false
+  heads.all? { |head| have_header(head) || (abort("could not find header: #{head}") if fatal)}
+end
+
+def add_define(name)
+  $defs.push("-D#{name}")
+end
+
+add_define 'BUILD_FOR_RUBY'
+
+# Minor platform details between *nix and Windows:
 
-  flags << "-D OS_WIN32"
-  flags << '-D BUILD_FOR_RUBY'
-  flags << "-EHs"
-  flags << "-GR"
-
-  dir_config('ssl')
-  if have_library('ssleay32') and
-	  have_library('libeay32') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-D WITH_SSL'
+if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
+  GNU_CHAIN = $1 == 'mingw'
+  OS_WIN32 = true
+  add_define "OS_WIN32"
+else
+  GNU_CHAIN = true
+  OS_UNIX = true
+  add_define 'OS_UNIX'
+end
+
+
+
+case RUBY_PLATFORM
+when /mswin32/, /mingw32/, /bccwin32/
+  check_heads(%w[windows.h winsock.h], true)
+  check_libs(%w[kernel32 rpcrt4 gdi32], true)
+
+  if GNU_CHAIN
+    CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
   else
-    flags << '-D WITHOUT_SSL'
+    $defs.push "-EHs"
+    $defs.push "-GR"
   end
 
 when /solaris/
-  unless have_library('pthread') and
-	have_library('nsl') and
-	have_library('socket')
-	  exit
-  end
+  check_libs(%w[nsl socket], true)
 
-  flags << '-D OS_UNIX'
-  flags << '-D OS_SOLARIS8'
-  flags << '-D BUILD_FOR_RUBY'
+  add_define 'OS_SOLARIS8'
 
-  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'
+  # Patch by Tim Pease, fixes SUNWspro compile problems.
+  if CONFIG['CC'] == 'cc'
+    # SUN CHAIN
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    CONFIG['CCDLFLAGS'] = "-KPIC"
   else
-    flags << '-D WITHOUT_SSL'
+    # GNU CHAIN
+    # on Unix we need a g++ link, not gcc.
+    CONFIG['LDSHARED'] = "$(CXX) -shared"
   end
+when /openbsd/
+  # OpenBSD branch contributed by Guillaume Sellier.
 
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-
+  # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
+  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
 when /darwin/
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_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 << '-DWITH_SSL'
-  else
-    flags << '-DWITHOUT_SSL'
-  end
   # on Unix we need a g++ link, not gcc.
   # Ff line contributed by Daniel Harple.
   CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
 
 when /linux/
-  unless have_library('pthread')
-	  exit
-  end
 
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_FOR_RUBY'
-
-  # Original epoll test is inadequate because 2.4 kernels have the header
-  # but not the code.
-  #flags << '-DHAVE_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`
-	  flags << '-DHAVE_EPOLL' if e == 0
-  end
-
-  dir_config('ssl')
-  if have_library('ssl') and
-	  have_library('crypto') and
-	  have_header('openssl/ssl.h') and
-	  have_header('openssl/err.h')
-    flags << '-DWITH_SSL'
-  else
-    flags << '-DWITHOUT_SSL'
-  end
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
-
-  # Modify the mkmf constant LINK_SO so the generated shared object is stripped.
-  # You might think modifying CONFIG['LINK_SO'] would be a better way to do this,
-  # but it doesn't work because mkmf doesn't look at CONFIG['LINK_SO'] again after
-  # it initializes.
-  linkso = Object.send :remove_const, "LINK_SO"
-  LINK_SO = linkso + "; strip $@"
-
 else
-  unless have_library('pthread')
-	  exit
-  end
-
-  flags << '-DOS_UNIX'
-  flags << '-DBUILD_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 << '-DWITH_SSL'
-  else
-    flags << '-DWITHOUT_SSL'
-  end
   # on Unix we need a g++ link, not gcc.
   CONFIG['LDSHARED'] = "$(CXX) -shared"
-
 end
 
-if $CPPFLAGS
-  $CPPFLAGS += ' ' + flags.join(' ')
-else
-  $CFLAGS += ' ' + flags.join(' ')
-end
-
-
-create_makefile "fastfilereaderext"
+create_makefile "fastfilereaderext"

data/ext/fastfilereader/mapper.cpp

@@ -59,7 +59,11 @@ Mapper_t::Mapper_t (const string &filename)
 		throw runtime_error (strerror (errno));
 	FileSize = st.st_size;
 
+	#ifdef OS_WIN32
+	MapPoint = (char*) mmap (0, FileSize, PROT_READ, MAP_SHARED, Fd, 0);
+	#else
 	MapPoint = (const char*) mmap (0, FileSize, PROT_READ, MAP_SHARED, Fd, 0);
+	#endif
 	if (MapPoint == MAP_FAILED)
 		throw runtime_error (strerror (errno));
 }
@@ -84,7 +88,11 @@ void Mapper_t::Close()
 	// Can be called multiple times.
 	// Calls to GetChunk are invalid after a call to Close.
 	if (MapPoint) {
+		#ifdef OS_SOLARIS8
+		munmap ((char*)MapPoint, FileSize);
+		#else
 		munmap ((void*)MapPoint, FileSize);
+		#endif
 		MapPoint = NULL;
 	}
 	if (Fd >= 0) {
@@ -150,7 +158,11 @@ Mapper_t::Mapper_t (const string &filename)
 	if (!hMapping)
 		throw runtime_error ("File not mapped");
 
+	#ifdef OS_WIN32
+	MapPoint = (char*) MapViewOfFile (hMapping, FILE_MAP_WRITE, 0, 0, 0);
+	#else
 	MapPoint = (const char*) MapViewOfFile (hMapping, FILE_MAP_WRITE, 0, 0, 0);
+	#endif
 	if (!MapPoint)
 		throw runtime_error ("Mappoint not read");
 }

data/ext/fastfilereader/mapper.h

@@ -49,7 +49,7 @@ class Mapper_t
 	private:
 		HANDLE hFile;
 		HANDLE hMapping;
-		const char *MapPoint;
+		char *MapPoint;
 	#endif // OS_WIN32
 
 };