Changeset 623

Timestamp:

12/27/07 15:31:07 (11 months ago)

Author:

blackhedd

Message:

Removed hookable error handler to improve performance.

Files:

• version_0/ChangeLog (modified) (1 diff)
• version_0/lib/eventmachine.rb (modified) (3 diffs)

version_0/ChangeLog

@@ -101 +101 @@
-13Dec07: Added EM::DeferrableChildProcess
-24Dec07: Added a SASL client for simple password authentication.
+27Dec07: Removed the hookable error handler. No one was using it and it significantly
+        degraded performance.

version_0/lib/eventmachine.rb

@@ -1046 +1046 @@
-        private
-        def EventMachine::event_callback conn_binding, opcode, data
+                #
+                # Changed 27Dec07: Eliminated the hookable error handling.
+                # No one was using it, and it degraded performance significantly.
+                # It's in original_event_callback, which is dead code.
+                #
+                if opcode == ConnectionData
+                        c = @conns[conn_binding] or raise ConnectionNotBound
+                        c.receive_data data
+                elsif opcode == ConnectionUnbound
+                        if c = @conns.delete( conn_binding )
+                                c.unbind
+                        elsif c = @acceptors.delete( conn_binding )
+                                # no-op
+                        else
+                                raise ConnectionNotBound
+                        end
+                elsif opcode == ConnectionAccepted
+                        accep,args,blk = @acceptors[conn_binding]
+                        raise NoHandlerForAcceptedConnection unless accep
+                        c = accep.new data, *args
+                        @conns[data] = c
+                        blk and blk.call(c)
+                        c # (needed?)
+                elsif opcode == TimerFired
+                        t = @timers.delete( data ) or raise UnknownTimerFired
+                        t.call
+                elsif opcode == ConnectionCompleted
+                        c = @conns[conn_binding] or raise ConnectionNotBound
+                        c.connection_completed
+                elsif opcode == LoopbreakSignalled
+                        run_deferred_callbacks
+                end
+        end
+
+        private
+        def EventMachine::original_event_callback conn_binding, opcode, data
-                #
-                # Added 03Oct07: Any code path that invokes user-written code must
@@ -1196 +1232 @@
-      # Store signature and run #post_init
-      @signature = sig
-
-
-
-
-
+
-    
-      self
@@ -1513 +1545 @@
-                end
-                def fire
-
-
-
-
-
+
-                        schedule unless @cancelled
-                end