Changeset 625

Timestamp:

12/27/07 20:25:05 (11 months ago)

Author:

blackhedd

Message:

Changed from rb_thread_select to rb_thread_blocking_region for 1.9 builds

Files:

• version_0/ext/em.cpp (modified) (8 diffs)
• version_0/ext/em.h (modified) (1 diff)
• version_0/ext/extconf.rb (modified) (1 diff)
• version_0/ext/rubymain.cpp (modified) (3 diffs)

version_0/ext/em.cpp

@@ -385 +385 @@
-        assert (epfd != -1);
-        struct epoll_event ev [MaxEpollDescriptors];
-1
+5
-        if (s > 0) {
-                for (int i=0; i < s; i++) {
@@ -491 +491 @@
-
-
+
+/**************************
+SelectData_t::SelectData_t
+**************************/
+
+SelectData_t::SelectData_t()
+{
+        maxsocket = 0;
+        FD_ZERO (&fdreads);
+        FD_ZERO (&fdwrites);
+}
+
+
+/*****************
+_SelectDataSelect
+*****************/
+
+static VALUE _SelectDataSelect (void *v)
+{
+        SelectData_t *sd = (SelectData_t*)v;
+        sd->nSockets = select (sd->maxsocket+1, &(sd->fdreads), &(sd->fdwrites), NULL, &(sd->tv));
+        return Qnil;
+}
+
+/*********************
+SelectData_t::_Select
+*********************/
+
+int SelectData_t::_Select()
+{
+        #ifdef HAVE_TBR
+        rb_thread_blocking_region (_SelectDataSelect, (void*)this, RB_UBF_DFL, 0);
+        return nSockets;
+        #endif
+
+        #ifndef HAVE_TBR
+        return rb_thread_select (maxsocket+1, &fdreads, &fdwrites, NULL, &tv);
+        #endif
+}
+
+
+
-/******************************
-EventMachine_t::_RunSelectOnce
@@ -526 +568 @@
-        */
-
+        SelectData_t SelectData;
+        /*
-        fd_set fdreads, fdwrites;
-        FD_ZERO (&fdreads);
@@ -531 +575 @@
-
-        int maxsocket = 0;
+        */
-
-        // Always read the loop-breaker reader.
@@ -537 +582 @@
-        // Windows has a version of the Unix pipe() library function, but it doesn't
-        // give you back descriptors that are selectable.
-fdreads
-
-
+(SelectData.fdreads)
+SelectData.
+SelectData.
-
-        // prepare the sockets for reading and writing
@@ -550 +595 @@
-
-                if (ed->SelectForRead())
-fdreads
+(SelectData.fdreads)
-                if (ed->SelectForWrite())
-fdwrites
-
-
-
+(SelectData.fdwrites)
+
+SelectData.
+SelectData.
-        }
-
@@ -561 +606 @@
-        { // read and write the sockets
-                //timeval tv = {1, 0}; // Solaris fails if the microseconds member is >= 1000000.
-
-
+
+
+
+
+
+
-                if (s > 0) {
-                        /* Changed 01Jun07. We used to handle the Loop-breaker right here.
@@ -580 +629 @@
-                                assert (sd != INVALID_SOCKET);
-
-fdwrites
+(SelectData.fdwrites)
-                                        ed->Write();
-fdreads
+(SelectData.fdreads)
-                                        ed->Read();
-                        }
-
-fdreads
+(SelectData.fdreads)
-                                _ReadLoopBreaker();
-                }

version_0/ext/em.h

@@ -137 +137 @@
-
-
+/*******************
+struct SelectData_t
+*******************/
+
+struct SelectData_t
+{
+        SelectData_t();
+
+        int _Select();
+
+        int maxsocket;
+        fd_set fdreads;
+        fd_set fdwrites;
+        timeval tv;
+        int nSockets;
+};
+
-
-

version_0/ext/extconf.rb

@@ -117 +117 @@
-  end
-
+  if have_func('rb_thread_blocking_region') and have_macro('RB_UBF_DFL', 'ruby.h')
+          flags << "-DHAVE_TBR"
+  end
+
-  dir_config('ssl', "#{ENV['OPENSSL']}/include", ENV['OPENSSL'])
-  # Check for libcrypto twice, before and after ssl. That's because on some platforms

version_0/ext/rubymain.cpp

@@ -32 +32 @@
-
-static VALUE Intern_at_signature;
+static VALUE Intern_at_timers;
+static VALUE Intern_at_conns;
+static VALUE Intern_event_callback;
+static VALUE Intern_run_deferred_callbacks;
+static VALUE Intern_delete;
+static VALUE Intern_call;
+static VALUE Intern_receive_data;
-
-
@@ -40 +47 @@
-static void event_callback (const char *a1, int a2, const char *a3, int a4)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -497 +522 @@
-        // Tuck away some symbol values so we don't have to look 'em up every time we need 'em.
-        Intern_at_signature = rb_intern ("@signature");
+        Intern_at_timers = rb_intern ("@timers");
+        Intern_at_conns = rb_intern ("@conns");
+
+        Intern_event_callback = rb_intern ("event_callback");
+        Intern_run_deferred_callbacks = rb_intern ("run_deferred_callbacks");
+        Intern_delete = rb_intern ("delete");
+        Intern_call = rb_intern ("call");
+        Intern_receive_data = rb_intern ("receive_data");
-
-        // INCOMPLETE, we need to define class Connections inside module EventMachine