Ticket #34: lotsa_sockets_updated.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 (?)
+ 
+ }
-
-
-/******************************
@@ -153 +195 @@
-        /* Temporary.
-         * See comments under _UseEpoll.
-         */
-
+
-        #ifdef HAVE_KQUEUE
-        bKqueue = true;
+        #else
-        #endif
-}
-
@@ -182 +225 @@
-        gTerminateSignalReceived = true;
-}
-
+/*****************************
+EventMachine_t::GetTimerQuantumMills
+******************************/
-
+int  EventMachine_t::GetTimerQuantumMills ()
+{
+ return Quantum.tv_sec * 1000 + Quantum.tv_usec / 1000;
+}
-
+
-/*******************************
-EventMachine_t::SetTimerQuantum
-*******************************/
@@ -463 +514 @@
-                //  descriptor is closed anyway. This is different from the case where
-                //  the socket has already been closed but the descriptor in the ED object
-                //  hasn't yet been set to INVALID_SOCKET.
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
-                                if (ed->GetSocket() != INVALID_SOCKET) {
-                                        assert (bEpoll); // wouldn't be in this method otherwise.
-                                        assert (epfd != -1);
@@ -479 +530 @@
-                                                snprintf (buf, sizeof(buf)-1, "unable to delete epoll event: %s", strerror(errno));
-                                                throw std::runtime_error (buf);
-                                        }
-
+ 
-
-                                ModifiedDescriptors.erase (ed);
-                                delete ed;
@@ -658 +709 @@
-        #endif
-}
-
+/******************************
+EventMachine_t::_SelectOnceErrorController
+******************************/
-
+int EventMachine_t::_SelectOnceErrorControlled() // for win32 only -- this does help, in some instances.  There seems to be some lurking other problems, too, though--like why don't connections close right, and then sometimes select still fails--and in a bad way.
+{
+/* Some windows notes (this function used mostly for windows--I hope)
+todo run on linux EINVAL, too
+ note that windows sometimes, for some reason if you have open sockets, then you do File.open (?) then one of your open sockets no longer responds to select.  Maybe File.open 's file descriptor is ploughing a socket descriptor?
+ note also that on windows, server editions you can have more than 256 (msvcrt.dll) or 2048 (msvcrtXX.dll) file descriptors total, per process, so our setting FD_SETSIZE to 2048 might could use to be raised in those cases.  But I'd say leaving it at 2048 is good till it becomes a problem for someone.
+update--appears that it doesn't matter what you set FD_SETSIZE to be, it only 'works' up to 64, for some reason.  Maybe ruby itself 'redefines' FD_SETSIZE to be low? So we need to set it? todo (there's a test that tests this, you can set FD_SETSIZE to whatever, run the test--it errs if you set it above 64!
+ it appears that even having this loop doesn't solve all the problems, as select sometimes returns '3' even when none of them even requested to read or write--probably corruption
+*/
-
+        SelectData_t SelectData;
+        fd_set test_one_read, test_one_write, test_one_err; // do we need the err one, though?
+        FD_ZERO(&(SelectData.fdreads));
+        FD_ZERO(&(SelectData.fdwrites));
+        FD_ZERO(&test_one_read);
+        timeval tv_lpbr = {0,0};
+        int select_return = EmSelect(LoopBreakerReader, &test_one_read, NULL, NULL, &tv_lpbr);
+        if(select_return < 0)
+                printf("arr bad loopbreaker! please report to EM\n\n\n");
+        FD_SET (LoopBreakerReader, &(SelectData.fdreads));
+                SelectData.maxsocket = LoopBreakerReader;
+
+        // prepare the sockets for reading and writing, with error checking this time
+        size_t i;
+        int failed_count = 0;
+        for (i = 0; i < Descriptors.size(); i++) {
+                timeval tv_zero = {0, 1}; // set this to actually wait a split second so that some weird weird weird obscure select failures will show through (if you set FD_SETSIZE to 2048, slam it, then sometimes select'ing on 0 doesn't work 'well enough' --it returns 1, then when you pass the whole group to select again, it errs.
+                EventableDescriptor *ed = Descriptors[i];
+                assert (ed);
+                int sd = ed->GetSocket();
+                assert (sd != INVALID_SOCKET);
+                FD_ZERO(&test_one_read);
+                FD_ZERO(&test_one_write);
+
+                if (ed->SelectForRead())
+                {
+                        int select_return = EmSelect(sd+1, &test_one_read, NULL, &test_one_err, &tv_zero);
+                        if(select_return >= 0)
+                                FD_SET (sd, &(SelectData.fdreads));
+                        else
+                        {
+                                failed_count++;
+                        }
+                }
+                if (ed->SelectForWrite())
+                {
+                        FD_SET(sd, &test_one_write);
+                        int select_return = EmSelect(sd+1, &test_one_write, NULL, NULL, &tv_zero);
+                        if(select_return >= 0)
+                                FD_SET (sd, &(SelectData.fdwrites));
+                        else
+                        {
+                                failed_count++;
+                        }
+                }
+
+                if (SelectData.maxsocket < sd)
+                        SelectData.maxsocket = sd;
+        }
+        
+        //if(failed_count > 0)
+        //      printf("at least one failed! -- FD_SETSIZE == %d, our descriptors size %d\n", FD_SETSIZE, Descriptors.size());
+
+        return SelectData._Select();
+
+}
-/******************************
-EventMachine_t::_RunSelectOnce
-******************************/
@@ -679 +798 @@
-        //cerr << "X";
-
-        /* This protection is now obsolete, because we will ALWAYS
-
+ 
-         */
-        /*
-        if (Descriptors.size() == 0) {
@@ -689 +808 @@
-                return true;
-                #endif
-                #ifdef OS_WIN32
-
+ 
-                return true;
-                #endif
-        }
@@ -703 +822 @@
-
-        int maxsocket = 0;
-        */
+        AssertValidDescriptorsLength();
-
-        // Always read the loop-breaker reader.
-        // Changed 23Aug06, provisionally implemented for Windows with a UDP socket
-        // running on localhost with a randomly-chosen port. (*Puke*)
-        // Windows has a version of the Unix pipe() library function, but it doesn't
-        // give you back descriptors that are selectable.
+
-        FD_SET (LoopBreakerReader, &(SelectData.fdreads));
-        if (SelectData.maxsocket < LoopBreakerReader)
-                SelectData.maxsocket = LoopBreakerReader;
-
-        // prepare the sockets for reading and writing
-        size_t i;
-
+ // aren't we supposed to do this just once?
-                EventableDescriptor *ed = Descriptors[i];
-                assert (ed);
-                int sd = ed->GetSocket();
-                assert (sd != INVALID_SOCKET);
-
-                if (ed->SelectForRead())
+                {
-                        FD_SET (sd, &(SelectData.fdreads));
+                }
-                if (ed->SelectForWrite())
+                {
-                        FD_SET (sd, &(SelectData.fdwrites));
+                }
-
-                if (SelectData.maxsocket < sd)
-                        SelectData.maxsocket = sd;
-        }
-
-
+
-        { // read and write the sockets
-                //timeval tv = {1, 0}; // Solaris fails if the microseconds member is >= 1000000.
-                //timeval tv = Quantum;
-                SelectData.tv = Quantum;
-                int s = SelectData._Select();
+                #ifdef OS_WIN32
+                if(s<0)
+                {
+                #else
+                if(s==EINVAL)
+                {
+                        printf("select EINVAL on linux unanticipated--please report to EM");
+                #endif
+                        s = _SelectOnceErrorControlled(); // hack to run it again with error checking on each socket, should it fail because of one--this until we can figure out and stamp out all win32 errors.  Till then, just run select on error checked items.
+                }
+
-                //rb_thread_blocking_region(xxx,(void*)&SelectData,RB_UBF_DFL,0);
-                //int s = EmSelect (SelectData.maxsocket+1, &(SelectData.fdreads), &(SelectData.fdwrites), NULL, &(SelectData.tv));
-                //int s = SelectData.nSockets;
+
-                if (s > 0) {
-                        /* Changed 01Jun07. We used to handle the Loop-breaker right here.
-                         * Now we do it AFTER all the regular descriptors. There's an
@@ -757 +893 @@
-                                assert (sd != INVALID_SOCKET);
-
-                                if (FD_ISSET (sd, &(SelectData.fdwrites)))
+                                {
-                                        ed->Write();
+                                }
-                                if (FD_ISSET (sd, &(SelectData.fdreads)))
+                                {
-                                        ed->Read();
+                                }
-                        }
-
-                        if (FD_ISSET (LoopBreakerReader, &(SelectData.fdreads)))
+                        {
-                                _ReadLoopBreaker();
+                        }
-                }
-                else if (s < 0) {
-                        // select can fail on error in a handful of ways.
@@ -772 +914 @@
-                        // so keep the wait short.
-                        timeval tv = {0, ((errno == EINTR) ? 5 : 50) * 1000};
-                        EmSelect (0, NULL, NULL, NULL, &tv);
+                        #ifdef OS_WIN32
+                        Sleep(100);
+                        #endif
-                }
-        }
-
@@ -974 +1119 @@
-
-        // From here on, ALL error returns must close the socket.
-        // Set the new socket nonblocking.
+        if(CantAffordNewSocket(sd))
+        {
+                //printf("connect ignoring too large of a socket for select bad 3.5");
+                closesocket (sd);
+                return NULL;
+        }
+  
-        if (!SetSocketNonblocking (sd)) {
-                closesocket (sd);
-                return NULL;
@@ -983 +1135 @@
-        setsockopt (sd, IPPROTO_TCP, TCP_NODELAY, (char*) &one, sizeof(one));
-
-        const char *out = NULL;
-
-       
+
+
-        //if (connect (sd, (sockaddr*)&pin, sizeof pin) == 0) {
-        if (connect (sd, bind_as, bind_size) == 0) {
-                // This is a connect success, which Linux appears
@@ -1081 +1233 @@
-        }
-        else {
-                // The error from connect was something other then WSAEWOULDBLOCK.
+                throw std::runtime_error ("unimplemented2");
-        }
-
-        #endif
-
+        AssertValidDescriptorsLength();
-        if (out == NULL)
-                closesocket (sd);
-        return out;
@@ -1255 +1409 @@
-        if (sd_accept == INVALID_SOCKET) {
-                goto fail;
-        }
+        // TODO ask about accepts, tho--should we just clear them or what?  I assume so.        
+        if(CantAffordNewSocket(sd_accept))
+        {
+                goto fail;
+        }
-
-        /*
-        memset (&sin, 0, sizeof(sin));
@@ -1322 +1481 @@
-                output_binding = ad->GetBinding().c_str();
-        }
-
+        AssertValidDescriptorsLength();
-        return output_binding;
-
-        fail:
-        if (sd_accept != INVALID_SOCKET)
-                closesocket (sd_accept);
@@ -1778 +1937 @@
-
-
-//#endif // OS_UNIX
-

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

@@ -206 +206 @@
-        return Qnil;
-}
-
+
-/********************
-t_get_subprocess_pid
-********************/
@@ -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

@@ -31 +31 @@
-      have_library('gdi32')
-    exit
-  end
+   
-
-  flags << "-D OS_WIN32"
-  flags << '-D BUILD_FOR_RUBY'
@@ -199 +200 @@
-  $CFLAGS += ' ' + flags.join(' ')
-end
-
+create_makefile "rubyeventmachine"
+# now some hacks for it. ugh.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

cmain.cpp

@@ -35 +35 @@
-        // we're just being linked into.
-        //InstallSignalHandlers();
-        if (EventMachine)
-
+evma_initialize_library 
-        EventMachine = new EventMachine_t (cb);
-        if (bUseEpoll)
-                EventMachine->_UseEpoll();
@@ -51 +51 @@
-extern "C" void evma_release_library()
-{
-        if (!EventMachine)
-
+evma_release_library 
-        delete EventMachine;
-        EventMachine = NULL;
-}
@@ -64 +64 @@
-extern "C" void evma_run_machine()
-{
-        if (!EventMachine)
-
+evma_run_machine 
-        EventMachine->Run();
-}
-
@@ -76 +76 @@
-extern "C" const char *evma_install_oneshot_timer (int seconds)
-{
-        if (!EventMachine)
-
+evma_install_oneshot_timer 
-        return EventMachine->InstallOneshotTimer (seconds);
-}
-
@@ -88 +88 @@
-extern "C" const char *evma_connect_to_server (const char *server, int port)
-{
-        if (!EventMachine)
-
+evma_connect_to_server 
-        return EventMachine->ConnectToServer (server, port);
-}
-
@@ -99 +99 @@
-extern "C" const char *evma_connect_to_unix_server (const char *server)
-{
-        if (!EventMachine)
-
+evma_connect_to_unix_server 
-        return EventMachine->ConnectToUnixServer (server);
-}
-
@@ -111 +111 @@
-extern "C" const char *evma_create_tcp_server (const char *address, int port)
-{
-        if (!EventMachine)
-
+evma_create_tcp_server 
-        return EventMachine->CreateTcpServer (address, port);
-}
-
@@ -122 +122 @@
-extern "C" const char *evma_create_unix_domain_server (const char *filename)
-{
-        if (!EventMachine)
-
+
+
+
-        return EventMachine->CreateUnixDomainServer (filename);
-}
-
@@ -133 +135 @@
-extern "C" const char *evma_open_datagram_socket (const char *address, int port)
-{
-        if (!EventMachine)
-
+evma_open_datagram_socket 
-        return EventMachine->OpenDatagramSocket (address, port);
-}
-
@@ -144 +146 @@
-extern "C" const char *evma_open_keyboard()
-{
-        if (!EventMachine)
-
+evma_open_keyboard 
-        return EventMachine->OpenKeyboard();
-}
-
@@ -157 +159 @@
-extern "C" int evma_send_data_to_connection (const char *binding, const char *data, int data_length)
-{
-        if (!EventMachine)
-
+evma_send_data_to_connection 
-        return ConnectionDescriptor::SendDataToConnection (binding, data, data_length);
-}
-
@@ -168 +170 @@
-extern "C" int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port)
-{
-  if (!EventMachine)
-
+evma_send_datagram 
-        return DatagramDescriptor::SendDatagram (binding, data, data_length, address, port);
-}
-
@@ -180 +182 @@
-extern "C" void evma_close_connection (const char *binding, int after_writing)
-{
-        if (!EventMachine)
-
+evma_close_connection 
-        ConnectionDescriptor::CloseConnection (binding, (after_writing ? true : false));
-}
-
@@ -191 +193 @@
-extern "C" int evma_report_connection_error_status (const char *binding)
-{
-        if (!EventMachine)
-
+evma_report_connection_error_status 
-        return ConnectionDescriptor::ReportErrorStatus (binding);
-}
-
@@ -202 +204 @@
-extern "C" void evma_stop_tcp_server (const char *binding)
-{
-        if (!EventMachine)
-
+evma_stop_tcp_server 
-        AcceptorDescriptor::StopAcceptor (binding);
-}
-
@@ -214 +216 @@
-extern "C" void evma_stop_machine()
-{
-        if (!EventMachine)
-
+evma_stop_machine 
-        EventMachine->ScheduleHalt();
-}
-
@@ -226 +228 @@
-extern "C" void evma_start_tls (const char *binding)
-{
-        if (!EventMachine)
-
+evma_start_tls 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        if (ed)
-                ed->StartTls();
@@ -239 +241 @@
-extern "C" void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filename)
-{
-        if (!EventMachine)
-
+evma_set_tls_parms 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        if (ed)
-                ed->SetTlsParms (privatekey_filename, certchain_filename);
@@ -253 +255 @@
-extern "C" int evma_get_peername (const char *binding, struct sockaddr *sa)
-{
-        if (!EventMachine)
-
+evma_get_peername 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        if (ed) {
-                return ed->GetPeername (sa) ? 1 : 0;
@@ -285 +287 @@
-extern "C" int evma_get_subprocess_pid (const char *binding, pid_t *pid)
-{
-        if (!EventMachine)
-
+evma_get_subprocess_pid 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        if (ed) {
-                return ed->GetSubprocessPid (pid) ? 1 : 0;
@@ -318 +320 @@
-extern "C" void evma_signal_loopbreak()
-{
-        if (!EventMachine)
-
+evma_signal_loopbreak 
-        EventMachine->SignalLoopBreaker();
-}
-
@@ -331 +333 @@
-extern "C" const char *evma__write_file (const char *filename)
-{
-        if (!EventMachine)
-
+evma__write_file 
-        return EventMachine->_OpenFileForWriting (filename);
-}
-
@@ -343 +345 @@
-extern "C" int evma_get_comm_inactivity_timeout (const char *binding, int *value)
-{
-        if (!EventMachine)
-
+evma_get_comm_inactivity_timeout 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        if (ed) {
-                return ed->GetCommInactivityTimeout (value);
@@ -352 +354 @@
-                return 0; //Perhaps this should be an exception. Access to an unknown binding.
-}
-
+
+
-/********************************
-evma_set_comm_inactivity_timeout
-********************************/
@@ -359 +363 @@
-extern "C" int evma_set_comm_inactivity_timeout (const char *binding, int *value)
-{
-        if (!EventMachine)
-
+evma_set_comm_inactivity_timeout 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        if (ed) {
-                return ed->SetCommInactivityTimeout (value);
@@ -375 +379 @@
-
-extern "C" void evma_set_timer_quantum (int interval)
-{
-        if (!EventMachine)
-                throw std::runtime_error ("not initialized");
-        EventMachine->SetTimerQuantum (interval);
-}
-
+
-/************************
-evma_set_max_timer_count
-************************/
@@ -410 +413 @@
-extern "C" const char *evma_popen (char * const*cmd_strings)
-{
-        if (!EventMachine)
-
+evma_popen 
-        return EventMachine->Socketpair (cmd_strings);
-}
-
@@ -422 +425 @@
-extern "C" int evma_get_outbound_data_size (const char *binding)
-{
-        if (!EventMachine)
-
+evma_get_outbound_data_size 
-        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
-        return ed ? ed->GetOutboundDataSize() : 0;
-}
@@ -484 +487 @@
-        int r;
-
-        if (!EventMachine)
-
+evma_send_file_data_to_connection 
-
-        int Fd = open (filename, O_RDONLY);
-

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);
@@ -875 +878 @@
-{
-        // TODO: This is something of a hack, or at least it's a static method of the wrong class.
-        AcceptorDescriptor *ad = dynamic_cast <AcceptorDescriptor*> (Bindable_t::GetObject (binding));
+       
-        if (ad)
-                ad->ScheduleClose (false);
-        else
@@ -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();
-
-}
-

ed.h

@@ -61 +61 @@
-
-                void SetEventCallback (void (*cb)(const char*, int, const char*, int));
-
+                virtual bool GetSockname (struct sockaddr*) {return false;}
-                virtual bool GetPeername (struct sockaddr*) {return false;}
-                virtual bool GetSockname (struct sockaddr*) {return false;}
-                virtual bool GetSubprocessPid (pid_t*) {return false;}
-
-                virtual void StartTls() {}