Ticket #34: lotsa_sockets_updated.2.diff

em.cpp

@@ -64 +64 @@
-        MaxOutstandingTimers = count;
-}
-
+ /************************
+ *
+  If we're on linux, and using select, and sd >= FD_SETSIZE then reject it-- we can't fit it into a select!  The problem being that with linux, the first parameter to select must be < FD_SETSIZE (it checks up to that many file descriptors).
+        i.e., if you get a file descriptor with a value as high as FD_SETSIZE, you cannot put that descriptor into an fd_set. (from http://www.delorie.com/gnu/docs/glibc/libc_248.html)
+        With windows, it appears that the total number of sockets it will cram into an fd_set is FD_SETSIZE, so...it basically ignores the call to FD_SET if the fd_set is already too populated, resulting in <cough> us losing a lot of data.  So it's the same logic check, but it errs in different parameters.
+        http://doc.ddart.net/msdn/header/include/winsock.h.html -- we use winsock.h, not winsock2.h
+        
+        todo add this to udp, well just about everything (?) Note that it's dangerous to 'close' it since it still will make it to select
+ 
+        So note that on linux descriptor numbers must be less than FD_SETSIZE, and on windows, the sum of descriptor counts must be < FD_SETSIZE.
+ ***********************/
+ 
+ bool EventMachine_t::CantAffordNewSocket(int socket_number)
+ {
+ 
+ 
+ #ifndef OS_WIN32
+   if(bEpoll or bKqueue)
+        return 0; // can afford
+   if(socket_number >= (FD_SETSIZE -1)) // no idea why the -1 is necessary, but it seems to be on os x at least (errs without it)
+        return 1;
+   else
+        return 0;
+ #else
+   // we leave one for  the loop break reader, etc. (seems to work).
+   if((Descriptors.size() + NewDescriptors.size()) < (FD_SETSIZE - 3))
+        return 0; // can afford (not not afford)
+   else
+        return 1; // can't afford
+ #endif
+ 
+ }
+ 
+ void EventMachine_t::AssertValidDescriptorsLength()
+ {
+        if(bEpoll or bKqueue)
+                return; // always return true in this case--we don't run out.
+        int socket_count = Descriptors.size() + NewDescriptors.size(); 
+        int max_allowed = FD_SETSIZE - 2; // since we need FD_SETSIZE -1 'slot' to hold the loop breaker
+        assert(socket_count <= max_allowed);; // should hold true for linux, too, by a freak of logic luck (if descriptors.size > FD_SETSIZE -2 then for sure we have one in there whose descriptor number >= FD_SETSIZE - 1 (?)
+ 
+ }
-
-
-/******************************
@@ -182 +225 @@
-        gTerminateSignalReceived = true;
-}
-
+/*****************************
+EventMachine_t::GetTimerQuantumMills
+******************************/
-
+int  EventMachine_t::GetTimerQuantumMills ()
+{
+ return Quantum.tv_sec * 1000 + Quantum.tv_usec / 1000;
+}
-
+
-/*******************************
-EventMachine_t::SetTimerQuantum
-*******************************/

em.h

@@ -82 +82 @@
-                void ArmKqueueWriter (EventableDescriptor*);
-                void ArmKqueueReader (EventableDescriptor*);
-
+                int GetTimerQuantumMills ();
+                void AssertValidDescriptorsLength();
+                bool CantAffordNewSocket(int descriptor_number);
-                void SetTimerQuantum (int);
-                static void SetuidString (const char*);
-                static int SetRlimitNofile (int);
@@ -100 +103 @@
-                void _ModifyDescriptors();
-                void _InitializeLoopBreaker();
-
+                int _SelectOnceErrorControlled();
-                bool _RunSelectOnce();
-                bool _RunEpollOnce();
-                bool _RunKqueueOnce();

eventmachine.h

@@ -46 +46 @@
-        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);
+        int evma_get_sockname (const char *binding, struct sockaddr*);
-        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*);
@@ -54 +55 @@
-        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_timer_quantum_value (); /* passes it straight out */
-        int evma_get_outbound_data_size (const char *binding);
-        int evma_send_file_data_to_connection (const char *binding, const char *filename);
-

rubymain.cpp

@@ -304 +305 @@
-
-        const char *f = evma_connect_to_server (StringValuePtr(server), NUM2INT(port));
-        if (!f || !*f)
-"
+ t_connect_server meaning that the attempt to connect to the server failed somehow f_pointer == (%d)", f
-        return rb_str_new2 (f);
-}
-
@@ -375 +376 @@
-}
-
-
+/*****************
+t_get_timer_quantum_mills
+Returns current timer quantum value
+******************/
+static VALUE
+t_get_timer_quantum_mills (VALUE self)
+{
+  return INT2NUM(evma_get_timer_quantum_value());
+}
-
+
-/*******************
-t_set_timer_quantum
-*******************/
@@ -596 +607 @@
-        rb_define_module_function (EmModule, "stop", (VALUE(*)(...))t_stop, 0);
-        rb_define_module_function (EmModule, "signal_loopbreak", (VALUE(*)(...))t_signal_loopbreak, 0);
-        rb_define_module_function (EmModule, "library_type", (VALUE(*)(...))t_library_type, 0);
+        rb_define_module_function (EmModule, "get_timer_quantum_mills", (VALUE(*)(...))t_get_timer_quantum_mills, 0);
-        rb_define_module_function (EmModule, "set_timer_quantum", (VALUE(*)(...))t_set_timer_quantum, 1);
-        rb_define_module_function (EmModule, "set_max_timer_count", (VALUE(*)(...))t_set_max_timer_count, 1);
-        rb_define_module_function (EmModule, "setuid_string", (VALUE(*)(...))t_setuid_string, 1);

extconf.rb

@@ -199 +200 @@
-  $CFLAGS += ' ' + flags.join(' ')
-end
-
+create_makefile "rubyeventmachine"
+# now some hacks for it. ugh.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

ed.cpp

@@ -604 +604 @@
-        // so assert that as a sanity check.
-        // Don't bother to make sure nbytes is less than output_buffer because
-        // if it were we probably would have crashed already.
-
+
+
+
+
-
-        assert (GetSocket() != INVALID_SOCKET);
-        int bytes_written = send (GetSocket(), output_buffer, nbytes, 0);
@@ -926 +930 @@
-                        continue;
-                }
-
-
+
+
+
+
+
+
+
+
-                // Disable slow-start (Nagle algorithm). Eventually make this configurable.
-                int one = 1;
-                setsockopt (sd, IPPROTO_TCP, TCP_NODELAY, (char*) &one, sizeof(one));
@@ -950 +961 @@
-                MyEventMachine->ArmKqueueReader (cd);
-                #endif
-        }
+        MyEventMachine->AssertValidDescriptorsLength();
-
-}
-