[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC vs.
Revision 1.156 by root, Wed Nov 28 17:50:13 2007 UTC

       perror (msg);
       abort ();
     }
 }
-static void *(*alloc)(void *ptr, size_t size) = realloc;
+static void *(*alloc)(void *ptr, long size);
 void
-ev_set_allocator (void *(*cb)(void *ptr, size_t size))
+ev_set_allocator (void *(*cb)(void *ptr, long size))
 {
   alloc = cb;
 }
 inline_speed void *
-ev_realloc (void *ptr, size_t size)
+ev_realloc (void *ptr, long size)
 {
-  ptr = alloc (ptr, size);
+  ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
   if (!ptr && size)
     {
-      fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
+      fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
       abort ();
     }
   return ptr;
 }
 {
   W w;
   int events;
 } ANPENDING;
+#if EV_USE_INOTIFY
 typedef struct
 {
-#if EV_USE_INOTIFY
   WL head;
-#endif
 } ANFS;
+#endif
 #if EV_MULTIPLICITY
   struct ev_loop
   {
   array_free (check, EMPTY0);
   backend = 0;
 }
+void inline_size infy_fork (EV_P);
 void inline_size
 loop_fork (EV_P)
 {
 #if EV_USE_PORT
   if (backend == EVBACKEND_PORT  ) port_fork   (EV_A);
 #if EV_USE_KQUEUE
   if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
 #endif
 #if EV_USE_EPOLL
   if (backend == EVBACKEND_EPOLL ) epoll_fork  (EV_A);
+#endif
+#if EV_USE_INOTIFY
+  infy_fork (EV_A);
 #endif
   if (ev_is_active (&sigev))
     {
       /* default loop */
 #define MIN_STAT_INTERVAL 0.1074891
 void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
 #if EV_USE_INOTIFY
-# define EV_INOTIFY_BUFSIZE ((PATH_MAX + sizeof (struct inotify_event)) + 2048)
+# define EV_INOTIFY_BUFSIZE 8192
 static void noinline
 infy_add (EV_P_ ev_stat *w)
 {
   w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
   if (w->wd < 0)
     {
       ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
       /* monitor some parent directory for speedup hints */
-      if (errno == ENOENT || errno == EACCES)
+      if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
         {
-          char path [PATH_MAX];
+          char path [4096];
           strcpy (path, w->path);
           do
             {
               int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
               if (!pend)
                 break; /* whoops, no '/', complain to your admin */
               *pend = 0;
-              w->wd = inotify_add_watch (fs_fd, path, IN_DELETE_SELF | IN_CREATE | IN_MOVED_TO | IN_MASK_ADD);
+              w->wd = inotify_add_watch (fs_fd, path, mask);
             }
           while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
         }
     }
   else
 }
 static void noinline
 infy_del (EV_P_ ev_stat *w)
 {
-  WL w_;
   int slot;
   int wd = w->wd;
   if (wd < 0)
     return;
                 {
                   w->wd = -1;
                   infy_add (EV_A_ w); /* re-add, no matter what */
                 }
-              stat_timer_cb (EV_P_ &w->timer, 0);
+              stat_timer_cb (EV_A_ &w->timer, 0);
             }
         }
     }
 }
       ev_set_priority (&fs_w, EV_MAXPRI);
       ev_io_start (EV_A_ &fs_w);
     }
 }
+void inline_size
+infy_fork (EV_P)
+{
+  int slot;
+  if (fs_fd < 0)
+    return;
+  close (fs_fd);
+  fs_fd = inotify_init ();
+  for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
+    {
+      WL w_ = fs_hash [slot].head;
+      fs_hash [slot].head = 0;
+      while (w_)
+        {
+          ev_stat *w = (ev_stat *)w_;
+          w_ = w_->next; /* lets us add this watcher */
+          w->wd = -1;
+          if (fs_fd >= 0)
+            infy_add (EV_A_ w); /* re-add, no matter what */
+          else
+            ev_timer_start (EV_A_ &w->timer);
+        }
+    }
+}
 #endif
 void
 ev_stat_stat (EV_P_ ev_stat *w)
 {
   /* we copy this here each the time so that */
   /* prev has the old value when the callback gets invoked */
   w->prev = w->attr;
   ev_stat_stat (EV_A_ w);
-  if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
+  /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
+  if (
+    w->prev.st_dev      != w->attr.st_dev
+    || w->prev.st_ino   != w->attr.st_ino
+    || w->prev.st_mode  != w->attr.st_mode
+    || w->prev.st_nlink != w->attr.st_nlink
+    || w->prev.st_uid   != w->attr.st_uid
+    || w->prev.st_gid   != w->attr.st_gid
+    || w->prev.st_rdev  != w->attr.st_rdev
+    || w->prev.st_size  != w->attr.st_size
+    || w->prev.st_atime != w->attr.st_atime
+    || w->prev.st_mtime != w->attr.st_mtime
+    || w->prev.st_ctime != w->attr.st_ctime
-    {
+  ) {
       #if EV_USE_INOTIFY
         infy_del (EV_A_ w);
         infy_add (EV_A_ w);
         ev_stat_stat (EV_A_ w); /* avoid race... */
       #endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev.c (file contents): Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC vs. Revision 1.156 by root, Wed Nov 28 17:50:13 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC vs.
Revision 1.156 by root, Wed Nov 28 17:50:13 2007 UTC