octoleo/lsyncd
1
0
Fork 0
mirror of https://github.com/octoleo/lsyncd.git synced 2024-11-10 23:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

do immediate tackles

Browse Source
This commit is contained in:
Axel Kittenberger 2010-08-03 14:49:53 +00:00
parent bc2fe74cc1
commit cf47587b9b
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lsyncd.c
View File

@ -1451,10 +1451,9 @@ handle_event(const struct global_options *opts,
watch = get_dirwatch_offset(event->wd); watch = get_dirwatch_offset(event->wd);
if (watch == -1) { if (watch == -1) {
// this should not happen! // this can happen in case of data moving faster than lsyncd can monitor it.
printlogf(log, ERROR, printlogf(log, NORMAL,
"received an inotify event that doesnt match any watched directory :-(%d,%d)", "received an inotify event that doesnt match any watched directory.");
event->mask, event->wd);
return false; return false;
} }
@ -1472,8 +1471,7 @@ handle_event(const struct global_options *opts,
if ((IN_ATTRIB | IN_CREATE | IN_CLOSE_WRITE | IN_DELETE | if ((IN_ATTRIB | IN_CREATE | IN_CLOSE_WRITE | IN_DELETE |
IN_MOVED_TO | IN_MOVED_FROM) & event->mask IN_MOVED_TO | IN_MOVED_FROM) & event->mask
) { ) {
printlogf(log, NORMAL, "event %s:%s triggered.", masktext, event->name); printlogf(log, NORMAL, "received event %s:%s.", masktext, event->name);
tackle_dir(opts, watch, alarm); tackle_dir(opts, watch, alarm);
} else { } else {
printlogf(log, DEBUG, "... ignored this event."); printlogf(log, DEBUG, "... ignored this event.");
@ -1512,8 +1510,13 @@ master_loop(const struct global_options *opts,
} }
while (keep_going) { while (keep_going) {
int ready; int do_read;
if (opts->delay > 0 && tackles->len > 0) { if (tackles->len > 0 && time_after(times(NULL), dir_watches->data[tackles->data[0]].alarm)) {
// there is a tackle that wants to be handled already
// do not read from inotify_fd and jump directly to tackles handling
printlogf(log, DEBUG, "immediately handling tackles");
do_read = 0;
} else if (opts->delay > 0 && tackles->len > 0) {
// use select() to determine what happens first // use select() to determine what happens first
// a new event or "alarm" of an event to actually // a new event or "alarm" of an event to actually
// call its binary. The tackle with the index 0 // call its binary. The tackle with the index 0
@ -1527,15 +1530,22 @@ master_loop(const struct global_options *opts,
tv.tv_sec = opts->delay; tv.tv_sec = opts->delay;
tv.tv_usec = 0; tv.tv_usec = 0;
} }
ready = select(inotify_fd + 1, &readfds, NULL, NULL, &tv); // if select returns a positive number there is data on inotify
// on zero the timemout occured.
do_read = select(inotify_fd + 1, &readfds, NULL, NULL, &tv);
if (do_read) {
printlogf(log, DEBUG, "theres data on inotify.");
} else {
printlogf(log, DEBUG, "select() timeouted, doiong tackles.");
}
} else { } else {
// if nothing to wait for, enter a blocking read // if nothing to wait for, enter a blocking read
// (sorry this variable is named a bit confusing printlogf(log, DEBUG, "gone blocking");
// in this case) do_read = 1;
ready = 1;
} }
if (ready) { if (do_read) {
len = read (inotify_fd, buf, INOTIFY_BUF_LEN); len = read (inotify_fd, buf, INOTIFY_BUF_LEN);
} else { } else {
len = 0; len = 0;

9
tests/directorycpr.sh
View File

@ -22,25 +22,22 @@ echo -e "$CON* waiting for lsyncd to start$COFF"
sleep 4s sleep 4s
# cp -r the directory # cp -r the directory
echo -e "$CON* make a lot of copies$OFF" echo -e "$CON* make a lot of data$OFF"
for A in 1 2 3 4 5 6 7 8 9 10; do for A in 1 2 3 4 5 6 7 8 9 10; do
cp -r "${WORKSOURCE}"/a "${WORKSOURCE}"/b${A} cp -r "${WORKSOURCE}"/a "${WORKSOURCE}"/b${A}
echo 'test2' > "${WORKSOURCE}"/b${A}/a/another echo 'test2' > "${WORKSOURCE}"/b${A}/a/another
done done
echo -e "$CON* mkdir double path$OFF"
mkdir -p "${WORKSOURCE}"/c/a mkdir -p "${WORKSOURCE}"/c/a
echo 'test3' > "${WORKSOURCE}"/c/a/file echo 'test3' > "${WORKSOURCE}"/c/a/file
echo -e "$CON* copy the other dir a few times$COFF"
for A in 1 2 3 4 5 6 7 8 9 10; do for A in 1 2 3 4 5 6 7 8 9 10; do
cp -r "${WORKSOURCE}"/c "${WORKSOURCE}"/d${A} cp -r "${WORKSOURCE}"/c "${WORKSOURCE}"/d${A}
echo 'test2' > "${WORKSOURCE}"/d${A}/a/another echo 'test2' > "${WORKSOURCE}"/d${A}/a/another
done done
echo -e "$CON*waiting until lsyncd does the job.$COFF" echo -e "$CON*waiting until lsyncd does the job.$COFF"
sleep 15s sleep 60s
echo -e "$CON*killing lsyncd" echo -e "$CON*killing lsyncd$COFF"
LSYNCPID=$(cat "${PIDFILE}") LSYNCPID=$(cat "${PIDFILE}")
if ! kill "${LSYNCPID}"; then if ! kill "${LSYNCPID}"; then
cat "${LOGFILE}" cat "${LOGFILE}"