Merge tag 'branchpoint-5.1' into release

[disorder] / server / rescan.c

diff --git a/server/rescan.c b/server/rescan.c
index f779d021b419f444f238dac31c65a472a6b93e0b..792bdf588908fa88d31f59e024a775339b4f4688 100644 (file)
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder 
 /*
  * This file is part of DisOrder 

- * Copyright (C) 2005-2008 Richard Kettlewell
+ * Copyright (C) 2005-2011 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

-
+/** @file server/rescan.c
+ * @brief Rescanning utility
+ *
+ * Invoked by the server.
+ */

 #include "disorder-server.h"
 
 static time_t last_report;
 #include "disorder-server.h"
 
 static time_t last_report;


@@ -66,12 +70,12 @@ static int aborted(void) {
 /* Exit if our parent has gone away or we have been told to stop. */
 static void checkabort(void) {
   if(getppid() == 1) {
 /* Exit if our parent has gone away or we have been told to stop. */
 static void checkabort(void) {
   if(getppid() == 1) {

-    info("parent has terminated");
+    disorder_info("parent has terminated");

     trackdb_abort_transaction(global_tid);
     exit(0);
   }
   if(signalled) {
     trackdb_abort_transaction(global_tid);
     exit(0);
   }
   if(signalled) {

-    info("received signal %d", signalled);
+    disorder_info("received signal %d", signalled);

     trackdb_abort_transaction(global_tid);
     exit(0);
   }
     trackdb_abort_transaction(global_tid);
     exit(0);
   }


@@ -86,7 +90,7 @@ static void rescan_collection(const struct collection *c) {
   long ntracks = 0, nnew = 0;
   
   checkabort();
   long ntracks = 0, nnew = 0;
   
   checkabort();

-  info("rescanning %s with %s", c->root, c->module);
+  disorder_info("rescanning %s with %s", c->root, c->module);

   /* plugin runs in a subprocess */
   xpipe(p);
   if(!(pid = xfork())) {
   /* plugin runs in a subprocess */
   xpipe(p);
   if(!(pid = xfork())) {


@@ -96,29 +100,29 @@ static void rescan_collection(const struct collection *c) {
     xclose(p[1]);
     scan(c->module, c->root);
     if(fflush(stdout) < 0)
     xclose(p[1]);
     scan(c->module, c->root);
     if(fflush(stdout) < 0)

-      fatal(errno, "error writing to scanner pipe");
+      disorder_fatal(errno, "error writing to scanner pipe");

     _exit(0);
   }
   xclose(p[1]);
   if(!(fp = fdopen(p[0], "r")))
     _exit(0);
   }
   xclose(p[1]);
   if(!(fp = fdopen(p[0], "r")))

-    fatal(errno, "error calling fdopen");
+    disorder_fatal(errno, "error calling fdopen");

   /* read tracks from the plugin */
   while(!inputline("rescanner", fp, &path, 0)) {
     checkabort();
     /* actually we can cope relatively well within the server, but they'll go
      * wrong in track listings */
     if(strchr(path, '\n')) {
   /* read tracks from the plugin */
   while(!inputline("rescanner", fp, &path, 0)) {
     checkabort();
     /* actually we can cope relatively well within the server, but they'll go
      * wrong in track listings */
     if(strchr(path, '\n')) {

-      error(0, "cannot cope with tracks with newlines in the name");
+      disorder_error(0, "cannot cope with tracks with newlines in the name");

       continue;
     }
     if(!(track = any2utf8(c->encoding, path))) {
       continue;
     }
     if(!(track = any2utf8(c->encoding, path))) {

-      error(0, "cannot convert track path to UTF-8: %s", path);
+      disorder_error(0, "cannot convert track path to UTF-8: %s", path);

       continue;
     }
     if(config->dbversion > 1) {
       /* We use NFC track names */
       if(!(track = utf8_compose_canon(track, strlen(track), 0))) {
       continue;
     }
     if(config->dbversion > 1) {
       /* We use NFC track names */
       if(!(track = utf8_compose_canon(track, strlen(track), 0))) {

-        error(0, "cannot convert track path to NFC: %s", path);
+        disorder_error(0, "cannot convert track path to NFC: %s", path);

         continue;
       }
     }
         continue;
       }
     }


@@ -130,44 +134,63 @@ static void rescan_collection(const struct collection *c) {
     if(n < config->player.n) {
       nnew += !!trackdb_notice(track, path);
       ++ntracks;
     if(n < config->player.n) {
       nnew += !!trackdb_notice(track, path);
       ++ntracks;

-      if(ntracks % 100 == 0 && time(0) > last_report + 10) {
-        info("rescanning %s, %ld tracks so far", c->root, ntracks);
-        time(&last_report);
+      if(ntracks % 100 == 0 && xtime(0) > last_report + 10) {
+        disorder_info("rescanning %s, %ld tracks so far", c->root, ntracks);
+        xtime(&last_report);

       }
     }
   }
   /* tidy up */
   if(ferror(fp)) {
       }
     }
   }
   /* tidy up */
   if(ferror(fp)) {

-    error(errno, "error reading from scanner pipe");
+    disorder_error(errno, "error reading from scanner pipe");

     goto done;
   }
   xfclose(fp);
   fp = 0;
   while((r = waitpid(pid, &w, 0)) == -1 && errno == EINTR)
     ;
     goto done;
   }
   xfclose(fp);
   fp = 0;
   while((r = waitpid(pid, &w, 0)) == -1 && errno == EINTR)
     ;

-  if(r < 0) fatal(errno, "error calling waitpid");
+  if(r < 0) disorder_fatal(errno, "error calling waitpid");

   pid = 0;
   if(w) {
   pid = 0;
   if(w) {

-    error(0, "scanner subprocess: %s", wstat(w));
+    disorder_error(0, "scanner subprocess: %s", wstat(w));

     goto done;
   }
     goto done;
   }

-  info("rescanned %s, %ld tracks, %ld new", c->root, ntracks, nnew);
+  disorder_info("rescanned %s, %ld tracks, %ld new", c->root, ntracks, nnew);

 done:
   if(fp)
     xfclose(fp);
   if(pid)
 done:
   if(fp)
     xfclose(fp);
   if(pid)

-    while((r = waitpid(pid, &w, 0)) == -1 && errno == EINTR)
+    while((waitpid(pid, &w, 0)) == -1 && errno == EINTR)

       ;
 }
 
       ;
 }
 

+/** @brief State for the recheck phase of the rescan */

 struct recheck_state {
 struct recheck_state {

+  /** @brief Collection being rechecked */

   const struct collection *c;
   const struct collection *c;

-  long nobsolete, nnocollection, nlength;
+
+  /** @brief Number of tracks obsoleted */
+  long nobsolete;
+
+  /** @brief Number of tracks belonging to no collection */
+  long nnocollection;
+
+  /** @brief Number of lengths computed */
+  long nlength;
+
+  /** @brief Linked list of tracks to recheck */

   struct recheck_track *tracks;
 };
 
   struct recheck_track *tracks;
 };
 

+/** @brief A track to recheck
+ *
+ * A node in a linked list.
+ */

 struct recheck_track {
 struct recheck_track {

+  /** @brief Next track */

   struct recheck_track *next;
   struct recheck_track *next;

+
+  /** @brief Track */

   const char *track;
 };
 
   const char *track;
 };
 


@@ -225,7 +248,7 @@ static int recheck_track_tid(struct recheck_state *cs,
       if(fnmatch(config->tracklength.s[n].s[0], t->track, 0) == 0)
         break;
     if(n >= config->tracklength.n)
       if(fnmatch(config->tracklength.s[n].s[0], t->track, 0) == 0)
         break;
     if(n >= config->tracklength.n)

-      error(0, "no tracklength plugin found for %s", t->track);
+      disorder_error(0, "no tracklength plugin found for %s", t->track);

     else {
       length = tracklength(config->tracklength.s[n].s[1], t->track, path);
       if(length > 0) {
     else {
       length = tracklength(config->tracklength.s[n].s[1], t->track, path);
       if(length > 0) {


@@ -255,9 +278,9 @@ static void recheck_collection(const struct collection *c) {
   long nrc;
 
   if(c)
   long nrc;
 
   if(c)

-    info("rechecking %s", c->root);
+    disorder_info("rechecking %s", c->root);

   else
   else

-    info("rechecking all tracks");
+    disorder_info("rechecking all tracks");

   /* Doing the checking inside a transaction locks up the server for much too
    * long (because it spends lots of time thinking about each track).  So we
    * pull the full track list into memory and work from that.
   /* Doing the checking inside a transaction locks up the server for much too
    * long (because it spends lots of time thinking about each track).  So we
    * pull the full track list into memory and work from that.


@@ -267,7 +290,7 @@ static void recheck_collection(const struct collection *c) {
    */
   for(;;) {
     checkabort();
    */
   for(;;) {
     checkabort();

-    info("getting track list");
+    disorder_info("getting track list");

     global_tid = trackdb_begin_transaction();
     memset(&cs, 0, sizeof cs);
     cs.c = c;
     global_tid = trackdb_begin_transaction();
     memset(&cs, 0, sizeof cs);
     cs.c = c;


@@ -284,9 +307,9 @@ static void recheck_collection(const struct collection *c) {
     sleep(10);
     checkabort();
     if(c)
     sleep(10);
     checkabort();
     if(c)

-      info("resuming recheck of %s", c->root);
+      disorder_info("resuming recheck of %s", c->root);

     else
     else

-      info("resuming global recheck");
+      disorder_info("resuming global recheck");

   }
   trackdb_commit_transaction(global_tid);
   global_tid = 0;
   }
   trackdb_commit_transaction(global_tid);
   global_tid = 0;


@@ -296,19 +319,19 @@ static void recheck_collection(const struct collection *c) {
       return;
     recheck_track(&cs, t);
     ++nrc;
       return;
     recheck_track(&cs, t);
     ++nrc;

-    if(nrc % 100 == 0 && time(0) > last_report + 10) {
+    if(nrc % 100 == 0 && xtime(0) > last_report + 10) {

       if(c)
       if(c)

-        info("rechecking %s, %ld tracks so far", c->root, nrc);
+        disorder_info("rechecking %s, %ld tracks so far", c->root, nrc);

       else
       else

-        info("rechecking all tracks, %ld tracks so far", nrc);
-      time(&last_report);
+        disorder_info("rechecking all tracks, %ld tracks so far", nrc);
+      xtime(&last_report);

     }
   }
   if(c)
     }
   }
   if(c)

-    info("rechecked %s, %ld obsoleted, %ld lengths calculated",
-         c->root, cs.nobsolete, cs.nlength);
+    disorder_info("rechecked %s, %ld obsoleted, %ld lengths calculated",
+                  c->root, cs.nobsolete, cs.nlength);

   else
   else

-    info("rechecked all tracks, %ld no collection, %ld obsoleted, %ld lengths calculated",
+    disorder_info("rechecked all tracks, %ld no collection, %ld obsoleted, %ld lengths calculated",

          cs.nnocollection, cs.nobsolete, cs.nlength);
 }
 
          cs.nnocollection, cs.nobsolete, cs.nlength);
 }
 


@@ -323,7 +346,7 @@ static void do_directory(const char *s,
   if(n < config->collection.n)
     fn(&config->collection.s[n]);
   else
   if(n < config->collection.n)
     fn(&config->collection.s[n]);
   else

-    error(0, "no collection has root '%s'", s);
+    disorder_error(0, "no collection has root '%s'", s);

 }
 
 /* rescan/recheck all collections */
 }
 
 /* rescan/recheck all collections */


@@ -346,7 +369,7 @@ static void do_all(void (*fn)(const struct collection *c)) {
 static void expire_noticed(void) {
   time_t now;
 
 static void expire_noticed(void) {
   time_t now;
 

-  time(&now);
+  xtime(&now);

   trackdb_expire_noticed(now - config->noticed_history * 86400);
 }
 
   trackdb_expire_noticed(now - config->noticed_history * 86400);
 }
 


@@ -357,7 +380,7 @@ int main(int argc, char **argv) {
   
   set_progname(argv);
   mem_init();
   
   set_progname(argv);
   mem_init();

-  if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
+  if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");

   while((n = getopt_long(argc, argv, "hVc:dDSsKC", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hVc:dDSsKC", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();


@@ -369,21 +392,21 @@ int main(int argc, char **argv) {
     case 's': logsyslog = 1; break;
     case 'K': do_check = 1; break;
     case 'C': do_check = 0; break;
     case 's': logsyslog = 1; break;
     case 'K': do_check = 1; break;
     case 'C': do_check = 0; break;

-    default: fatal(0, "invalid option");
+    default: disorder_fatal(0, "invalid option");

     }
   }
   if(logsyslog) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     }
   }
   if(logsyslog) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");

   xnice(config->nice_rescan);
   sa.sa_handler = signal_handler;
   sa.sa_flags = SA_RESTART;
   sigemptyset(&sa.sa_mask);
   xsigaction(SIGTERM, &sa, 0);
   xsigaction(SIGINT, &sa, 0);
   xnice(config->nice_rescan);
   sa.sa_handler = signal_handler;
   sa.sa_flags = SA_RESTART;
   sigemptyset(&sa.sa_mask);
   xsigaction(SIGTERM, &sa, 0);
   xsigaction(SIGINT, &sa, 0);

-  info("started");
+  disorder_info("started");

   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE);
   if(optind == argc) {
   trackdb_init(TRACKDB_NO_RECOVER);
   trackdb_open(TRACKDB_NO_UPGRADE);
   if(optind == argc) {


@@ -405,8 +428,8 @@ int main(int argc, char **argv) {
         do_directory(argv[n], recheck_collection);
   }
   trackdb_close();
         do_directory(argv[n], recheck_collection);
   }
   trackdb_close();

-  trackdb_deinit();
-  info("completed");
+  trackdb_deinit(NULL);
+  disorder_info("completed");

   return 0;
 }
 
   return 0;
 }