From: Alex Vandiver <alexmv@dropbox.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ben Peart <peartben@gmail.com>
Subject: [PATCH 4/6] fsmonitor: Make output of test-dump-fsmonitor more concise
Date: Tue, 2 Jan 2018 19:04:54 -0800 [thread overview]
Message-ID: <36db77ccb5c025a73bf3f5841cd11607427ffdc0.1514948078.git.alexmv@dropbox.com> (raw)
In-Reply-To: <20180103030456.8181-1-alexmv@dropbox.com>
In-Reply-To: <023b0090bc7dc0ff9c3bee1efce8c85fdba27de3.1514948078.git.alexmv@dropbox.com>
Rather than display one very long line, summarize the contents of that
line. The tests do not currently rely on any content except the first
line ("no fsmonitor" / "fsmonitor last update").
Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
---
t/helper/test-dump-fsmonitor.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c
index 48c4bab0b..5d61b0d62 100644
--- a/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c
@@ -4,7 +4,8 @@
int cmd_main(int ac, const char **av)
{
struct index_state *istate = &the_index;
- int i;
+ uint64_t now = getnanotime();
+ int i, valid = 0;
git_config_push_parameter("core.fsmonitor=keep");
setup_git_directory();
@@ -14,10 +15,17 @@ int cmd_main(int ac, const char **av)
printf("no fsmonitor\n");
return 0;
}
- printf("fsmonitor last update %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update);
+
+ printf("fsmonitor last update %"PRIuMAX", (%.2f seconds ago)\n",
+ (uintmax_t)istate->fsmonitor_last_update,
+ (now - istate->fsmonitor_last_update)/1.0e9);
for (i = 0; i < istate->cache_nr; i++)
- printf((istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) ? "+" : "-");
+ if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID)
+ valid++;
+
+ printf(" valid: %d\n", valid);
+ printf(" invalid: %d\n", istate->cache_nr - valid);
return 0;
}
--
2.15.1.31.gddce0adfe
next prev parent reply other threads:[~2018-01-03 3:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 3:04 [PATCH v2 0/6] Minor fsmonitor bugfixes, use with `git diff` Alex Vandiver
2018-01-03 3:04 ` [PATCH 1/6] Fix comments to agree with argument name Alex Vandiver
2018-01-03 3:04 ` [PATCH 2/6] fsmonitor: Stop inline'ing mark_fsmonitor_valid / _invalid Alex Vandiver
2018-01-04 22:27 ` Johannes Schindelin
2018-01-08 20:27 ` Ben Peart
2018-01-03 3:04 ` [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later Alex Vandiver
2018-01-04 23:03 ` Johannes Schindelin
2018-01-03 3:04 ` Alex Vandiver [this message]
2018-01-04 22:33 ` [PATCH 4/6] fsmonitor: Make output of test-dump-fsmonitor more concise Johannes Schindelin
2018-01-08 20:33 ` Ben Peart
2018-01-03 3:04 ` [PATCH 5/6] fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh Alex Vandiver
2018-01-03 3:04 ` [PATCH 6/6] fsmonitor: Use fsmonitor data in `git diff` Alex Vandiver
2018-01-04 22:46 ` Johannes Schindelin
2018-01-05 22:22 ` Junio C Hamano
2018-01-08 20:58 ` Ben Peart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=36db77ccb5c025a73bf3f5841cd11607427ffdc0.1514948078.git.alexmv@dropbox.com \
--to=alexmv@dropbox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peartben@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).