tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build the real-time monitor by default on FreeBSD (depend on USE_FAM). Fix a few glitches in the fam/gamin version

Browse Source
This commit is contained in:
Jean-Francois Dockes
2011-10-14 14:06:24 +02:00
parent 6d82d83037
commit 3853c5c0da
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/configure
Vendored
+2 -1
View File
@@ -4243,9 +4243,10 @@ fi
if test "${with_fam+set}" = set; then :
withval=$with_fam; withFam=$withval
else
withFam=no
withFam=yes
fi
if test X$withFam != Xno -a X$withInotify != Xno ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: FAM support enabled but inotify support also enabled. Disabling FAM support and using inotify" >&5
$as_echo "$as_me: FAM support enabled but inotify support also enabled. Disabling FAM support and using inotify" >&6;}
src/configure.ac
+2 -1
View File
@@ -119,7 +119,8 @@ fi
AC_ARG_WITH(fam,
AC_HELP_STRING([--with-fam],
[Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]),
withFam=$withval, withFam=no)
withFam=$withval, withFam=yes)
if test X$withFam != Xno -a X$withInotify != Xno ; then
AC_MSG_NOTICE([FAM support enabled but inotify support also enabled. Disabling FAM support and using inotify])
withFam=no
src/index/rclmonrcv.cpp
+13 -5
View File
@@ -179,6 +179,10 @@ void *rclMonRcvRun(void *q)
LOGERR(("rclMonRcvRun: tree walk failed\n"));
goto terminate;
}
if (walker.getErrCnt() > 0) {
LOGINFO(("rclMonRcvRun: fs walker errors: %s\n",
walker.getReason().c_str()));
}
}
{
@@ -218,10 +222,14 @@ void *rclMonRcvRun(void *q)
LOGDEB(("rclMonRcvRun: walking new dir %s\n",
ev.m_path.c_str()));
if (walker.walk(ev.m_path, walkcb) != FsTreeWalker::FtwOk) {
LOGERR(("rclMonRcvRun: failed walking new dir %s\n",
ev.m_path.c_str()));
LOGERR(("rclMonRcvRun: walking new dir %s: %s\n",
ev.m_path.c_str(), walker.getReason().c_str()));
goto terminate;
}
if (walker.getErrCnt() > 0) {
LOGINFO(("rclMonRcvRun: fs walker errors: %s\n",
walker.getReason().c_str()));
}
}
}
@@ -241,7 +249,7 @@ terminate:
bool eraseWatchSubTree(map<int, string>& idtopath, const string& top)
{
bool found = false;
LOGDEB0(("Clearing map for [%s]\n", top.c_str()));
MONDEB(("Clearing map for [%s]\n", top.c_str()));
map<int,string>::iterator it = idtopath.begin();
while (it != idtopath.end()) {
if (it->second.find(top) == 0) {
@@ -461,8 +469,8 @@ bool RclFAM::getEvent(RclMonEvent& ev, int msecs)
ev.m_etyp = RclMonEvent::RCLEVT_DELETE;
// We would like to signal a directory here to enable cleaning
// the subtree (on a dir move), but can't test the actual file
// which is gone. Let's rely on the fact that a directory
// should be watched
// which is gone, and fam doesn't tell us if it's a dir or reg.
// Let's rely on the fact that a directory should be watched
if (eraseWatchSubTree(m_idtopath, ev.m_path))
ev.m_etyp |= RclMonEvent::RCLEVT_ISDIR;
break;