Ticket #33: assure_ends_well.diff

ext/em.cpp

@@ -463 +463 @@
-                //  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.
-, j
+
-                int nSockets = Descriptors.size();
-, j=0
+
-                        EventableDescriptor *ed = Descriptors[i];
-                        assert (ed);
-                        if (ed->ShouldDelete()) {
@@ -482 +482 @@
-                                }
-
-                                ModifiedDescriptors.erase (ed);
+                                Descriptors[i] = Descriptors[Descriptors.size() - 1];
+                                Descriptors.pop_back();
+                                i--; nSockets--;
+                                
-                                delete ed;
-                        }
-                        else
-                                Descriptors [j++] = ed;
-                }
-                while ((size_t)j < Descriptors.size())
-                        Descriptors.pop_back();
-
-        }
-
@@ -556 +556 @@
-                // rather than traversing the whole list.
-                // In kqueue, closing a descriptor automatically removes its event filters.
-
-, j
+
-                int nSockets = Descriptors.size();
-, j=0
+
-                        EventableDescriptor *ed = Descriptors[i];
-                        assert (ed);
-                        if (ed->ShouldDelete()) {
-                                ModifiedDescriptors.erase (ed);
-                                delete ed;
+                                Descriptors[i] = Descriptors[Descriptors.size() - 1]; // replace our 'gone' one with a live one
+                                i--; nSockets--;
+                                Descriptors.pop_back();
-                        }
-                        else
-                                Descriptors [j++] = ed;
-                }
-                while ((size_t)j < Descriptors.size())
-                        Descriptors.pop_back();
-
-        }
-
@@ -790 +789 @@
-
-        { // cleanup dying sockets
-                // vector::pop_back works in constant time.
-, j
+
-                int nSockets = Descriptors.size();
-, j=0
+
-                        EventableDescriptor *ed = Descriptors[i];
-                        assert (ed);
-                        if (ed->ShouldDelete())
+                        {
-                                delete ed;
-
-
+
+
+
+
-                }
-                while ((size_t)j < Descriptors.size())
-                        Descriptors.pop_back();
-
-        }
-

tests/test_ends_right.rb

@@ +1 @@
+# this error occurs when you have several sockets, like 3
+# they are all 'closed' but their descriptors are in the middle of being collected
+# THEN the program terminates, which causes the EM thread to jump to its finalizer.
+
+$:.unshift "../lib"
+require 'eventmachine'
+require 'test/unit'
+
+module SlowClosers
+  @@total_closed = 0
+
+  def unbind
+    @@total_closed += 1
+    raise LocalJumpError.new() if @@total_closed == 2
+  end
+
+end
+
+class DeathEnd < Test::Unit::TestCase
+
+   def setup
+        SlowClosers.class_eval("@@total_closed = 0")
+   end
+
+   def test_ends_well_multi_thread # note that ideally it should try it with kqueue, epoll, and normal.  I'm not sure if all the tests should just be re-run with those settings or what
+      begin
+        EM::run {
+                3.times {EM::connect '127.0.0.1', 6000, SlowClosers}
+        }
+      rescue LocalJumpError
+        # we should get here--if it errs it will err with a 'HARD' c-style error
+      end
+   end
+
+   # another test with possibility would be one that encourage the ConnectionUnbound caused if they
+   # do a connection or add_timer or start_server from another thread.  Not sure if we want to care about that one [though we should, really].  
+
+end
+