Always initialize the EventHandler in the standalone.

runtime/bin/eventhandler.cc

 // Copyright (c) 2012, 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.
 
 #include "bin/dartutils.h"
 #include "bin/eventhandler.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 
 #include "include/dart_api.h"
@@ skipping 45 matching lines @@
   while (current != NULL) {
     if (next_timeout_ == NULL ||
         current->timeout() < next_timeout_->timeout()) {
       next_timeout_ = current;
     }
     current = current->next();
   }
 }
 
 
+/*
+ * Starts the EventHandler thread.
+ */
+void EventHandler::Start() {

[Søren Gjesse, 2013/08/21 13:52:05]

You don't need the mutex here any more.

[Anders Johnsen, 2013/08/22 11:31:05]

Done.

+  MutexLocker locker(mutex_);

[Søren Gjesse, 2013/08/21 13:52:05]

Assert that event_handler_ is NULL.

[Anders Johnsen, 2013/08/22 11:31:05]

Done.

+  if (event_handler != NULL) return;
+  event_handler = new EventHandler();

[Søren Gjesse, 2013/08/21 13:52:05]

If we want we can still postpone the actual start of the delegate until the
first message is actually send.

[Anders Johnsen, 2013/08/22 11:31:05]

Yes, but I would like to avoid the extra check on each call. (it's not
expensive, but still...)

+  event_handler->delegate_.Start(event_handler);
+}
+
+
 void EventHandler::Stop() {
   MutexLocker locker(mutex_);
   if (event_handler == NULL) return;
   event_handler->Shutdown();
   event_handler = NULL;
 }
 
 
-/*
- * Starts the EventHandler thread and stores its reference in the dart
- * EventHandler object. args[0] holds the reference to the dart EventHandler
- * object.
- */
-void FUNCTION_NAME(EventHandler_Start)(Dart_NativeArguments args) {
-  MutexLocker locker(mutex_);
-  if (event_handler != NULL) return;
-  event_handler = EventHandler::Start();
-}
-
-
 /*
  * Send data to the EventHandler thread to register for a given instance
  * args[1] a ReceivePort args[2] with a notification event args[3]. args[0]
  * holds the reference to the dart EventHandler object.
  */
 void FUNCTION_NAME(EventHandler_SendData)(Dart_NativeArguments args) {
-  Dart_Handle sender = Dart_GetNativeArgument(args, 1);
+  Dart_Handle sender = Dart_GetNativeArgument(args, 0);
   intptr_t id = kInvalidId;
   if (Dart_IsNull(sender)) {
     id = kTimerId;
   } else {
     Socket::GetSocketIdNativeField(sender, &id);
   }
-  Dart_Handle handle = Dart_GetNativeArgument(args, 2);
+  Dart_Handle handle = Dart_GetNativeArgument(args, 1);
   Dart_Port dart_port =
       DartUtils::GetIntegerField(handle, DartUtils::kIdFieldName);
-  int64_t data = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
+  int64_t data = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
   {
     MutexLocker locker(mutex_);
     // Only send if the event_handler is not NULL. This means that the handler
     // shut down, and a message is send later on.
     if (event_handler != NULL) {
       event_handler->SendData(id, dart_port, data);
     }
   }
 }
 
 }  // namespace bin
 }  // namespace dart