Make FileSystemWatcher work on MIPS and make watching on android the same as linux.

runtime/bin/file_system_watcher_android.cc

 // 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.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/file_system_watcher.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/inotify.h>  // NOLINT
 
 #include "bin/fdutils.h"
 
 
 namespace dart {
 namespace bin {
 
 bool FileSystemWatcher::IsSupported() {
   return true;
 }
 
 
 intptr_t FileSystemWatcher::WatchPath(const char* path,
                                       int events,
                                       bool recursive) {
   int fd = TEMP_FAILURE_RETRY(inotify_init());

[Søren Gjesse, 2013/10/30 14:05:51]

Please add a comment on why this fd is blocking.

[Anders Johnsen, 2013/10/30 14:17:22]

Done.

-  if (fd < 0 || !FDUtils::SetNonBlocking(fd) || !FDUtils::SetCloseOnExec(fd)) {
+  if (fd < 0 || !FDUtils::SetCloseOnExec(fd)) {
     return -1;
   }
-  int list_events = 0;
+  // Some systems dosn't support setting this as non-blocking. Since watching
+  // internals are kept away from the user, we know it's possible to continue,
+  // even if setting non-blocking fails.
+  FDUtils::SetNonBlocking(fd);
+  int list_events = IN_DELETE_SELF | IN_MOVE_SELF;
   if (events & kCreate) list_events |= IN_CREATE;
   if (events & kModifyContent) list_events |= IN_MODIFY | IN_ATTRIB;
   if (events & kDelete) list_events |= IN_DELETE;
   if (events & kMove) list_events |= IN_MOVE;
   int path_fd = TEMP_FAILURE_RETRY(inotify_add_watch(fd, path, list_events));
   if (path_fd < 0) {
     close(fd);
     return -1;
   }
   return fd;
@@ skipping 20 matching lines @@
   }
   const intptr_t kMaxCount = kBufferSize / kEventSize + 1;
   Dart_Handle events = Dart_NewList(kMaxCount);
   intptr_t offset = 0;
   intptr_t i = 0;
   while (offset < bytes) {
     struct inotify_event* e =
         reinterpret_cast<struct inotify_event*>(buffer + offset);
     Dart_Handle event = Dart_NewList(4);
     int mask = 0;
-    if (e->mask & IN_MODIFY) mask |= kModifyContent;
+    if (e->mask & IN_CLOSE_WRITE) mask |= kModifyContent;
     if (e->mask & IN_ATTRIB) mask |= kModefyAttribute;
     if (e->mask & IN_CREATE) mask |= kCreate;
     if (e->mask & IN_MOVE) mask |= kMove;
     if (e->mask & IN_DELETE) mask |= kDelete;
+    if (e->mask & (IN_DELETE_SELF | IN_MOVE_SELF)) mask |= kDeleteSelf;
+    if (e->mask & IN_ISDIR) mask |= kIsDir;
     Dart_ListSetAt(event, 0, Dart_NewInteger(mask));
     Dart_ListSetAt(event, 1, Dart_NewInteger(e->cookie));
     if (e->len > 0) {
       Dart_ListSetAt(event, 2, Dart_NewStringFromUTF8(
           reinterpret_cast<uint8_t*>(e->name), strlen(e->name)));
     } else {
       Dart_ListSetAt(event, 2, Dart_Null());
     }
     Dart_ListSetAt(event, 3, Dart_NewBoolean(e->mask & IN_MOVED_TO));
     Dart_ListSetAt(events, i, event);
     i++;
     offset += kEventSize + e->len;
   }
   ASSERT(offset == bytes);
   return events;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)