smparkes-eventmachine 0.12.10.2 → 0.12.10.3

data/ext/em.h

@@ -57,15 +57,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;
 
@@ -136,6 +127,8 @@ class EventMachine_t
 		void _HandleKqueuePidEvent (struct kevent*);
 		#endif
 
+		uint64_t GetCurrentTime() { return MyCurrentLoopTime; }
+
 		// Temporary:
 		void _UseEpoll();
 		void _UseKqueue();
@@ -143,6 +136,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();
@@ -150,12 +148,15 @@ class EventMachine_t
 		void _AddNewDescriptors();
 		void _ModifyDescriptors();
 		void _InitializeLoopBreaker();
+		void _CleanupSockets();
 
 		bool _RunSelectOnce();
 		bool _RunEpollOnce();
 		bool _RunKqueueOnce();
 
 		void _ModifyEpollEvent (EventableDescriptor*);
+		void _DispatchHeartbeats();
+		timeval _TimeTilNextEvent();
 
 	public:
 		void _ReadLoopBreaker();
@@ -172,14 +173,15 @@ class EventMachine_t
 		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;
@@ -189,6 +191,13 @@ class EventMachine_t
 
 		timeval Quantum;
 
+		uint64_t MyCurrentLoopTime;
+
+		#ifdef OS_WIN32
+		unsigned TickCountTickover;
+		unsigned LastTickCount;
+		#endif
+
 	private:
 		bool bEpoll;
 		int epfd; // Epoll file-descriptor

data/ext/eventmachine.h

@@ -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/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/pipe.cpp

@@ -30,8 +30,6 @@ PipeDescriptor::PipeDescriptor
 PipeDescriptor::PipeDescriptor (int fd, pid_t subpid, EventMachine_t *parent_em):
 	EventableDescriptor (fd, parent_em),
 	bReadAttemptedAfterClose (false),
-	LastIo (gCurrentLoopTime),
-	InactivityTimeout (0),
 	OutboundDataSize (0),
 	SubprocessPid (subpid)
 {
@@ -143,7 +141,7 @@ void PipeDescriptor::Read()
 		return;
 	}
 
-	LastIo = gCurrentLoopTime;
+	LastActivity = MyEventMachine->GetCurrentTime();
 
 	int total_bytes_read = 0;
 	char readbuffer [16 * 1024];
@@ -203,7 +201,7 @@ void PipeDescriptor::Write()
 	int sd = GetSocket();
 	assert (sd != INVALID_SOCKET);
 
-	LastIo = gCurrentLoopTime;
+	LastActivity = MyEventMachine->GetCurrentTime();
 	char output_buffer [16 * 1024];
 	size_t nbytes = 0;
 
@@ -268,7 +266,7 @@ PipeDescriptor::Heartbeat
 void PipeDescriptor::Heartbeat()
 {
 	// If an inactivity timeout is defined, then check for it.
-	if (InactivityTimeout && ((gCurrentLoopTime - LastIo) >= InactivityTimeout))
+	if (InactivityTimeout && ((MyEventMachine->GetCurrentTime() - LastActivity) >= InactivityTimeout))
 		ScheduleClose (false);
 		//bCloseNow = true;
 }

data/ext/project.h

@@ -96,6 +96,7 @@ typedef int socklen_t;
 typedef int pid_t;
 #endif
 
+#include <stdint.h>
 
 using namespace std;
 

data/ext/rubymain.cpp

@@ -494,6 +494,7 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, e.what());
 	}
+	return Qnil;
 }
 
 /*********************
@@ -514,6 +515,7 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eConnectionError, e.what());
 	}
+	return Qnil;
 }
 
 /*********************
@@ -752,9 +754,11 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 	#else
 		int len = RARRAY (cmd)->len;
 	#endif
-	if (len > 98)
-		rb_raise (rb_eRuntimeError, "too many arguments to popen");
-	char *strings [100];
+	char** strings = new char*[len+2];
+        if(!strings) {
+		rb_raise (rb_eRuntimeError, "%s", "no popen: no memory");
+                return ULONG2NUM (0);
+        }
 	for (int i=0; i < len; i++) {
 		VALUE ix = INT2FIX (i);
 		VALUE s = rb_ary_aref (1, &ix, cmd);
@@ -770,6 +774,7 @@ static VALUE t_invoke_popen (VALUE self, VALUE cmd)
 		snprintf (buf, sizeof(buf)-1, "no popen: %s", (err?err:"???"));
 		rb_raise (rb_eRuntimeError, "%s", buf);
 	}
+        delete [] strings;
 	return ULONG2NUM (f);
 }
 
@@ -798,6 +803,7 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eUnsupported, e.what());
 	}
+	return Qnil;
 }
 
 
@@ -823,6 +829,7 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
 	} catch (std::runtime_error e) {
 		rb_raise (EM_eUnsupported, e.what());
 	}
+	return Qnil;
 }
 
 
@@ -999,11 +1006,12 @@ static VALUE t_get_loop_time (VALUE self)
   static ID at = rb_intern("at");
 #endif
 
-  if (gCurrentLoopTime != 0) {
+  uint64_t current_time = evma_get_current_loop_time();
+  if (current_time != 0) {
 #ifndef HAVE_RB_TIME_NEW
-    return rb_funcall(cTime, at, 2, INT2NUM(gCurrentLoopTime / 1000000), INT2NUM(gCurrentLoopTime % 1000000));
+    return rb_funcall(cTime, at, 2, INT2NUM(current_time / 1000000), INT2NUM(current_time % 1000000));
 #else
-    return rb_time_new(gCurrentLoopTime / 1000000, gCurrentLoopTime % 1000000);
+    return rb_time_new(current_time / 1000000, current_time % 1000000);
 #endif
   }
   return Qnil;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smparkes-eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.10.2
+  version: 0.12.10.3
 platform: ruby
 authors: 
 - Francis Cianfrocca