eventmachine-eventmachine 0.12.3 → 0.12.4

data/ext/fastfilereader/mapper.cpp

@@ -0,0 +1,202 @@
+/*****************************************************************************
+
+$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;
+
+	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

data/ext/fastfilereader/mapper.h

@@ -0,0 +1,59 @@
+/*****************************************************************************
+
+$Id: mapper.h 4529 2007-07-04 11:32:22Z francis $
+
+File:     mapper.h
+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.
+
+*****************************************************************************/
+
+
+#ifndef __Mapper__H_
+#define __Mapper__H_
+
+
+/**************
+class Mapper_t
+**************/
+
+class Mapper_t
+{
+	public:
+		Mapper_t (const string&);
+		virtual ~Mapper_t();
+
+		const char *GetChunk (unsigned);
+		void Close();
+		size_t GetFileSize() {return FileSize;}
+
+	private:
+		size_t FileSize;
+
+	#ifdef OS_UNIX
+	private:
+		int Fd;
+		const char *MapPoint;
+	#endif // OS_UNIX
+
+	#ifdef OS_WIN32
+	private:
+		HANDLE hFile;
+		HANDLE hMapping;
+		const char *MapPoint;
+	#endif // OS_WIN32
+
+};
+
+
+#endif // __Mapper__H_
+

data/ext/fastfilereader/rubymain.cpp

@@ -0,0 +1,127 @@
+/*****************************************************************************
+
+$Id: rubymain.cpp 4529 2007-07-04 11:32:22Z francis $
+
+File:     rubymain.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.
+
+*****************************************************************************/
+
+
+
+#include <iostream>
+#include <stdexcept>
+using namespace std;
+
+#include <ruby.h>
+#include "mapper.h"
+
+static VALUE EmModule;
+static VALUE FastFileReader;
+static VALUE Mapper;
+
+
+
+/*********
+mapper_dt
+*********/
+
+static void mapper_dt (void *ptr)
+{
+	if (ptr)
+		delete (Mapper_t*) ptr;
+}
+
+/**********
+mapper_new
+**********/
+
+static VALUE mapper_new (VALUE self, VALUE filename)
+{
+	Mapper_t *m = new Mapper_t (StringValuePtr (filename));
+	if (!m)
+		rb_raise (rb_eException, "No Mapper Object");
+	VALUE v = Data_Wrap_Struct (Mapper, 0, mapper_dt, (void*)m);
+	return v;
+}
+
+
+/****************
+mapper_get_chunk
+****************/
+
+static VALUE mapper_get_chunk (VALUE self, VALUE start, VALUE length)
+{
+	Mapper_t *m = NULL;
+	Data_Get_Struct (self, Mapper_t, m);
+	if (!m)
+		rb_raise (rb_eException, "No Mapper Object");
+
+	// TODO, what if some moron sends us a negative start value?
+	unsigned _start = NUM2INT (start);
+	unsigned _length = NUM2INT (length);
+	if ((_start + _length) > m->GetFileSize())
+		rb_raise (rb_eException, "Mapper Range Error");
+
+	const char *chunk = m->GetChunk (_start);
+	if (!chunk)
+		rb_raise (rb_eException, "No Mapper Chunk");
+	return rb_str_new (chunk, _length);
+}
+
+/************
+mapper_close
+************/
+
+static VALUE mapper_close (VALUE self)
+{
+	Mapper_t *m = NULL;
+	Data_Get_Struct (self, Mapper_t, m);
+	if (!m)
+		rb_raise (rb_eException, "No Mapper Object");
+	m->Close();
+	return Qnil;
+}
+
+/***********
+mapper_size
+***********/
+
+static VALUE mapper_size (VALUE self)
+{
+	Mapper_t *m = NULL;
+	Data_Get_Struct (self, Mapper_t, m);
+	if (!m)
+		rb_raise (rb_eException, "No Mapper Object");
+	return INT2NUM (m->GetFileSize());
+}
+
+
+/**********************
+Init_fastfilereaderext
+**********************/
+
+extern "C" void Init_fastfilereaderext()
+{
+	EmModule = rb_define_module ("EventMachine");
+	FastFileReader = rb_define_class_under (EmModule, "FastFileReader", rb_cObject);
+	Mapper = rb_define_class_under (FastFileReader, "Mapper", rb_cObject);
+
+	rb_define_module_function (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/pipe.cpp

@@ -92,15 +92,22 @@ PipeDescriptor::~PipeDescriptor()
 	 * within other unbind calls. (Not sure if that's even possible.)
 	 */
 
-	struct timespec req = {0, 500000000};
-	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/rubymain.cpp

@@ -515,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
 *********/
@@ -526,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
@@ -590,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
 *********************/
@@ -639,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);
@@ -666,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);