diff options
Diffstat (limited to 'devel/gamin/files/patch-server_gam_kqueue.c')
| -rw-r--r-- | devel/gamin/files/patch-server_gam_kqueue.c | 83 |
1 files changed, 72 insertions, 11 deletions
diff --git a/devel/gamin/files/patch-server_gam_kqueue.c b/devel/gamin/files/patch-server_gam_kqueue.c index dc0cece61eec..fe4d5a51cbf0 100644 --- a/devel/gamin/files/patch-server_gam_kqueue.c +++ b/devel/gamin/files/patch-server_gam_kqueue.c @@ -1,20 +1,25 @@ --- server/gam_kqueue.c.orig Wed Aug 10 23:50:32 2005 -+++ server/gam_kqueue.c Wed Feb 8 12:43:52 2006 -@@ -10,9 +10,8 @@ ++++ server/gam_kqueue.c Tue Feb 14 10:00:17 2006 +@@ -10,9 +10,10 @@ * FAM should do: we do not call g_dir_open() if the file is a * symbolic link). * - * * kqueue cannot monitor files residing on anything but a UFS - * file system. If kqueue cannot monitor a file, this backend - * will poll it periodically. -+ * * kqueue can only monitor files residing on a UFS file system. -+ * For other file systems, the basic poll backend will be used. ++ * * While kqueue is no longer tied to the UFS file system, it is ++ * better to not use it for remote file systems (because for ++ * such file systems, only local changes are detected by ++ * the kernel). * * * Monitoring a file with kqueue prevents the file system it * resides on from being unmounted, because kqueue can only -@@ -31,7 +30,8 @@ - * - kqueue needs to be moved out the UFS code. +@@ -28,10 +29,9 @@ + * - kqueue needs to be augmented with a filename-based + * monitoring facility; * +- * - kqueue needs to be moved out the UFS code. +- * * Copyright (C) 2005 Joe Marcus Clarke <marcus@FreeBSD.org> - * Copyright (C) 2005 Jean-Yves Lefort <jylefort@FreeBSD.org> + * Copyright (C) 2005, 2006 Jean-Yves Lefort <jylefort@FreeBSD.org> @@ -22,7 +27,17 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -@@ -63,7 +63,7 @@ +@@ -53,6 +53,9 @@ + #include <fcntl.h> + #include <unistd.h> + #include <sys/param.h> ++#ifndef USE_GAMIN_POLLER ++#include <sys/mount.h> ++#endif + #include <sys/types.h> + #include <sys/sysctl.h> + #include <sys/stat.h> +@@ -63,7 +66,7 @@ #include "gam_kqueue.h" #include "gam_event.h" #include "gam_server.h" @@ -31,7 +46,17 @@ /*** tunable constants, modify to tweak the backend aggressivity *************/ -@@ -516,7 +516,7 @@ +@@ -509,6 +512,9 @@ + gam_kqueue_monitor_enable_kqueue (Monitor *mon) + { + struct kevent ev[1]; ++#ifndef USE_GAMIN_POLLER ++ struct statfs sb; ++#endif + + if (open_files == max_open_files) + { +@@ -516,26 +522,36 @@ return FALSE; } @@ -40,7 +65,41 @@ if (mon->fd < 0) { GAM_DEBUG(DEBUG_INFO, "cannot open %s (%s), falling back to poll\n", mon->pathname, g_strerror(errno)); -@@ -840,6 +840,8 @@ + return FALSE; + } + ++#ifndef USE_GAMIN_POLLER ++ if (fstatfs(mon->fd, &sb) == 0 && (sb.f_flags & MNT_LOCAL) == 0) ++ { ++ GAM_DEBUG(DEBUG_INFO, "%s resides on a remote file system, falling back to poll\n", mon->pathname); ++ goto poll; ++ } ++#endif ++ + EV_SET(ev, mon->fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, VN_NOTE_ALL, 0, mon); + if (kevent(kq, ev, G_N_ELEMENTS(ev), NULL, 0, NULL) < 0) + { + GAM_DEBUG(DEBUG_INFO, "cannot enable kqueue notification for %s (%s), falling back to poll\n", mon->pathname, g_strerror(errno)); +- +- close(mon->fd); +- mon->fd = -1; +- +- return FALSE; ++ goto poll; + } + + open_files++; + return TRUE; ++ ++ poll: ++ close(mon->fd); ++ mon->fd = -1; ++ ++ return FALSE; + } + + static void +@@ -840,6 +856,8 @@ case GAMIN_EVENT_MOVED: gam_kqueue_sub_monitor_set_missing(smon); break; @@ -49,7 +108,7 @@ } gam_server_emit_event(mon->pathname, isdir, event, smon->subs, 1); -@@ -981,6 +983,8 @@ +@@ -981,6 +999,8 @@ gam_kqueue_hash_table_remove(fmon->smon->fmons, fmon); break; @@ -58,7 +117,7 @@ } } -@@ -1167,11 +1171,13 @@ +@@ -1167,11 +1187,15 @@ channel = g_io_channel_unix_new(kq); g_io_add_watch(channel, G_IO_IN, gam_kqueue_kevent_cb, NULL); @@ -67,7 +126,9 @@ - gam_backend_add_subscription = gam_kqueue_add_subscription; - gam_backend_remove_subscription = gam_kqueue_remove_subscription; - gam_backend_remove_all_for = gam_kqueue_remove_all_for; ++#ifdef USE_GAMIN_POLLER + gam_poll_basic_init (); ++#endif + gam_server_install_kernel_hooks (GAMIN_K_KQUEUE, + gam_kqueue_add_subscription, + gam_kqueue_remove_subscription, |