From ba77fee05de8b4ffdb2b51b7840b21f46e174208 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 12 Aug 2009 17:06:07 -0400 Subject: [PATCH] Use timeval_diff_*() more. --HG-- branch : HEAD --- src/plugins/fts-squat/squat-test.c | 3 +-- src/plugins/fts/fts-storage.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/fts-squat/squat-test.c b/src/plugins/fts-squat/squat-test.c index 5b35e7fcf5..01e2e00e39 100644 --- a/src/plugins/fts-squat/squat-test.c +++ b/src/plugins/fts-squat/squat-test.c @@ -186,8 +186,7 @@ int main(int argc ATTR_UNUSED, char *argv[]) else { gettimeofday(&tv_end, NULL); printf(" - Search took %.05f CPU seconds\n", - (tv_end.tv_sec - tv_start.tv_sec) + - (tv_end.tv_usec - tv_start.tv_usec)/1000000.0); + timeval_diff_usecs(&tv_end, &tv_start)/1000000.0); printf(" - definite uids: "); result_print(&definite_uids); printf(" - maybe uids: "); diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c index 6014ee8c28..aed65364c0 100644 --- a/src/plugins/fts/fts-storage.c +++ b/src/plugins/fts/fts-storage.c @@ -5,6 +5,7 @@ #include "array.h" #include "str.h" #include "istream.h" +#include "time-util.h" #include "message-parser.h" #include "message-decoder.h" #include "mail-namespace.h" @@ -501,10 +502,8 @@ static void fts_build_notify(struct fts_storage_build_context *ctx) range = array_idx(&ctx->search_args->args->value.seqset, 0); percentage = (ctx->mail->seq - range->seq1) * 100.0 / (range->seq2 - range->seq1); - msecs = (ioloop_timeval.tv_sec - - ctx->search_start_time.tv_sec) * 1000 + - (ioloop_timeval.tv_usec - - ctx->search_start_time.tv_usec) / 1000; + msecs = timeval_diff_msecs(&ioloop_timeval, + &ctx->search_start_time); secs = (msecs / (percentage / 100.0) - msecs) / 1000; T_BEGIN { -- 2.47.3