- Move timer implementation closer to the rest of message handling.

runtime/lib/timer_impl.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of dart.io;
-
 // Timer heap implemented as a array-based binary heap[0].
 // This allows for O(1) `first`, O(log(n)) `remove`/`removeFirst` and O(log(n))
 // `add`.
 //
 // To ensure the timers are ordered by insertion time, the _Timer class has a
 // `_id` field set when added to the heap.
 //
 // [0] http://en.wikipedia.org/wiki/Binary_heap
 class _TimerHeap {
   List<_Timer> _list;
@@ skipping 239 matching lines @@
       // While we are already handling callbacks we will not notify the event
       // handler. _handleTimeout will call _notifyEventHandler once all pending
       // timers are processed.
       return;
     }
 
     if ((_firstZeroTimer == null) && _heap.isEmpty) {
       // No pending timers: Close the receive port and let the event handler
       // know.
       if (_receivePort != null) {
-        _EventHandler._sendData(null, _sendPort, _NO_TIMER);
+        VMLibraryHooks.eventHandlerSendData(null, _sendPort, _NO_TIMER);
         _shutdownTimerHandler();
       }
     } else {
       if (_receivePort == null) {
         // Create a receive port and register a message handler for the timer
         // events.
         _createTimerHandler();
       }
       if (_firstZeroTimer != null) {
         if (!_messagePending) {
           _sendPort.send(null);
           _messagePending = true;  // Reset when the port receives a message.
         }
       } else {
         var wakeupTime = _heap.first._wakeupTime;
         if ((_scheduledWakeupTime == null) ||
             (wakeupTime != _scheduledWakeupTime)) {
-          _EventHandler._sendData(null, _sendPort, wakeupTime);
+          VMLibraryHooks.eventHandlerSendData(null, _sendPort, wakeupTime);
           _scheduledWakeupTime = wakeupTime;
         }
       }
     }
   }
 
-  static void _handleTimeout(pendingImmediateCallback) {
+  static void _handleTimeout() {
     // Fast exit if no timers have been scheduled.
     if (_heap.isEmpty && (_firstZeroTimer == null)) {
       assert(_receivePort == null);
       return;
     }
 
     // Collect all pending timers.
     var head = null;
     var tail = null;
     if (_heap.isEmpty) {
@@ skipping 89 matching lines @@
             // Mark timer as inactive.
             timer._callback = null;
           }
           callback(timer);
           // Re-insert repeating timer if not canceled.
           if (timer._repeating && (timer._callback != null)) {
             timer._advanceWakeupTime();
             timer._addTimerToHeap();
           }
           // Execute pending micro tasks.
-          pendingImmediateCallback();
+          _runPendingImmediateCallback();
         }
       }
     } finally {
       _handlingCallbacks = false;
       _notifyEventHandler();
     }
   }
 
   // Creates a receive port and registers an empty handler on that port. Just
   // the triggering of the event loop will ensure that timers are executed.
@@ skipping 20 matching lines @@
   // The Timer factory registered with the dart:async library by the embedder.
   static Timer _factory(int milliSeconds,
                         void callback(Timer timer),
                         bool repeating) {
     if (repeating) {
       return new _Timer.periodic(milliSeconds, callback);
     }
     return new _Timer(milliSeconds, callback);
   }
 }
+
+_setupHooks() {
+  VMLibraryHooks.timerFactory = _Timer._factory;
+}