From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 08/14] shortlog: optimize out useless "<none>" normalization
Date: Tue, 29 Dec 2015 02:31:08 -0500 [thread overview]
Message-ID: <20151229073108.GH8842@sigill.intra.peff.net> (raw)
In-Reply-To: <20151229071847.GA8726@sigill.intra.peff.net>
If we are in --summary mode, we will always pass <none> to
insert_one_record, which will then do some normalization
(e.g., cutting out "[PATCH]"). There's no point in doing so
if we aren't going to use the result anyway.
This drops my best-of-five for "git shortlog -ns HEAD" on
linux.git from:
real 0m5.257s
user 0m5.104s
sys 0m0.156s
to:
real 0m5.194s
user 0m5.028s
sys 0m0.168s
That's only 1%, but arguably the result is clearer to read,
as we're able to group our variable declarations inside the
conditional block. It also opens up further optimization
possibilities for future patches.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/shortlog.c | 63 +++++++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index af24d84..400e03b 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -31,13 +31,9 @@ static void insert_one_record(struct shortlog *log,
const char *author,
const char *oneline)
{
- const char *dot3 = log->common_repo_prefix;
- char *buffer, *p;
struct string_list_item *item;
const char *mailbuf, *namebuf;
size_t namelen, maillen;
- const char *eol;
- struct strbuf subject = STRBUF_INIT;
struct strbuf namemailbuf = STRBUF_INIT;
struct ident_split ident;
@@ -59,34 +55,43 @@ static void insert_one_record(struct shortlog *log,
if (item->util == NULL)
item->util = xcalloc(1, sizeof(struct string_list));
- /* Skip any leading whitespace, including any blank lines. */
- while (*oneline && isspace(*oneline))
- oneline++;
- eol = strchr(oneline, '\n');
- if (!eol)
- eol = oneline + strlen(oneline);
- if (starts_with(oneline, "[PATCH")) {
- char *eob = strchr(oneline, ']');
- if (eob && (!eol || eob < eol))
- oneline = eob + 1;
- }
- while (*oneline && isspace(*oneline) && *oneline != '\n')
- oneline++;
- format_subject(&subject, oneline, " ");
- buffer = strbuf_detach(&subject, NULL);
-
- if (dot3) {
- int dot3len = strlen(dot3);
- if (dot3len > 5) {
- while ((p = strstr(buffer, dot3)) != NULL) {
- int taillen = strlen(p) - dot3len;
- memcpy(p, "/.../", 5);
- memmove(p + 5, p + dot3len, taillen + 1);
+ if (log->summary)
+ string_list_append(item->util, xstrdup(""));
+ else {
+ const char *dot3 = log->common_repo_prefix;
+ char *buffer, *p;
+ struct strbuf subject = STRBUF_INIT;
+ const char *eol;
+
+ /* Skip any leading whitespace, including any blank lines. */
+ while (*oneline && isspace(*oneline))
+ oneline++;
+ eol = strchr(oneline, '\n');
+ if (!eol)
+ eol = oneline + strlen(oneline);
+ if (starts_with(oneline, "[PATCH")) {
+ char *eob = strchr(oneline, ']');
+ if (eob && (!eol || eob < eol))
+ oneline = eob + 1;
+ }
+ while (*oneline && isspace(*oneline) && *oneline != '\n')
+ oneline++;
+ format_subject(&subject, oneline, " ");
+ buffer = strbuf_detach(&subject, NULL);
+
+ if (dot3) {
+ int dot3len = strlen(dot3);
+ if (dot3len > 5) {
+ while ((p = strstr(buffer, dot3)) != NULL) {
+ int taillen = strlen(p) - dot3len;
+ memcpy(p, "/.../", 5);
+ memmove(p + 5, p + dot3len, taillen + 1);
+ }
}
}
- }
- string_list_append(item->util, buffer);
+ string_list_append(item->util, buffer);
+ }
}
static void read_from_stdin(struct shortlog *log)
--
2.7.0.rc3.367.g09631da
next prev parent reply other threads:[~2015-12-29 7:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-29 7:18 [PATCH 0/14] counting trailers with shortlogs Jeff King
2015-12-29 7:19 ` [PATCH 01/14] move string functions out of git-compat-util Jeff King
2015-12-29 7:20 ` [PATCH 02/14] log: refactor add_header to drop some magic numbers Jeff King
2015-12-31 6:21 ` Eric Sunshine
2016-01-01 8:42 ` Jeff King
2016-01-01 8:46 ` Jeff King
2015-12-29 7:22 ` [PATCH 03/14] strutil: add skip_prefix_icase Jeff King
2015-12-31 6:40 ` Eric Sunshine
2016-01-01 8:50 ` Jeff King
2015-12-29 7:27 ` [PATCH 04/14] shortlog: use skip_prefix_icase to parse "Author" lines Jeff King
2015-12-31 6:47 ` Eric Sunshine
2016-01-01 8:53 ` Jeff King
2015-12-29 7:28 ` [PATCH 05/14] shortlog: use strbufs to read from stdin Jeff King
2015-12-29 7:29 ` [PATCH 06/14] shortlog: replace hand-parsing of author with pretty-printer Jeff King
2016-01-04 9:43 ` Eric Sunshine
2016-01-04 10:17 ` Jeff King
2015-12-29 7:30 ` [PATCH 07/14] shortlog: optimize "--summary" mode Jeff King
2015-12-29 7:31 ` Jeff King [this message]
2015-12-29 7:32 ` [PATCH 09/14] shortlog: optimize out useless string list Jeff King
2015-12-29 7:32 ` [PATCH 10/14] shortlog: change "author" variables to "ident" Jeff King
2015-12-29 7:35 ` [PATCH 11/14] shortlog: allow grouping by committer ident Jeff King
2016-01-04 9:44 ` Eric Sunshine
2016-01-04 10:23 ` Jeff King
2015-12-29 7:35 ` [PATCH 12/14] trailer: factor out config reading Jeff King
2015-12-29 7:36 ` [PATCH 13/14] trailer: add interface for parsing commit trailers Jeff King
2015-12-29 7:38 ` [PATCH 14/14] shortlog: match commit trailers with --ident Jeff King
2015-12-29 7:50 ` Jeff King
2016-01-04 9:44 ` Eric Sunshine
2016-01-04 10:31 ` Jeff King
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=20151229073108.GH8842@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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).