wt-status: simplify performance measurement by using getnanotime()
Calculating duration from a single uint64_t is simpler than from a struct timeval. Change performance measurement for 'advice.statusuoption' from gettimeofday() to getnanotime(). Also initialize t_begin to prevent uninitialized variable warning. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
578da0391a
commit
132d41e69a
14
wt-status.c
14
wt-status.c
@ -574,14 +574,11 @@ static void wt_status_collect_untracked(struct wt_status *s)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
struct dir_struct dir;
|
struct dir_struct dir;
|
||||||
struct timeval t_begin;
|
uint64_t t_begin = getnanotime();
|
||||||
|
|
||||||
if (!s->show_untracked_files)
|
if (!s->show_untracked_files)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (advice_status_u_option)
|
|
||||||
gettimeofday(&t_begin, NULL);
|
|
||||||
|
|
||||||
memset(&dir, 0, sizeof(dir));
|
memset(&dir, 0, sizeof(dir));
|
||||||
if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
|
if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
|
||||||
dir.flags |=
|
dir.flags |=
|
||||||
@ -612,13 +609,8 @@ static void wt_status_collect_untracked(struct wt_status *s)
|
|||||||
free(dir.ignored);
|
free(dir.ignored);
|
||||||
clear_directory(&dir);
|
clear_directory(&dir);
|
||||||
|
|
||||||
if (advice_status_u_option) {
|
if (advice_status_u_option)
|
||||||
struct timeval t_end;
|
s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
|
||||||
gettimeofday(&t_end, NULL);
|
|
||||||
s->untracked_in_ms =
|
|
||||||
(uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 -
|
|
||||||
((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wt_status_collect(struct wt_status *s)
|
void wt_status_collect(struct wt_status *s)
|
||||||
|
Loading…
Reference in New Issue
Block a user