static void
upgrade_print_progress (void *closure,
- unsigned int count,
- unsigned int total)
+ double progress)
{
add_files_state_t *state = closure;
- struct timeval tv_now;
- double elapsed_overall, rate_overall, time_remaining;
- gettimeofday (&tv_now, NULL);
+ printf ("Upgrading database: %.2f%% complete", progress * 100.0);
- elapsed_overall = notmuch_time_elapsed (state->tv_start, tv_now);
- rate_overall = count / elapsed_overall;
- time_remaining = ((total - count) / rate_overall);
+ if (progress > 0) {
+ struct timeval tv_now;
+ double elapsed, time_remaining;
+
+ gettimeofday (&tv_now, NULL);
+
+ elapsed = notmuch_time_elapsed (state->tv_start, tv_now);
+ time_remaining = (elapsed / progress) * (1.0 - progress);
+ printf (" (");
+ notmuch_time_print_formatted_seconds (time_remaining);
+ printf (" remaining)");
+ }
- printf ("Upgraded %d of %d messages (", count, total);
- notmuch_time_print_formatted_seconds (time_remaining);
- printf (" remaining). \r");
+ printf (". \r");
fflush (stdout);
}
}
}
- /* Setup our handler for SIGINT */
- memset (&action, 0, sizeof (struct sigaction));
- action.sa_handler = handle_sigint;
- sigemptyset (&action.sa_mask);
- action.sa_flags = SA_RESTART;
- sigaction (SIGINT, &action, NULL);
-
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
return 1;
if (notmuch == NULL)
return 1;
+ /* Setup our handler for SIGINT. We do this after having
+ * potentially done a database upgrade we this interrupt handler
+ * won't support. */
+ memset (&action, 0, sizeof (struct sigaction));
+ action.sa_handler = handle_sigint;
+ sigemptyset (&action.sa_mask);
+ action.sa_flags = SA_RESTART;
+ sigaction (SIGINT, &action, NULL);
+
talloc_free (dot_notmuch_path);
dot_notmuch_path = NULL;