eventmachine 0.12.6-x86-mswin32-60 → 0.12.8-x86-mswin32-60

data/ext/em.h

@@ -1,186 +1,223 @@
-/*****************************************************************************
-
-$Id$
-
-File:     em.h
-Date:     06Apr06
-
-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.
-
-*****************************************************************************/
-
-
-
-#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_
-
-#ifdef BUILD_FOR_RUBY
-  #include <ruby.h>
-  #define EmSelect rb_thread_select
-
-  #ifdef HAVE_RBTRAP
-    #include <rubysig.h>
-  #else
-    #define TRAP_BEG
-    #define TRAP_END
-  #endif
-
-  // 1.9.0 compat
-  #ifndef RUBY_UBF_IO
-    #define RUBY_UBF_IO RB_UBF_DFL
-  #endif
-#else
-  #define EmSelect select
-#endif
-
-
-#ifdef OS_UNIX
-typedef long long Int64;
-#endif
-#ifdef OS_WIN32
-typedef __int64 Int64;
-#endif
-
-extern time_t gCurrentLoopTime;
-
-class EventableDescriptor;
-
-
-/********************
-class EventMachine_t
-********************/
-
-class EventMachine_t
-{
-	public:
-		static int GetMaxTimerCount();
-		static void SetMaxTimerCount (int);
-
-	public:
-		EventMachine_t (void(*event_callback)(const char*, int, const char*, int));
-		virtual ~EventMachine_t();
-
-		void Run();
-		void ScheduleHalt();
-		void SignalLoopBreaker();
-		const char *InstallOneshotTimer (int);
-		const char *ConnectToServer (const char *, int);
-		const char *ConnectToUnixServer (const char *);
-		const char *AttachFD (int, bool, bool);
-
-		const char *CreateTcpServer (const char *, int);
-		const char *OpenDatagramSocket (const char *, int);
-		const char *CreateUnixDomainServer (const char*);
-		const char *_OpenFileForWriting (const char*);
-		const char *OpenKeyboard();
-		//const char *Popen (const char*, const char*);
-		const char *Socketpair (char* const*);
-
-		void Add (EventableDescriptor*);
-		void Modify (EventableDescriptor*);
-		int DetachFD (EventableDescriptor*);
-		void ArmKqueueWriter (EventableDescriptor*);
-		void ArmKqueueReader (EventableDescriptor*);
-
-		void SetTimerQuantum (int);
-		static void SetuidString (const char*);
-		static int SetRlimitNofile (int);
-
-		pid_t SubprocessPid;
-		int SubprocessExitStatus;
-
-		int GetConnectionCount();
-
-		// Temporary:
-		void _UseEpoll();
-		void _UseKqueue();
-
-
-	private:
-		bool _RunOnce();
-		bool _RunTimers();
-		void _AddNewDescriptors();
-		void _ModifyDescriptors();
-		void _InitializeLoopBreaker();
-
-		bool _RunSelectOnce();
-		bool _RunEpollOnce();
-		bool _RunKqueueOnce();
-
-		void _ModifyEpollEvent (EventableDescriptor*);
-
-	public:
-		void _ReadLoopBreaker();
-
-	private:
-		enum {
-			HeartbeatInterval = 2,
-			MaxEpollDescriptors = 64*1024
-		};
-		void (*EventCallback)(const char*, int, const char*, int);
-
-		class Timer_t: public Bindable_t {
-		};
-
-		multimap<Int64, Timer_t> Timers;
-		vector<EventableDescriptor*> Descriptors;
-		vector<EventableDescriptor*> NewDescriptors;
-		set<EventableDescriptor*> ModifiedDescriptors;
-
-		time_t NextHeartbeatTime;
-
-		int LoopBreakerReader;
-		int LoopBreakerWriter;
-		#ifdef OS_WIN32
-		struct sockaddr_in LoopBreakerTarget;
-		#endif
-
-		timeval Quantum;
-
-	private:
-		bool bEpoll;
-		int epfd; // Epoll file-descriptor
-
-		bool bKqueue;
-		int kqfd; // Kqueue file-descriptor
-};
-
-
-/*******************
-struct SelectData_t
-*******************/
-
-struct SelectData_t
-{
-	SelectData_t();
-
-	int _Select();
-
-	int maxsocket;
-	fd_set fdreads;
-	fd_set fdwrites;
-	timeval tv;
-	int nSockets;
-};
-
-
-
-#endif // __EventMachine__H_
-
-//#endif // OS_UNIX
+/*****************************************************************************
+
+$Id$
+
+File:     em.h
+Date:     06Apr06
+
+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.
+
+*****************************************************************************/
+
+
+
+#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_
+
+#ifdef BUILD_FOR_RUBY
+  #include <ruby.h>
+  #define EmSelect rb_thread_select
+
+  #ifdef HAVE_RBTRAP
+    #include <rubysig.h>
+  #else
+    #define TRAP_BEG
+    #define TRAP_END
+  #endif
+
+  // 1.9.0 compat
+  #ifndef RUBY_UBF_IO
+    #define RUBY_UBF_IO RB_UBF_DFL
+  #endif
+#else
+  #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;
+
+
+/********************
+class EventMachine_t
+********************/
+
+class EventMachine_t
+{
+	public:
+		static int GetMaxTimerCount();
+		static void SetMaxTimerCount (int);
+
+	public:
+		EventMachine_t (void(*event_callback)(const char*, int, const char*, int));
+		virtual ~EventMachine_t();
+
+		void Run();
+		void ScheduleHalt();
+		void SignalLoopBreaker();
+		const char *InstallOneshotTimer (int);
+		const char *ConnectToServer (const char *, int, const char *, int);
+		const char *ConnectToUnixServer (const char *);
+
+		const char *CreateTcpServer (const char *, int);
+		const char *OpenDatagramSocket (const char *, int);
+		const char *CreateUnixDomainServer (const char*);
+		const char *_OpenFileForWriting (const char*);
+		const char *OpenKeyboard();
+		//const char *Popen (const char*, const char*);
+		const char *Socketpair (char* const*);
+
+		void Add (EventableDescriptor*);
+		void Modify (EventableDescriptor*);
+
+		const char *AttachFD (int, bool, bool);
+		int DetachFD (EventableDescriptor*);
+
+		void ArmKqueueWriter (EventableDescriptor*);
+		void ArmKqueueReader (EventableDescriptor*);
+
+		void SetTimerQuantum (int);
+		static void SetuidString (const char*);
+		static int SetRlimitNofile (int);
+
+		pid_t SubprocessPid;
+		int SubprocessExitStatus;
+
+		int GetConnectionCount();
+		float GetHeartbeatInterval();
+		int SetHeartbeatInterval(float);
+
+		const char *WatchFile (const char*);
+		void UnwatchFile (int);
+		void UnwatchFile (const char*);
+
+		#ifdef HAVE_KQUEUE
+		void _HandleKqueueFileEvent (struct kevent*);
+		void _RegisterKqueueFileEvent(int);
+		#endif
+
+		const char *WatchPid (int);
+		void UnwatchPid (int);
+		void UnwatchPid (const char *);
+
+		#ifdef HAVE_KQUEUE
+		void _HandleKqueuePidEvent (struct kevent*);
+		#endif
+
+		// Temporary:
+		void _UseEpoll();
+		void _UseKqueue();
+
+		bool UsingKqueue() { return bKqueue; }
+		bool UsingEpoll() { return bEpoll; }
+
+	private:
+		bool _RunOnce();
+		bool _RunTimers();
+		void _UpdateTime();
+		void _AddNewDescriptors();
+		void _ModifyDescriptors();
+		void _InitializeLoopBreaker();
+
+		bool _RunSelectOnce();
+		bool _RunEpollOnce();
+		bool _RunKqueueOnce();
+
+		void _ModifyEpollEvent (EventableDescriptor*);
+
+	public:
+		void _ReadLoopBreaker();
+		void _ReadInotifyEvents();
+
+	private:
+		enum {
+			MaxEpollDescriptors = 64*1024,
+			MaxEvents = 4096
+		};
+		int HeartbeatInterval;
+		void (*EventCallback)(const char*, int, const char*, int);
+
+		class Timer_t: public Bindable_t {
+		};
+
+		multimap<Int64, Timer_t> Timers;
+		map<int, Bindable_t*> Files;
+		map<int, Bindable_t*> Pids;
+		vector<EventableDescriptor*> Descriptors;
+		vector<EventableDescriptor*> NewDescriptors;
+		set<EventableDescriptor*> ModifiedDescriptors;
+
+		Int64 NextHeartbeatTime;
+
+		int LoopBreakerReader;
+		int LoopBreakerWriter;
+		#ifdef OS_WIN32
+		struct sockaddr_in LoopBreakerTarget;
+		#endif
+
+		timeval Quantum;
+
+	private:
+		bool bEpoll;
+		int epfd; // Epoll file-descriptor
+		#ifdef HAVE_EPOLL
+		struct epoll_event epoll_events [MaxEvents];
+		#endif
+
+		bool bKqueue;
+		int kqfd; // Kqueue file-descriptor
+		#ifdef HAVE_KQUEUE
+		struct kevent Karray [MaxEvents];
+		#endif
+
+		InotifyDescriptor *inotify; // pollable descriptor for our inotify instance
+};
+
+
+/*******************
+struct SelectData_t
+*******************/
+
+struct SelectData_t
+{
+	SelectData_t();
+
+	int _Select();
+
+	int maxsocket;
+	fd_set fdreads;
+	fd_set fdwrites;
+	timeval tv;
+	int nSockets;
+};
+
+
+
+#endif // __EventMachine__H_
+
+//#endif // OS_UNIX

data/ext/eventmachine.h

@@ -1,98 +1,111 @@
-/*****************************************************************************
-
-$Id$
-
-File:     eventmachine.h
-Date:     15Apr06
-
-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.
-
-*****************************************************************************/
-
-#ifndef __EVMA_EventMachine__H_
-#define __EVMA_EventMachine__H_
-
-#if __cplusplus
-extern "C" {
-#endif
-
-	enum { // Event names
-		EM_TIMER_FIRED = 100,
-		EM_CONNECTION_READ = 101,
-		EM_CONNECTION_UNBOUND = 102,
-		EM_CONNECTION_ACCEPTED = 103,
-		EM_CONNECTION_COMPLETED = 104,
-		EM_LOOPBREAK_SIGNAL = 105,
-		EM_CONNECTION_NOTIFY_READABLE = 106,
-		EM_CONNECTION_NOTIFY_WRITABLE = 107,
-		EM_SSL_HANDSHAKE_COMPLETED = 108
-
-	};
-
-	void evma_initialize_library (void(*)(const char*, int, const char*, int));
-	void evma_run_machine();
-	void evma_release_library();
-	const char *evma_install_oneshot_timer (int seconds);
-	const char *evma_connect_to_server (const char *server, int port);
-	const char *evma_connect_to_unix_server (const char *server);
-
-	const char *evma_attach_fd (int file_descriptor, int read_mode, int write_mode);
-	int evma_detach_fd (const char *binding);
-
-	void evma_stop_tcp_server (const char *signature);
-	const char *evma_create_tcp_server (const char *address, int port);
-	const char *evma_create_unix_domain_server (const char *filename);
-	const char *evma_open_datagram_socket (const char *server, int port);
-	const char *evma_open_keyboard();
-	void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filenane);
-	void evma_start_tls (const char *binding);
-
-	#ifdef WITH_SSL
-	X509 *evma_get_peer_cert (const char *binding);
-	#endif
-
-	int evma_get_peername (const char *binding, struct sockaddr*);
-	int evma_get_sockname (const char *binding, struct sockaddr*);
-	int evma_get_subprocess_pid (const char *binding, pid_t*);
-	int evma_get_subprocess_status (const char *binding, int*);
-	int evma_get_connection_count();
-	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
-	int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);
-	int evma_get_comm_inactivity_timeout (const char *binding, /*out*/int *value);
-	int evma_set_comm_inactivity_timeout (const char *binding, /*in,out*/int *value);
-	int evma_get_outbound_data_size (const char *binding);
-	int evma_send_file_data_to_connection (const char *binding, const char *filename);
-
-	void evma_close_connection (const char *binding, int after_writing);
-	int evma_report_connection_error_status (const char *binding);
-	void evma_signal_loopbreak();
-	void evma_set_timer_quantum (int);
-	int evma_get_max_timer_count();
-	void evma_set_max_timer_count (int);
-	void evma_setuid_string (const char *username);
-	void evma_stop_machine();
-
-	const char *evma__write_file (const char *filename);
-	const char *evma_popen (char * const*cmd_strings);
-
-	int evma_set_rlimit_nofile (int n_files);
-
-	// Temporary:
-	void evma__epoll();
-	void evma__kqueue();
-
-#if __cplusplus
-}
-#endif
-
-
-#endif // __EventMachine__H_
-
+/*****************************************************************************
+
+$Id$
+
+File:     eventmachine.h
+Date:     15Apr06
+
+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.
+
+*****************************************************************************/
+
+#ifndef __EVMA_EventMachine__H_
+#define __EVMA_EventMachine__H_
+
+#if __cplusplus
+extern "C" {
+#endif
+
+	enum { // Event names
+		EM_TIMER_FIRED = 100,
+		EM_CONNECTION_READ = 101,
+		EM_CONNECTION_UNBOUND = 102,
+		EM_CONNECTION_ACCEPTED = 103,
+		EM_CONNECTION_COMPLETED = 104,
+		EM_LOOPBREAK_SIGNAL = 105,
+		EM_CONNECTION_NOTIFY_READABLE = 106,
+		EM_CONNECTION_NOTIFY_WRITABLE = 107,
+		EM_SSL_HANDSHAKE_COMPLETED = 108,
+		EM_SSL_VERIFY = 109,
+		EM_PROXY_TARGET_UNBOUND = 110
+
+	};
+
+	void evma_initialize_library (void(*)(const char*, int, const char*, int));
+	void evma_run_machine();
+	void evma_release_library();
+	const char *evma_install_oneshot_timer (int seconds);
+	const char *evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
+	const char *evma_connect_to_unix_server (const char *server);
+
+	const char *evma_attach_fd (int file_descriptor, int read_mode, int write_mode);
+	int evma_detach_fd (const char *binding);
+
+	void evma_stop_tcp_server (const char *signature);
+	const char *evma_create_tcp_server (const char *address, int port);
+	const char *evma_create_unix_domain_server (const char *filename);
+	const char *evma_open_datagram_socket (const char *server, int port);
+	const char *evma_open_keyboard();
+	void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filenane, int verify_peer);
+	void evma_start_tls (const char *binding);
+
+	#ifdef WITH_SSL
+	X509 *evma_get_peer_cert (const char *binding);
+	void evma_accept_ssl_peer (const char *binding);
+	#endif
+
+	int evma_get_peername (const char *binding, struct sockaddr*);
+	int evma_get_sockname (const char *binding, struct sockaddr*);
+	int evma_get_subprocess_pid (const char *binding, pid_t*);
+	int evma_get_subprocess_status (const char *binding, int*);
+	int evma_get_connection_count();
+	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
+	int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);
+	float evma_get_comm_inactivity_timeout (const char *binding);
+	int evma_set_comm_inactivity_timeout (const char *binding, float value);
+	int evma_get_outbound_data_size (const char *binding);
+	int evma_send_file_data_to_connection (const char *binding, const char *filename);
+
+	void evma_close_connection (const char *binding, int after_writing);
+	int evma_report_connection_error_status (const char *binding);
+	void evma_signal_loopbreak();
+	void evma_set_timer_quantum (int);
+	int evma_get_max_timer_count();
+	void evma_set_max_timer_count (int);
+	void evma_setuid_string (const char *username);
+	void evma_stop_machine();
+	float evma_get_heartbeat_interval();
+	int evma_set_heartbeat_interval(float);
+
+	const char *evma__write_file (const char *filename);
+	const char *evma_popen (char * const*cmd_strings);
+
+	const char *evma_watch_filename (const char *fname);
+	void evma_unwatch_filename (const char *sig);
+
+	const char *evma_watch_pid (int);
+	void evma_unwatch_pid (const char *sig);
+
+	void evma_start_proxy(const char*, const char*);
+	void evma_stop_proxy(const char*);
+
+	int evma_set_rlimit_nofile (int n_files);
+
+	void evma_set_epoll (int use);
+	void evma_set_kqueue (int use);
+
+#if __cplusplus
+}
+#endif
+
+
+#endif // __EventMachine__H_
+