debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch setup/new: Print progress once per second instead of after 1000 files.

Browse source 
With the recent addition of full-text indexing, printing only once per
1000 files just isn't often enough. The new timer-based approach will
be reliable regardless of the speed of adding message.
This commit is contained in:
Carl Worth 2009-10-28 16:09:19 -07:00
parent 56218ddbb4
commit fbf55bfe2f
1 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
notmuch.c
View file

@ -38,6 +38,7 @@
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <signal.h>
#include <talloc.h> #include <talloc.h>
@ -123,6 +124,14 @@ print_formatted_seconds (double seconds)
printf ("%ds", (int) seconds); printf ("%ds", (int) seconds);
} }
static volatile sig_atomic_t do_add_files_print_progress = 0;
static void
handle_sigalrm (unused (int signal))
{
do_add_files_print_progress = 1;
}
static void static void
add_files_print_progress (add_files_state_t *state) add_files_print_progress (add_files_state_t *state)
{ {
@ -298,8 +307,10 @@ add_files_recursive (notmuch_database_t *notmuch,
message = NULL; message = NULL;
} }
if (state->processed_files % 1000 == 0) if (do_add_files_print_progress) {
do_add_files_print_progress = 0;
add_files_print_progress (state); add_files_print_progress (state);
}
} }
} else if (S_ISDIR (st->st_mode)) { } else if (S_ISDIR (st->st_mode)) {
status = add_files_recursive (notmuch, next, st, state); status = add_files_recursive (notmuch, next, st, state);
@ -327,16 +338,17 @@ add_files_recursive (notmuch_database_t *notmuch,
} }
/* This is the top-level entry point for add_files. It does a couple /* This is the top-level entry point for add_files. It does a couple
* of error checks, and then calls into the recursive function, * of error checks, sets up the progress-printing timer and then calls
* (avoiding the repeating of these error checks at every * into the recursive function. */
* level---which would be useless becaues we already do a stat() at
* the level above). */
static notmuch_status_t static notmuch_status_t
add_files (notmuch_database_t *notmuch, add_files (notmuch_database_t *notmuch,
const char *path, const char *path,
add_files_state_t *state) add_files_state_t *state)
{ {
struct stat st; struct stat st;
notmuch_status_t status;
struct sigaction action;
struct itimerval timerval;
if (stat (path, &st)) { if (stat (path, &st)) {
fprintf (stderr, "Error reading directory %s: %s\n", fprintf (stderr, "Error reading directory %s: %s\n",
@ -349,7 +361,34 @@ add_files (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_FILE_ERROR; return NOTMUCH_STATUS_FILE_ERROR;
} }
return add_files_recursive (notmuch, path, &st, state); /* Setup our handler for SIGALRM */
memset (&action, 0, sizeof (struct sigaction));
action.sa_handler = handle_sigalrm;
sigemptyset (&action.sa_mask);
action.sa_flags = SA_RESTART;
sigaction (SIGALRM, &action, NULL);
/* Then start a timer to send SIGALRM once per second. */
timerval.it_interval.tv_sec = 1;
timerval.it_interval.tv_usec = 0;
timerval.it_value.tv_sec = 1;
timerval.it_value.tv_usec = 0;
setitimer (ITIMER_REAL, &timerval, NULL);
status = add_files_recursive (notmuch, path, &st, state);
/* Now stop the timer. */
timerval.it_interval.tv_sec = 0;
timerval.it_interval.tv_usec = 0;
timerval.it_value.tv_sec = 0;
timerval.it_value.tv_usec = 0;
setitimer (ITIMER_REAL, &timerval, NULL);
/* And disable the signal handler. */
action.sa_handler = SIG_IGN;
sigaction (SIGALRM, &action, NULL);
return status;
} }
/* Recursively count all regular files in path and all sub-direcotries /* Recursively count all regular files in path and all sub-direcotries