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

data/ext/fastfilereader/mapper.h

@@ -1,59 +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;
-		char *MapPoint;
-	#endif // OS_WIN32
-
-};
-
-
-#endif // __Mapper__H_
-
+/*****************************************************************************
+
+$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;
+		char *MapPoint;
+	#endif // OS_WIN32
+
+};
+
+
+#endif // __Mapper__H_
+

data/ext/fastfilereader/rubymain.cpp

@@ -1,127 +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);
-}
-
-
-
+/*****************************************************************************
+
+$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/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/page.cpp

@@ -1,107 +1,107 @@
-/*****************************************************************************
-
-$Id$
-
-File:     page.cpp
-Date:     30Apr06
-
-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.
-
-*****************************************************************************/
-
-
-#include "project.h"
-
-
-/******************
-PageList::PageList
-******************/
-
-PageList::PageList()
-{
-}
-
-
-/*******************
-PageList::~PageList
-*******************/
-
-PageList::~PageList()
-{
-	while (HasPages())
-		PopFront();
-}
-
-
-/***************
-PageList::Front
-***************/
-
-void PageList::Front (const char **page, int *length)
-{
-	assert (page && length);
-
-	if (HasPages()) {
-		Page p = Pages.front();
-		*page = p.Buffer;
-		*length = p.Size;
-	}
-	else {
-		*page = NULL;
-		*length = 0;
-	}
-}
-
-
-/******************
-PageList::PopFront
-******************/
-
-void PageList::PopFront()
-{
-	if (HasPages()) {
-		Page p = Pages.front();
-		Pages.pop_front();
-		if (p.Buffer)
-			free ((void*)p.Buffer);
-	}
-}
-
-
-/******************
-PageList::HasPages
-******************/
-
-bool PageList::HasPages()
-{
-	return (Pages.size() > 0) ? true : false;
-}
-
-
-/**************
-PageList::Push
-**************/
-
-void PageList::Push (const char *buf, int size)
-{
-	if (buf && (size > 0)) {
-		char *copy = (char*) malloc (size);
-		if (!copy)
-			throw runtime_error ("no memory in pagelist");
-		memcpy (copy, buf, size);
-		Pages.push_back (Page (copy, size));
-	}
-}
-
-
-
-
-
+/*****************************************************************************
+
+$Id$
+
+File:     page.cpp
+Date:     30Apr06
+
+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.
+
+*****************************************************************************/
+
+
+#include "project.h"
+
+
+/******************
+PageList::PageList
+******************/
+
+PageList::PageList()
+{
+}
+
+
+/*******************
+PageList::~PageList
+*******************/
+
+PageList::~PageList()
+{
+	while (HasPages())
+		PopFront();
+}
+
+
+/***************
+PageList::Front
+***************/
+
+void PageList::Front (const char **page, int *length)
+{
+	assert (page && length);
+
+	if (HasPages()) {
+		Page p = Pages.front();
+		*page = p.Buffer;
+		*length = p.Size;
+	}
+	else {
+		*page = NULL;
+		*length = 0;
+	}
+}
+
+
+/******************
+PageList::PopFront
+******************/
+
+void PageList::PopFront()
+{
+	if (HasPages()) {
+		Page p = Pages.front();
+		Pages.pop_front();
+		if (p.Buffer)
+			free ((void*)p.Buffer);
+	}
+}
+
+
+/******************
+PageList::HasPages
+******************/
+
+bool PageList::HasPages()
+{
+	return (Pages.size() > 0) ? true : false;
+}
+
+
+/**************
+PageList::Push
+**************/
+
+void PageList::Push (const char *buf, int size)
+{
+	if (buf && (size > 0)) {
+		char *copy = (char*) malloc (size);
+		if (!copy)
+			throw runtime_error ("no memory in pagelist");
+		memcpy (copy, buf, size);
+		Pages.push_back (Page (copy, size));
+	}
+}
+
+
+
+
+