octoleo/lsyncd
1
0
Fork 0
mirror of https://github.com/octoleo/lsyncd.git synced 2025-01-07 17:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

a new level of indirection

Browse Source
This commit is contained in:
Axel Kittenberger 2010-08-04 09:51:59 +00:00
parent 15f3c9261c
commit 414a426452
2 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
lsyncd.c
View File

@ -381,7 +381,10 @@ struct inotify_mask_text mask_texts[] = {
* Holds all directories being watched. * Holds all directories being watched.
*/ */
struct watch_vector { struct watch_vector {
struct watch *data; /**
* TODO
*/
struct watch **data;
size_t size; size_t size;
size_t len; size_t len;
}; };
@ -755,12 +758,12 @@ dir_conf_add_target(const struct log *log, struct dir_conf *dir_conf, char *targ
bool bool
append_delay(const struct log *log, struct watch_vector *watches, int watch, clock_t alarm) { append_delay(const struct log *log, struct watch_vector *watches, int watch, clock_t alarm) {
printlogf(log, DEBUG, "append delay(%d)", watch); printlogf(log, DEBUG, "append delay(%d)", watch);
if (watches->data[watch].delayed) { if (watches->data[watch]->delayed) {
printlogf(log, DEBUG, "ignored since already delayed.", watch); printlogf(log, DEBUG, "ignored since already delayed.", watch);
return false; return false;
} }
watches->data[watch].delayed = true; watches->data[watch]->delayed = true;
watches->data[watch].alarm = alarm; watches->data[watch]->alarm = alarm;
ivector_push(log, delays, watch); ivector_push(log, delays, watch);
return true; return true;
@ -775,7 +778,7 @@ void
remove_first_delay(struct watch_vector *watches) { remove_first_delay(struct watch_vector *watches) {
int tw = delays->data[0]; int tw = delays->data[0];
memmove(delays->data, delays->data + 1, (--delays->len) * sizeof(int)); memmove(delays->data, delays->data + 1, (--delays->len) * sizeof(int));
watches->data[tw].delayed = false; watches->data[tw]->delayed = false;
} }
/*--------------------------------------------------------------------------* /*--------------------------------------------------------------------------*
@ -1010,27 +1013,33 @@ add_watch(const struct log *log,
} }
// look if an unused slot can be found. // look if an unused slot can be found.
//
// lsyncd currently does not free unused slots, but marks
// them as unused with wd < 0.
for (newdw = 0; newdw < watches->len; newdw++) { for (newdw = 0; newdw < watches->len; newdw++) {
if (watches->data[newdw].wd < 0) { if (watches->data[newdw]->wd < 0) {
break; break;
} }
} }
// there is no unused entry
if (newdw == watches->len) { if (newdw == watches->len) {
// extend the vector if necessary
if (watches->len + 1 >= watches->size) { if (watches->len + 1 >= watches->size) {
watches->size *= 2; watches->size *= 2;
watches->data = s_realloc(log, watches->data, watches->data = s_realloc(log, watches->data,
watches->size * sizeof(struct watch)); watches->size * sizeof(struct watch *));
} }
watches->len++; // allocate memory for a new watch
watches->data[watches->len++] = s_calloc(log, 1, sizeof(struct watch));
} }
watches->data[newdw].wd = wd; watches->data[newdw]->wd = wd;
watches->data[newdw].parent = parent; watches->data[newdw]->parent = parent;
watches->data[newdw].dirname = s_strdup(log, dirname); watches->data[newdw]->dirname = s_strdup(log, dirname);
watches->data[newdw].dir_conf = dir_conf; watches->data[newdw]->dir_conf = dir_conf;
watches->data[newdw].alarm = 0; // not needed, just to be save watches->data[newdw]->alarm = 0; // not needed, just to be save
watches->data[newdw].delayed = false; watches->data[newdw]->delayed = false;
return newdw; return newdw;
} }
@ -1062,9 +1071,9 @@ builddir(char *pathname,
return -1; return -1;
} }
strcpy(pathname, p); strcpy(pathname, p);
} else if (watches->data[watch].parent == -1) { } else if (watches->data[watch]->parent == -1) {
// this is a watch root. // this is a watch root.
char const * p = prefix ? prefix : watches->data[watch].dirname; char const * p = prefix ? prefix : watches->data[watch]->dirname;
len = strlen(p); len = strlen(p);
if (pathsize <= len) { if (pathsize <= len) {
return -1; return -1;
@ -1072,12 +1081,12 @@ builddir(char *pathname,
strcpy(pathname, p); strcpy(pathname, p);
} else { } else {
// this is some sub dir // this is some sub dir
len = builddir(pathname, pathsize, watches, watches->data[watch].parent, prefix); /* recurse */ len = builddir(pathname, pathsize, watches, watches->data[watch]->parent, prefix); /* recurse */
len += strlen(watches->data[watch].dirname); len += strlen(watches->data[watch]->dirname);
if (pathsize <= len) { if (pathsize <= len) {
return -1; return -1;
} }
strcat(pathname, watches->data[watch].dirname); strcat(pathname, watches->data[watch]->dirname);
} }
// add the trailing slash if it is missing // add the trailing slash if it is missing
if (*pathname && pathname[strlen(pathname)-1] != '/') { if (*pathname && pathname[strlen(pathname)-1] != '/') {
@ -1147,7 +1156,7 @@ rsync_dir(const struct global_options *opts,
return false; return false;
} }
for (target = watches->data[watch].dir_conf->targets; *target; target++) { for (target = watches->data[watch]->dir_conf->targets; *target; target++) {
if (!buildpath(log, destname, sizeof(destname), watches, watch, NULL, *target)) { if (!buildpath(log, destname, sizeof(destname), watches, watch, NULL, *target)) {
status = false; status = false;
continue; continue;
@ -1155,7 +1164,7 @@ rsync_dir(const struct global_options *opts,
printlogf(log, NORMAL, "rsyncing %s --> %s", pathname, destname); printlogf(log, NORMAL, "rsyncing %s --> %s", pathname, destname);
// call rsync to propagate changes in the directory // call rsync to propagate changes in the directory
if (!action(opts, watches->data[watch].dir_conf, pathname, destname, false)) { if (!action(opts, watches->data[watch]->dir_conf, pathname, destname, false)) {
printlogf(log, ERROR, "Rsync from %s to %s failed", pathname, destname); printlogf(log, ERROR, "Rsync from %s to %s failed", pathname, destname);
status = false; status = false;
} }
@ -1224,7 +1233,7 @@ add_dirwatch(const struct global_options *opts,
printlogf(log, DEBUG, "add_dirwatch(%s, p->dirname:%s, ...)", printlogf(log, DEBUG, "add_dirwatch(%s, p->dirname:%s, ...)",
dirname, dirname,
parent >= 0 ? watches->data[parent].dirname : "NULL"); parent >= 0 ? watches->data[parent]->dirname : "NULL");
if (!buildpath(log, pathname, sizeof(pathname), watches, parent, dirname, NULL)) { if (!buildpath(log, pathname, sizeof(pathname), watches, parent, dirname, NULL)) {
return -1; return -1;
@ -1323,7 +1332,7 @@ remove_dirwatch(const struct global_options *opts,
int i; int i;
// look for the child with the name // look for the child with the name
for (i = 0; i < watches->len; i++) { for (i = 0; i < watches->len; i++) {
struct watch *p = watches->data + i; struct watch *p = watches->data[i];
if (p->wd >= 0 && p->parent == parent && !strcmp(name, p->dirname)) { if (p->wd >= 0 && p->parent == parent && !strcmp(name, p->dirname)) {
dw = i; dw = i;
break; break;
@ -1332,7 +1341,7 @@ remove_dirwatch(const struct global_options *opts,
if (i >= watches->len) { if (i >= watches->len) {
printlogf(log, ERROR, "Cannot find entry for %s:/:%s :-(", printlogf(log, ERROR, "Cannot find entry for %s:/:%s :-(",
watches->data[parent].dirname, name); watches->data[parent]->dirname, name);
return false; return false;
} }
} else { } else {
@ -1343,23 +1352,23 @@ remove_dirwatch(const struct global_options *opts,
// recurse into all subdirectories removing them. // recurse into all subdirectories removing them.
int i; int i;
for (i = 0; i < watches->len; i++) { for (i = 0; i < watches->len; i++) {
if (watches->data[i].wd >= 0 && watches->data[i].parent == dw) { if (watches->data[i]->wd >= 0 && watches->data[i]->parent == dw) {
remove_dirwatch(opts, watches, inotify_fd, NULL, i); remove_dirwatch(opts, watches, inotify_fd, NULL, i);
} }
} }
} }
inotify_rm_watch(inotify_fd, watches->data[dw].wd); inotify_rm_watch(inotify_fd, watches->data[dw]->wd);
// mark this entry invalid (cannot remove, since indexes point into this vector) // mark this entry invalid (cannot remove, since indexes point into this vector)
// TODO from where? // (TODO Currently parents and watches)
watches->data[dw].wd = -1; watches->data[dw]->wd = -1;
free(watches->data[dw].dirname); free(watches->data[dw]->dirname);
watches->data[dw].dirname = NULL; watches->data[dw]->dirname = NULL;
// remove a possible delay // remove a possible delay
// (this dir is on the to do/delay list) // (this dir is on the to do/delay list)
if (delays->len > 0 && watches->data[dw].delayed) { if (delays->len > 0 && watches->data[dw]->delayed) {
int i; int i;
for(i = 0; i < delays->len; i++) { for(i = 0; i < delays->len; i++) {
if (delays->data[i] == dw) { if (delays->data[i] == dw) {
@ -1387,7 +1396,7 @@ int
get_watch_offset(const struct watch_vector *watches, int wd) { get_watch_offset(const struct watch_vector *watches, int wd) {
int i; int i;
for (i = 0; i < watches->len; i++) { for (i = 0; i < watches->len; i++) {
if (watches->data[i].wd == wd) { if (watches->data[i]->wd == wd) {
return i; return i;
} }
} }
@ -1456,7 +1465,7 @@ handle_event(const struct global_options *opts,
// in case of a new directory create new watches // in case of a new directory create new watches
if (((IN_CREATE | IN_MOVED_TO) & event->mask) && (IN_ISDIR & event->mask)) { if (((IN_CREATE | IN_MOVED_TO) & event->mask) && (IN_ISDIR & event->mask)) {
subwatch = add_dirwatch(opts, watches, inotify_fd, event->name, watch, watches->data[watch].dir_conf); subwatch = add_dirwatch(opts, watches, inotify_fd, event->name, watch, watches->data[watch]->dir_conf);
} }
// in case of a removed directory remove watches // in case of a removed directory remove watches
@ -1510,7 +1519,7 @@ master_loop(const struct global_options *opts,
while (keep_going) { while (keep_going) {
int do_read; int do_read;
if (delays->len > 0 && time_after_eq(times(NULL), watches->data[delays->data[0]].alarm)) { if (delays->len > 0 && time_after_eq(times(NULL), watches->data[delays->data[0]]->alarm)) {
// there is a delay that wants to be handled already // there is a delay that wants to be handled already
// do not read from inotify_fd and jump directly to delay handling // do not read from inotify_fd and jump directly to delay handling
printlogf(log, DEBUG, "immediately handling delayed entries"); printlogf(log, DEBUG, "immediately handling delayed entries");
@ -1520,7 +1529,7 @@ master_loop(const struct global_options *opts,
// a new event or "alarm" of an event to actually // a new event or "alarm" of an event to actually
// call its binary. The delay with the index 0 // call its binary. The delay with the index 0
// should have the nearest alarm time. // should have the nearest alarm time.
alarm = watches->data[delays->data[0]].alarm; alarm = watches->data[delays->data[0]]->alarm;
now = times(NULL); now = times(NULL);
tv.tv_sec = (alarm - now) / clocks_per_sec; tv.tv_sec = (alarm - now) / clocks_per_sec;
tv.tv_usec = (alarm - now) * 1000000 / clocks_per_sec % 1000000; tv.tv_usec = (alarm - now) * 1000000 / clocks_per_sec % 1000000;
@ -1576,7 +1585,7 @@ master_loop(const struct global_options *opts,
// until one item is found whose expiry time has not yet come // until one item is found whose expiry time has not yet come
// or the stack is empty. Using now time - times(NULL) - everytime // or the stack is empty. Using now time - times(NULL) - everytime
// again as time may progresses while handling delayed entries. // again as time may progresses while handling delayed entries.
while (delays->len > 0 && time_after_eq(times(NULL), watches->data[delays->data[0]].alarm)) { while (delays->len > 0 && time_after_eq(times(NULL), watches->data[delays->data[0]]->alarm)) {
printlogf(log, DEBUG, "time for %d arrived.", delays->data[0]); printlogf(log, DEBUG, "time for %d arrived.", delays->data[0]);
rsync_dir(opts, watches, delays->data[0]); rsync_dir(opts, watches, delays->data[0]);
remove_first_delay(watches); remove_first_delay(watches);
@ -2292,8 +2301,8 @@ main(int argc, char **argv)
{ {
int i; int i;
for(i = 0; i < delays->len; i++) { for(i = 0; i < delays->len; i++) {
watches.data[i].delayed = false; watches.data[delays->data[i]]->delayed = false;
watches.data[i].alarm = 0; watches.data[delays->data[i]]->alarm = 0;
} }
delays->len = 0; delays->len = 0;
} }

2
tests/directorycpr.sh
View File

@ -18,7 +18,7 @@ mkdir -p "${WORKSOURCE}"/a/a
echo 'test' > "${WORKSOURCE}"/a/a/file echo 'test' > "${WORKSOURCE}"/a/a/file
echo -e "$CON* starting lsyncd$COFF" echo -e "$CON* starting lsyncd$COFF"
./lsyncd --logfile "${LOGFILE}" --pidfile "${PIDFILE}" --no-daemon "${WORKSOURCE}" "${WORKTARGET}"& ./lsyncd --logfile "${LOGFILE}" --pidfile "${PIDFILE}" --no-daemon --debug "${WORKSOURCE}" "${WORKTARGET}"&
echo -e "$CON* waiting for lsyncd to start$COFF" echo -e "$CON* waiting for lsyncd to start$COFF"
sleep 4s sleep 4s