Keep track of when a socket has been destroyed

runtime/bin/eventhandler_android.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 "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/eventhandler.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 190 matching lines @@
         ASSERT(msg.data == (1 << kShutdownReadCommand));
         // Close the socket for reading.
         sd->ShutdownRead();
         UpdateEpollInstance(epoll_fd_, sd);
       } else if ((msg.data & (1 << kShutdownWriteCommand)) != 0) {
         ASSERT(msg.data == (1 << kShutdownWriteCommand));
         // Close the socket for writing.
         sd->ShutdownWrite();
         UpdateEpollInstance(epoll_fd_, sd);
       } else if ((msg.data & (1 << kCloseCommand)) != 0) {
         ASSERT(msg.data == (1 << kCloseCommand));

[kustermann, 2013/07/18 11:34:46]

This assert will be hit, if  'msg.data == kCloseCommand | kDestroyedEvent'!
(see comment in other file)

[Anders Johnsen, 2013/07/19 10:49:07]

Removed in other file.

         // Close the socket and free system resources and move on to
         // next message.
         RemoveFromEpollInstance(epoll_fd_, sd);
         intptr_t fd = sd->fd();
         if (fd == STDOUT_FILENO) {
           // If stdout, redirect fd to /dev/null.
           int null_fd = TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY));
           ASSERT(null_fd >= 0);
           VOID_TEMP_FAILURE_RETRY(dup2(null_fd, STDOUT_FILENO));
           VOID_TEMP_FAILURE_RETRY(close(null_fd));
         } else {
           sd->Close();
         }
         socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd));
         delete sd;
+        DartUtils::PostInt32(msg.dart_port, 1 << kDestroyedEvent);
       } else {
         // Setup events to wait for.
         sd->SetPortAndMask(msg.dart_port, msg.data);
         UpdateEpollInstance(epoll_fd_, sd);
       }
     }
   }
 }
 
 #ifdef DEBUG_POLL
@@ skipping 197 matching lines @@
 
 uint32_t EventHandlerImplementation::GetHashmapHashFromFd(intptr_t fd) {
   // The hashmap does not support keys with value 0.
   return dart::Utils::WordHash(fd + 1);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)