octoleo
/
lsyncd
mirror of https://github.com/octoleo/lsyncd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cosmetics

This commit is contained in:
Axel Kittenberger 2010-11-22 21:17:08 +00:00
parent a88dc747fc
commit 90ae92b129
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
inotify.c
View File

@ -1,12 +1,15 @@
/** /**
* lsyncd.c Live (Mirror) Syncing Demon * inotify.c from Lsyncd - Live (Mirror) Syncing Demon
* *
* License: GPLv2 (see COPYING) or any later version * License: GPLv2 (see COPYING) or any later version
* *
* Authors: Axel Kittenberger <axkibe@gmail.com> * Authors: Axel Kittenberger <axkibe@gmail.com>
* *
* -----------------------------------------------------------------------
*
* Event interface for Lsyncd to Linux´ inotify. * Event interface for Lsyncd to Linux´ inotify.
*/ */
#include "lsyncd.h" #include "lsyncd.h"
#ifndef HAVE_SYS_INOTIFY_H #ifndef HAVE_SYS_INOTIFY_H
@ -39,7 +42,7 @@
/** /**
* The inotify file descriptor. * The inotify file descriptor.
*/ */
static int inotify_fd; static int inotify_fd = -1;
/** /**
* TODO allow configure. * TODO allow configure.
@ -86,7 +89,10 @@ static const luaL_reg linotfylib[] = {
/** /**
* Buffer for MOVE_FROM events. * Buffer for MOVE_FROM events.
* Lsyncd buffers MOVE_FROM events to check if * Lsyncd buffers MOVE_FROM events to check if
* they are followed by MOVE_TO events with identical cookie
* then they are condensed into one move event to be sent to the
* runner
*/ */
static struct inotify_event * move_event_buf = NULL; static struct inotify_event * move_event_buf = NULL;
@ -226,19 +232,22 @@ handle_event(lua_State *L,
} }
} }
size_t readbuf_size = 2048; /**
char *readbuf = NULL; * buffer to read inotify events into
*/
static size_t readbuf_size = 2048;
static char * readbuf = NULL;
/** /**
* inotify file descriptor became ready. * Called by function pointer from when the inotify file descriptor
* became ready. Reads it contents and forward all received events
* to the runner.
*/ */
static void static void
inotify_ready(lua_State *L, int fd, void *extra) inotify_ready(lua_State *L, int fd, void *extra)
{ {
size_t len;
while(true) { while(true) {
int i = 0; size_t len;
do { do {
len = read (inotify_fd, readbuf, readbuf_size); len = read (inotify_fd, readbuf, readbuf_size);
if (len < 0 && errno == EINVAL) { if (len < 0 && errno == EINVAL) {
@ -266,17 +275,21 @@ inotify_ready(lua_State *L, int fd, void *extra)
exit(-1); // ERRNO exit(-1); // ERRNO
} }
} }
while (i < len && !hup && !term) { {
struct inotify_event *event = int i = 0;
(struct inotify_event *) &readbuf[i]; while (i < len && !hup && !term) {
handle_event(L, event); struct inotify_event *event =
i += sizeof(struct inotify_event) + event->len; (struct inotify_event *) &readbuf[i];
handle_event(L, event);
i += sizeof(struct inotify_event) + event->len;
}
} }
if (!move_event) { if (!move_event) {
/* give it a pause if not endangering splitting a move */ /* give it a pause if not endangering splitting a move */
break; break;
} }
} }
/* checks if there is an unary MOVE_FROM left in the buffer */ /* checks if there is an unary MOVE_FROM left in the buffer */
if (move_event) { if (move_event) {
logstring("Inotify", "handling unary move from."); logstring("Inotify", "handling unary move from.");
@ -298,6 +311,11 @@ register_inotify(lua_State *L) {
*/ */
extern void extern void
open_inotify(lua_State *L) { open_inotify(lua_State *L) {
if (readbuf) {
logstring("Error",
"internal fail, inotify readbuf!=NULL in open_inotify()")
exit(-1); // ERRNO
}
readbuf = s_malloc(readbuf_size); readbuf = s_malloc(readbuf_size);
inotify_fd = inotify_init(); inotify_fd = inotify_init();
@ -320,5 +338,6 @@ extern void
close_inotify() { close_inotify() {
close(inotify_fd); close(inotify_fd);
free(readbuf); free(readbuf);
readbuf = NULL;
} }

3
lsyncd.c
View File

@ -5,10 +5,13 @@
* *
* Authors: Axel Kittenberger <axkibe@gmail.com> * Authors: Axel Kittenberger <axkibe@gmail.com>
* *
* -----------------------------------------------------------------------
*
* This is the core. It contains as minimal as possible glues * This is the core. It contains as minimal as possible glues
* to the operating system needed for lsyncd operation. All high-level * to the operating system needed for lsyncd operation. All high-level
* logic is coded (when feasable) into lsyncd.lua * logic is coded (when feasable) into lsyncd.lua
*/ */
#include "lsyncd.h" #include "lsyncd.h"
#include <sys/stat.h> #include <sys/stat.h>