Implement inotify support.

* configure.ac: New option --with-inotify.
Bye default, use inotify if it is present.
* src/watcher.c: New file. Implements inotify watcher.
* src/Makefile.am [COND_INOTIFY] (wydawca_SOURCES): Add watcher.c
* src/diskio.c (dir_get_path): New function.
* src/job.c (job) <spool>: Remove const qualifier. All uses changed.
(inotify_spool): New pseudo-spool.
(fake_spool): Remove static qualifier.
(wydawca_scanner): Support for inotify spools.
* src/net.c (open_listener): Don't exit if the listener
address is not set.
(wydawca_listener): Listen on the listener socket and
on the inotify descriptor. If none is set, bail out.
* src/process.c (for_each_spool)
(file_info_cleanup)
(spool_cwd_add_new_file,spool_add_new_file): New functions.
(scan_spool_unlocked): Use spool_cwd_add_new_file.
Don't initialize dictionaries here: it will be done in
spool_commit_triplets.
(spool_open_dictionaries): New function.
(close_dictionaries): Rename to spool_close_dictionaries.
Clear dict_inited.
* src/triplet.c (hash_triplet_compare): Compare spools as well.
(register_file): Likewise.
(triplet_lookup): New function.
(check_triplet_state): New argument: noauth. All uses updated.
(enumerate_triplets): Rename to spool_commit_triplets.
Call spool_open_dictionaries.
(count_processable_triplets,triplet_remove_file): New functions.
* src/verify.c (verify_directive_file): New argument: noauth.
All uses updated.
* src/vtab.c (reg): Initialize get_path member.
(get_path): New function.
* src/wydawca.c (main): Set print_version_hook.
* src/wydawca.h (virt_tab) <get_path>: New method.
(spool) <dict_inited>: New member.
(fake_spool, inotify_spool): New externs.
(spool_add_new_file, spool_cwd_add_new_file)
(spool_open_dictionaries, spool_close_dictionaries)
(for_each_spool, count_processable_triplets)
(triplet_remove_file, get_path): New protos.
(enumerate_triplets): Rename to spool_commit_triplets.
(verify_directive_file): Take two arguments.

1 files changed, 97 insertions, 7 deletions

diff --git a/src/triplet.c b/src/triplet.c
index 79ca8c2..05b7536 100644
--- a/src/triplet.c
+++ b/src/triplet.c
@@ -32,7 +32,7 @@ hash_triplet_compare (void const *data1, void const *data2)
 {
   struct file_triplet const *t1 = data1;
   struct file_triplet const *t2 = data2;
-  return strcmp (t1->name, t2->name);
+  return t1->spool == t2->spool && strcmp (t1->name, t2->name);
 }
 
 /* Reclaim memory storage associated with a table entry */
@@ -98,6 +98,7 @@ register_file (struct file_info *finfo, const struct spool *spool)
   key.name = grecs_malloc (finfo->root_len + 1);
   memcpy (key.name, finfo->name, finfo->root_len);
   key.name[finfo->root_len] = 0;
+  key.spool = spool;
 
   ret = grecs_symtab_lookup_or_install (triplet_table, &key, &install);
   if (!ret)
@@ -111,6 +112,28 @@ register_file (struct file_info *finfo, const struct spool *spool)
   ret->file[finfo->type] = *finfo;
 }
 
+struct file_triplet *
+triplet_lookup (struct spool *spool, const char *name)
+{
+  struct file_triplet key, *ret;
+  struct file_info finfo;
+  
+  if (!triplet_table)
+    return NULL;
+
+  parse_file_name (name, &finfo);
+
+  key.name = grecs_malloc (finfo.root_len + 1);
+  memcpy (key.name, finfo.name, finfo.root_len);
+  key.name[finfo.root_len] = 0;
+  key.spool = spool;
+
+  ret = grecs_symtab_lookup_or_install (triplet_table, &key, NULL);
+  file_info_cleanup (&finfo);
+
+  return ret;
+}
+
 /* Return true if any part of the triplet TRP was modified more than
    TTL seconds ago */
 static int
@@ -147,11 +170,11 @@ enum triplet_state
 
 
 static enum triplet_state
-check_triplet_state (struct file_triplet *trp)
+check_triplet_state (struct file_triplet *trp, int noauth)
 {
   if (trp->file[file_directive].name)
     {
-      if (verify_directive_file (trp))
+      if (verify_directive_file (trp, noauth))
 	return triplet_bad;
 
       if (trp->file[file_dist].name == 0
@@ -160,8 +183,7 @@ check_triplet_state (struct file_triplet *trp)
 	  if (directive_get_value (trp, "filename", NULL))
 	    return triplet_directive;
 	}
-      else if (trp->file[file_dist].name
-	       && trp->file[file_signature].name)
+      else if (trp->file[file_dist].name && trp->file[file_signature].name)
 	{
 	  if (trp->file[file_dist].sb.st_uid ==
 	                trp->file[file_signature].sb.st_uid
@@ -212,7 +234,7 @@ triplet_processor (void *data, void *proc_data)
 	    SP (trp->file[file_signature].name),
 	    SP (trp->file[file_directive].name));
 
-  switch (check_triplet_state (trp))
+  switch (check_triplet_state (trp, 0))
     {
     case triplet_directive:
     case triplet_complete:
@@ -246,11 +268,13 @@ triplet_processor (void *data, void *proc_data)
 
 /* Process all triplets from the table according to the SPOOL */
 void
-enumerate_triplets (const struct spool *spool)
+spool_commit_triplets (struct spool *spool)
 {
   if (debug_level)
     logmsg (LOG_DEBUG, _("processing spool %s (%s)"),
 	    spool->tag, mu_url_to_string (spool->dest_url));
+  if (spool_open_dictionaries (spool))
+    return;
   if (triplet_table)
     {
       grecs_symtab_enumerate (triplet_table, triplet_processor, NULL);
@@ -264,6 +288,72 @@ count_collected_triplets ()
   return triplet_table ? grecs_symtab_count_entries (triplet_table) : 0;
 }
 
+static int
+triplet_counter (void *data, void *proc_data)
+{
+  struct file_triplet *trp = data;
+  size_t *cp = proc_data;
+  
+  if (debug_level)
+    logmsg (LOG_DEBUG, "FILE %s, DIST=%s, SIG=%s, DIRECTIVE=%s",
+	    trp->name,
+	    SP (trp->file[file_dist].name),
+	    SP (trp->file[file_signature].name),
+	    SP (trp->file[file_directive].name));
+
+  switch (check_triplet_state (trp, 1))
+    {
+    case triplet_directive:
+    case triplet_complete:
+    case triplet_bad:
+      ++*cp;
+    case triplet_incomplete:
+      return 0;
+    }
+
+  if (triplet_expired_p (trp, trp->spool->file_sweep_time))
+    ++*cp;//FIXME
+
+  return 0;
+}
+
+size_t
+count_processable_triplets ()
+{
+  size_t count = 0;
+  if (triplet_table)
+    grecs_symtab_enumerate (triplet_table, triplet_counter, &count);
+  return count;
+}
+
+void
+triplet_remove_file (struct spool *spool, const char *name)
+{
+  struct file_triplet *tp = triplet_lookup (spool, name);
+  int i, n = 0;
+  
+  if (!tp)
+    return;
+
+  for (i = 0; i < FILE_TYPE_COUNT; i++)
+    {
+      if (!tp->file[i].name)
+	/* nothing */;
+      else if (strcmp (tp->file[i].name, name) == 0)
+	file_info_cleanup (&tp->file[i]);
+      else
+	n++;
+    }
+
+  if (!n)
+    {
+      if (debug_level > 0)
+	logmsg (LOG_DEBUG, "deleting empty triplet (%s/%s)",
+		spool->source_dir, name);
+      grecs_symtab_remove (triplet_table, tp);
+    }
+}
+
 
 static const char *
 expand_project_base (struct metadef *def, void *data)