Add EM.kqueue= and EM.epoll=

stripe-archive · Mar 16, 2009 · 28fdba4 · 28fdba4
1 parent bb05a9c
commit 28fdba4
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 35 deletions.
diff --git a/ext/cmain.cpp b/ext/cmain.cpp
@@ -491,22 +491,22 @@ extern "C" int evma_get_outbound_data_size (const char *binding)
 }
 
 
-/***********
-evma__epoll
-***********/
+/**************
+evma_set_epoll
+**************/
 
-extern "C" void evma__epoll()
+extern "C" void evma_set_epoll (int use)
 {
-	bUseEpoll = 1;
+	bUseEpoll = !!use;
 }
 
-/************
-evma__kqueue
-************/
+/***************
+evma_set_kqueue
+***************/
 
-extern "C" void evma__kqueue()
+extern "C" void evma_set_kqueue (int use)
 {
-	bUseKqueue = 1;
+	bUseKqueue = !!use;
 }
 
 

diff --git a/ext/cplusplus.cpp b/ext/cplusplus.cpp
@@ -33,7 +33,7 @@ EM::Run
 
 void EM::Run (void (*start_func)())
 {
-	evma__epoll();
+	evma_set_epoll (1);
 	evma_initialize_library (EM::Callback);
 	if (start_func)
 		AddTimer (0, start_func);

diff --git a/ext/eventmachine.h b/ext/eventmachine.h
@@ -85,9 +85,8 @@ extern "C" {
 
 	int evma_set_rlimit_nofile (int n_files);
 
-	// Temporary:
-	void evma__epoll();
-	void evma__kqueue();
+	void evma_set_epoll (int use);
+	void evma_set_kqueue (int use);
 
 #if __cplusplus
 }

diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
@@ -609,17 +609,6 @@ static VALUE t_read_keyboard (VALUE self)
 }
 
 
-/********
-t__epoll
-********/
-
-static VALUE t__epoll (VALUE self)
-{
-	// Temporary.
-	evma__epoll();
-	return Qnil;
-}
-
 /**********
 t__epoll_p
 **********/
@@ -633,18 +622,33 @@ static VALUE t__epoll_p (VALUE self)
   #endif
 }
 
+/********
+t__epoll
+********/
 
-/*********
-t__kqueue
-*********/
+static VALUE t__epoll (VALUE self)
+{
+	if (t__epoll_p(self) == Qfalse)
+		return Qfalse;
 
-static VALUE t__kqueue (VALUE self)
+	evma_set_epoll (1);
+	return Qtrue;
+}
+
+/***********
+t__epoll_set
+***********/
+
+static VALUE t__epoll_set (VALUE self, VALUE val)
 {
-	// Temporary.
-	evma__kqueue();
-	return Qnil;
+	if (t__epoll_p(self) == Qfalse)
+		return Qfalse;
+
+	evma_set_epoll (val == Qtrue ? 1 : 0);
+	return val;
 }
 
+
 /***********
 t__kqueue_p
 ***********/
@@ -658,6 +662,32 @@ static VALUE t__kqueue_p (VALUE self)
   #endif
 }
 
+/*********
+t__kqueue
+*********/
+
+static VALUE t__kqueue (VALUE self)
+{
+	if (t__kqueue_p(self) == Qfalse)
+		return Qfalse;
+
+	evma_set_kqueue (1);
+	return Qtrue;
+}
+
+/*************
+t__kqueue_set
+*************/
+
+static VALUE t__kqueue_set (VALUE self, VALUE val)
+{
+	if (t__kqueue_p(self) == Qfalse)
+		return Qfalse;
+
+	evma_set_kqueue (val == Qtrue ? 1 : 0);
+	return val;
+}
+
 
 /****************
 t_send_file_data
@@ -821,11 +851,12 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "set_rlimit_nofile", (VALUE(*)(...))t_set_rlimit_nofile, 1);
 	rb_define_module_function (EmModule, "get_connection_count", (VALUE(*)(...))t_get_connection_count, 0);
 
-	// Temporary:
 	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_set, 1);
 	rb_define_module_function (EmModule, "epoll?", (VALUE(*)(...))t__epoll_p, 0);
+
+	rb_define_module_function (EmModule, "kqueue", (VALUE(*)(...))t__kqueue, 0);
+	rb_define_module_function (EmModule, "kqueue=", (VALUE(*)(...))t__kqueue_set, 1);
 	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);