swiftiply 0.5.1 → 0.6.0

data/CONTRIBUTORS

@@ -1,4 +1,6 @@
 Swiftiply is written by Kirk Haines (wyhaines@gmail.com).
 
+The fastfilereader extension was contributed by Francis Cianfrocca.
+
 Ezra Zygmuntowicz contributed swiftiply_mongrel_rails and edits to
 mongrel_rails.

data/README

@@ -1,4 +1,4 @@
-Swiftiply v. 0.5.0  (http://swiftiply.swiftcore.org)
+Swiftiply v. 0.6.0  (http://swiftiply.swiftcore.org)
 
 Swiftiply is a backend agnostic clustering proxy for web applications that is
 specifically designed to support HTTP traffic from web frameworks. Unlike Pen

data/bin/echo_client

@@ -0,0 +1,26 @@
+# This is a very simple, naive Swiftiply client.  All that is does is echo whatever
+# request it receives as its response, in a very simplistic way.
+
+require 'swiftcore/Swiftiply/swiftiply_client'
+
+class EchoClient < SwiftiplyClientProtocol
+		def post_init
+			@httpdata = ''
+			super
+		end
+			
+        def receive_data data
+        	@httpdata << data
+        	if @httpdata =~ /\r\n\r\n/
+				send_http_data(@httpdata)
+				@httpdata = ''
+			end
+        end
+end
+
+if ARGV[0] and ARGV[0].index(/:/) > 0
+	h,p = ARGV[0].split(/:/,2)
+	EventMachine.run { EchoClient.connect(h,p.to_i,ARGV[1] || '') }
+else
+	puts "echo_client HOST:PORT [KEY]"
+end

data/bin/swiftiply

@@ -19,6 +19,7 @@ module Swiftcore
 	class SwiftiplyExec
 		Ccluster_address = 'cluster_address'.freeze
 		Ccluster_port = 'cluster_port'.freeze
+		Cconfig_file = 'config_file'.freeze
 		Cbackend_address = 'backend_address'.freeze
 		Cbackend_port = 'backend_port'.freeze
 		Cmap = 'map'.freeze
@@ -52,13 +53,15 @@ module Swiftcore
 #			outgoing:
 # 
 #####
-		def self.parse_options(config = {})
+		def self.parse_options
+			config = @cliconfig || {}
+			@print = false
+			
 			OptionParser.new do |opts|
 				opts.banner = 'Usage: swiftiply.rb [options]'
 				opts.separator ''
 				opts.on('-c','--config CONFFILE',"The configuration file to read.") do |conf|
-					config = YAML.load(File.open(conf))
-					postprocess_config_load(config)
+					config[Cconfig_file] = conf
 				end
 				opts.on('--cluster-address [ADDRESS]',String,'The hostname/IP address that swiftiply will listen for connections on.') do |address|
 					config[Ccluster_address] = address
@@ -79,14 +82,24 @@ module Swiftcore
 					config[Ctimeout] = timeout
 				end
 				opts.on('-p','--print-config','Print the full configuration.') do
-					verify_config(config)
-					require 'pp'
-					pp config
-					exit
+					@print = true
 				end
 
 			end.parse!
+			@cliconfig ||= config
+			
+			fileconfig = {}
+			fileconfig = YAML.load(File.open(config['config_file'])) if config['config_file']
+			config = fileconfig.merge(@cliconfig)
+			postprocess_config_load(config)
 			puts("Configuration failed validation; exiting.") && exit unless verify_config(config)
+
+			if @print
+				require 'pp'
+				pp config
+				exit
+			end
+			
 			config
 		end
 
@@ -128,7 +141,7 @@ module Swiftcore
 
 		def self.on_windows?
 			return @on_windows unless @on_windows.nil?
-      @on_windows = !![/mswin/i, /cygwin/i, /mingw/i, /bccwin/i, /wince/i].find {|p| RUBY_PLATFORM =~ p}
+			@on_windows = !![/mswin/i, /cygwin/i, /mingw/i, /bccwin/i, /wince/i].find {|p| RUBY_PLATFORM =~ p}
 		end
 	end
 end

data/ext/fastfilereader/extconf.rb

@@ -0,0 +1,161 @@
+# $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 = []
+
+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
+
+  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'
+  else
+    flags << '-D WITHOUT_SSL'
+  end
+
+when /solaris/
+  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 /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"

data/ext/fastfilereader/mapper.cpp

@@ -0,0 +1,200 @@
+/*****************************************************************************
+
+$Id: mapper.cpp 4527 2007-07-04 10:21:34Z francis $
+
+File:     mapper.cpp
+Date:     02Jul07
+
+Copyright (C) 2007 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.
+
+*****************************************************************************/
+
+
+//////////////////////////////////////////////////////////////////////
+// UNIX implementation
+//////////////////////////////////////////////////////////////////////
+
+
+#ifdef OS_UNIX
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <iostream>
+#include <string>
+#include <stdexcept>
+using namespace std;
+
+#include "mapper.h"
+
+/******************
+Mapper_t::Mapper_t
+******************/
+
+Mapper_t::Mapper_t (const string &filename)
+{
+	/* We ASSUME we can open the file.
+	 * (More precisely, we assume someone else checked before we got here.)
+	 */
+
+	Fd = open (filename.c_str(), O_RDONLY);
+	if (Fd < 0)
+		throw runtime_error (strerror (errno));
+
+	struct stat st;
+	if (fstat (Fd, &st))
+		throw runtime_error (strerror (errno));
+	FileSize = st.st_size;
+
+	MapPoint = (const char*) mmap (0, FileSize, PROT_READ, MAP_SHARED, Fd, 0);
+	if (MapPoint == MAP_FAILED)
+		throw runtime_error (strerror (errno));
+}
+
+
+/*******************
+Mapper_t::~Mapper_t
+*******************/
+
+Mapper_t::~Mapper_t()
+{
+	Close();
+}
+
+
+/***************
+Mapper_t::Close
+***************/
+
+void Mapper_t::Close()
+{
+	// Can be called multiple times.
+	// Calls to GetChunk are invalid after a call to Close.
+	if (MapPoint) {
+		munmap ((void*)MapPoint, FileSize);
+		MapPoint = NULL;
+	}
+	if (Fd >= 0) {
+		close (Fd);
+		Fd = -1;
+	}
+}
+
+/******************
+Mapper_t::GetChunk
+******************/
+
+const char *Mapper_t::GetChunk (unsigned start)
+{
+	return MapPoint + start;
+}
+
+
+
+#endif // OS_UNIX
+
+
+//////////////////////////////////////////////////////////////////////
+// WINDOWS implementation
+//////////////////////////////////////////////////////////////////////
+
+#ifdef OS_WIN32
+
+#include <windows.h>
+
+#include <iostream>
+#include <string>
+#include <stdexcept>
+using namespace std;
+
+#include "mapper.h"
+
+/******************
+Mapper_t::Mapper_t
+******************/
+
+Mapper_t::Mapper_t (const string &filename)
+{
+	/* We ASSUME we can open the file.
+	 * (More precisely, we assume someone else checked before we got here.)
+	 */
+
+	hFile = INVALID_HANDLE_VALUE;
+	hMapping = NULL;
+	MapPoint = NULL;
+	FileSize = 0;
+
+	hFile = CreateFile (filename.c_str(), GENERIC_READ|GENERIC_WRITE, FILE_SHARE_DELETE|FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+	if (hFile == INVALID_HANDLE_VALUE)
+		throw runtime_error ("File not found");
+
+	BY_HANDLE_FILE_INFORMATION i;
+	if (GetFileInformationByHandle (hFile, &i))
+		FileSize = i.nFileSizeLow;
+
+	hMapping = CreateFileMapping (hFile, NULL, PAGE_READWRITE, 0, 0, NULL);
+	if (!hMapping)
+		throw runtime_error ("File not mapped");
+
+	MapPoint = (const char*) MapViewOfFile (hMapping, FILE_MAP_WRITE, 0, 0, 0);
+	if (!MapPoint)
+		throw runtime_error ("Mappoint not read");
+}
+
+
+/*******************
+Mapper_t::~Mapper_t
+*******************/
+
+Mapper_t::~Mapper_t()
+{
+	Close();
+}
+
+/***************
+Mapper_t::Close
+***************/
+
+void Mapper_t::Close()
+{
+	// Can be called multiple times.
+	// Calls to GetChunk are invalid after a call to Close.
+	if (MapPoint) {
+		UnmapViewOfFile (MapPoint);
+		MapPoint = NULL;
+	}
+	if (hMapping != NULL) {
+		CloseHandle (hMapping);
+		hMapping = NULL;
+	}
+	if (hFile != INVALID_HANDLE_VALUE) {
+		CloseHandle (hFile);
+		hMapping = INVALID_HANDLE_VALUE;
+	}
+}
+
+
+/******************
+Mapper_t::GetChunk
+******************/
+
+const char *Mapper_t::GetChunk (unsigned start)
+{
+	return MapPoint + start;
+}
+
+
+
+#endif // OS_WINDOWS