eventmachine 0.12.10-x86-mswin32-60 → 1.0.0.beta.2-x86-mswin32-60

data/ext/em.h

@@ -17,16 +17,6 @@ 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_
 
@@ -57,16 +47,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;
 
@@ -82,7 +62,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();
@@ -95,7 +75,6 @@ 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*);
@@ -137,6 +116,8 @@ class EventMachine_t
 		void _HandleKqueuePidEvent (struct kevent*);
 		#endif
 
+		uint64_t GetCurrentLoopTime() { return MyCurrentLoopTime; }
+
 		// Temporary:
 		void _UseEpoll();
 		void _UseKqueue();
@@ -144,6 +125,11 @@ class EventMachine_t
 		bool UsingKqueue() { return bKqueue; }
 		bool UsingEpoll() { return bEpoll; }
 
+		void QueueHeartbeat(EventableDescriptor*);
+		void ClearHeartbeat(uint64_t);
+
+		uint64_t GetRealTime();
+
 	private:
 		bool _RunOnce();
 		bool _RunTimers();
@@ -151,12 +137,16 @@ class EventMachine_t
 		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();
@@ -168,19 +158,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;
@@ -190,7 +181,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
@@ -225,8 +225,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);
@@ -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')
 
@@ -53,11 +105,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.
@@ -79,19 +133,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"
 
@@ -103,38 +144,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)')
@@ -145,4 +154,4 @@ add_define 'HAVE_MAKE_PAIR' if try_link(<<SRC, '-lstdc++')
 SRC
 TRY_LINK.sub!('$(CXX)', '$(CC)')
 
-create_makefile "rubyeventmachine"
+create_makefile "rubyeventmachine"

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

@@ -1,214 +1,214 @@
-/*****************************************************************************
-
-$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 "unistd.h"
-#include <string>
-#include <cstring>
-#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;
-
-	#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));
-}
-
-
-/*******************
-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) {
-		#ifdef OS_SOLARIS8
-		munmap ((char*)MapPoint, FileSize);
-		#else
-		munmap ((void*)MapPoint, FileSize);
-		#endif
-		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");
-
-	#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");
-}
-
-
-/*******************
-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
+/*****************************************************************************
+
+$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 "unistd.h"
+#include <string>
+#include <cstring>
+#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;
+
+	#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));
+}
+
+
+/*******************
+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) {
+		#ifdef CC_SUNWspro
+		munmap ((char*)MapPoint, FileSize);
+		#else
+		munmap ((void*)MapPoint, FileSize);
+		#endif
+		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");
+
+	#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");
+}
+
+
+/*******************
+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