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

Comparing libev/ev.c (file contents):
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC vs.
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC

  */
 #define TIME_EPSILON  0.0001220703125 /* 1/8192 */
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
-/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
 #if __GNUC__ >= 4
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define noinline                   __attribute__ ((noinline))
 #else
         }
     }
 #if EV_USE_SIGNALFD
   if (ev_is_active (&sigfd_w))
-    {
-      /*ev_ref (EV_A);*/
-      /*ev_io_stop (EV_A_ &sigfd_w);*/
-      close (sigfd);
+    close (sigfd);
-    }
 #endif
 #if EV_USE_INOTIFY
   if (fs_fd >= 0)
     close (fs_fd);
 # if EV_USE_SIGNALFD
     if (sigfd < 0) /*TODO*/
 # endif
       {
 # if _WIN32
+        evpipe_init (EV_A);
         signal (w->signum, ev_sighandler);
 # else
         struct sigaction sa;
         evpipe_init (EV_A);
 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)
+  if (w->wd >= 0)
+    {
+      struct statfs sfs;
+      /* now local changes will be tracked by inotify, but remote changes won't */
+      /* unless the filesystem is known to be local, we therefore still poll */
+      /* also do poll on <2.6.25, but with normal frequency */
+      if (!fs_2625)
+        w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
+      else if (!statfs (w->path, &sfs)
+               && (sfs.f_type == 0x1373 /* devfs */
+                   || sfs.f_type == 0xEF53 /* ext2/3 */
+                   || sfs.f_type == 0x3153464a /* jfs */
+                   || sfs.f_type == 0x52654973 /* reiser3 */
+                   || sfs.f_type == 0x01021994 /* tempfs */
+                   || sfs.f_type == 0x58465342 /* xfs */))
+        w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
+      else
+        w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
-    {
+    }
+  else
+    {
+      /* can't use inotify, continue to stat */
       w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
-      ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
-      /* monitor some parent directory for speedup hints */
+      /* if path is not there, monitor some parent directory for speedup hints */
       /* note that exceeding the hardcoded path limit is not a correctness issue, */
       /* but an efficiency issue only */
       if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
         {
           char path [4096];
           while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
         }
     }
   if (w->wd >= 0)
-    {
-      struct statfs sfs;
-      wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
+    wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
-      /* now local changes will be tracked by inotify, but remote changes won't */
+  /* now re-arm timer, if required */
-      /* unless the filesystem it known to be local, we therefore still poll */
+  if (ev_is_active (&w->timer)) ev_ref (EV_A);
-      /* also do poll on <2.6.25, but with normal frequency */
-      if (fs_2625 && !statfs (w->path, &sfs))
-        if (sfs.f_type == 0x1373 /* devfs */
-            || sfs.f_type == 0xEF53 /* ext2/3 */
-            || sfs.f_type == 0x3153464a /* jfs */
-            || sfs.f_type == 0x52654973 /* reiser3 */
-            || sfs.f_type == 0x01021994 /* tempfs */
-            || sfs.f_type == 0x58465342 /* xfs */)
-          return;
-      w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
-      ev_timer_again (EV_A_ &w->timer);
+  ev_timer_again (EV_A_ &w->timer);
-    }
+  if (ev_is_active (&w->timer)) ev_unref (EV_A);
 }
 static void noinline
 infy_del (EV_P_ ev_stat *w)
 {
     {
       fd_intern (fs_fd);
       ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
       ev_set_priority (&fs_w, EV_MAXPRI);
       ev_io_start (EV_A_ &fs_w);
+      ev_unref (EV_A);
     }
 }
 inline_size void
 infy_fork (EV_P)
   int slot;
   if (fs_fd < 0)
     return;
+  ev_ref (EV_A);
   ev_io_stop (EV_A_ &fs_w);
   close (fs_fd);
   fs_fd = infy_newfd ();
   if (fs_fd >= 0)
     {
       fd_intern (fs_fd);
       ev_io_set (&fs_w, fs_fd, EV_READ);
       ev_io_start (EV_A_ &fs_w);
+      ev_unref (EV_A);
     }
   for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
     {
       WL w_ = fs_hash [slot].head;
           w->wd = -1;
           if (fs_fd >= 0)
             infy_add (EV_A_ w); /* re-add, no matter what */
           else
+            {
+              w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
+              if (ev_is_active (&w->timer)) ev_ref (EV_A);
-            ev_timer_again (EV_A_ &w->timer);
+              ev_timer_again (EV_A_ &w->timer);
+              if (ev_is_active (&w->timer)) ev_unref (EV_A);
+            }
         }
     }
 }
 #endif
   if (fs_fd >= 0)
     infy_add (EV_A_ w);
   else
 #endif
+    {
-    ev_timer_again (EV_A_ &w->timer);
+      ev_timer_again (EV_A_ &w->timer);
+      ev_unref (EV_A);
+    }
   ev_start (EV_A_ (W)w, 1);
   EV_FREQUENT_CHECK;
 }
   EV_FREQUENT_CHECK;
 #if EV_USE_INOTIFY
   infy_del (EV_A_ w);
 #endif
+  if (ev_is_active (&w->timer))
+    {
+      ev_ref (EV_A);
-  ev_timer_stop (EV_A_ &w->timer);
+      ev_timer_stop (EV_A_ &w->timer);
+    }
   ev_stop (EV_A_ (W)w);
   EV_FREQUENT_CHECK;
 }

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC vs. Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC vs.
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC