cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I finally nailed down the previous issue, so re-enable kqueue support.

Browse Source 
Successfully tested with nautilus and pcmanfm.
This commit is contained in:
ajacoutot 2009-12-06 17:48:37 +00:00
parent 31ebff5110
commit a74730da46
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/gamin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2009/12/06 13:38:54 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.5 2009/12/06 17:48:37 ajacoutot Exp $
COMMENT-main= file and directory monitoring system COMMENT-main= file and directory monitoring system
COMMENT-server= gamin file monitoring server COMMENT-server= gamin file monitoring server
@ -8,7 +8,7 @@ GNOME_PROJECT= gamin
GNOME_VERSION= 0.1.10 GNOME_VERSION= 0.1.10
PKGNAME-main= libgamin-${GNOME_VERSION} PKGNAME-main= libgamin-${GNOME_VERSION}
PKGNAME-server= ${DISTNAME}p2 PKGNAME-server= ${DISTNAME}p3
PKGNAME-python= py-gamin-${GNOME_VERSION} PKGNAME-python= py-gamin-${GNOME_VERSION}
SHARED_LIBS += gamin-1 0.0 # .1.10 SHARED_LIBS += gamin-1 0.0 # .1.10

25
sysutils/gamin/patches/patch-server_gam_kqueue_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-server_gam_kqueue_c,v 1.4 2009/12/06 13:38:54 ajacoutot Exp $ $OpenBSD: patch-server_gam_kqueue_c,v 1.5 2009/12/06 17:48:37 ajacoutot Exp $
From FreeBSD: From FreeBSD:
Make sure that excluded paths do not get opened (but rather they will be Make sure that excluded paths do not get opened (but rather they will be
@ -13,7 +13,7 @@ default to "0" and kqueue will never be used. Instead, use get+setrlimit
to get a correct value. to get a correct value.
--- server/gam_kqueue.c.orig Wed Jul 4 15:50:41 2007 --- server/gam_kqueue.c.orig Wed Jul 4 15:50:41 2007
+++ server/gam_kqueue.c Sat Dec 5 23:10:14 2009 +++ server/gam_kqueue.c Sun Dec 6 18:40:54 2009
@@ -31,7 +31,8 @@ @@ -31,7 +31,8 @@
* - kqueue needs to be moved out the UFS code. * - kqueue needs to be moved out the UFS code.
* *
@ -156,16 +156,12 @@ to get a correct value.
/* /*
* We make sure to: * We make sure to:
* - never paralyze the system (CFG_GLOBAL_FILE_RESERVE_RATIO) * - never paralyze the system (CFG_GLOBAL_FILE_RESERVE_RATIO)
@@ -1145,9 +1163,28 @@ gam_kqueue_init (void) @@ -1145,6 +1163,23 @@ gam_kqueue_init (void)
*/ */
maxfiles *= CFG_GLOBAL_FILE_RESERVE_RATIO; maxfiles *= CFG_GLOBAL_FILE_RESERVE_RATIO;
+#if defined(KERN_MAXFILESPERPROC) + maxfilesperproc = 128;
maxfilesperproc = maxfilesperproc > CFG_SELF_FILE_RESERVE +
? maxfilesperproc - CFG_SELF_FILE_RESERVE
: 0;
+#else
+ maxfilesperproc = 0; /* XXX 128 */
+ struct rlimit rlp; + struct rlimit rlp;
+ if (getrlimit(RLIMIT_NOFILE, &rlp) == 0) + if (getrlimit(RLIMIT_NOFILE, &rlp) == 0)
+ { + {
@ -177,11 +173,10 @@ to get a correct value.
+ } + }
+ else + else
+ { + {
+// XXX kqueue hangs + maxfilesperproc = rlp.rlim_max;
+// maxfilesperproc = rlp.rlim_max;
+ } + }
+ } + }
+#endif +
maxfilesperproc = maxfilesperproc > CFG_SELF_FILE_RESERVE
max_open_files = MIN(maxfiles, maxfilesperproc); ? maxfilesperproc - CFG_SELF_FILE_RESERVE
: 0;