From: Stefan Beller <stefanbeller@googlemail.com>
To: git@vger.kernel.org, jrnieder@gmail.com, sunshine@sunshineco.com
Cc: Stefan Beller <stefanbeller@googlemail.com>
Subject: [PATCH] builtins: search builtin commands via binary search.
Date: Sat, 27 Jul 2013 10:50:38 +0200 [thread overview]
Message-ID: <1374915038-6717-1-git-send-email-stefanbeller@googlemail.com> (raw)
In-Reply-To: <51F38997.9010507@googlemail.com>
There are currently 115 commands built into the git executable.
Before this commit, it was iterated over these commands in a linear
order, i.e. each command was checked.
As it turns out the commands are already sorted alphabetically, it is easy
to perform a binary search instead of linear searching.
This results in 7 lookups in the worst case.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
git.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/git.c b/git.c
index 2025f77..6d4de2b 100644
--- a/git.c
+++ b/git.c
@@ -309,9 +309,14 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
return 0;
}
+static int compare_internal_command(const void *name, const void *cmd) {
+ return strcmp((const char*)name, ((const struct cmd_struct*)cmd)->cmd);
+}
+
static void handle_internal_command(int argc, const char **argv)
{
const char *cmd = argv[0];
+ /* commands must be sorted alphabetically for binary search */
static struct cmd_struct commands[] = {
{ "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
{ "annotate", cmd_annotate, RUN_SETUP },
@@ -447,12 +452,12 @@ static void handle_internal_command(int argc, const char **argv)
argv[0] = cmd = "help";
}
- for (i = 0; i < ARRAY_SIZE(commands); i++) {
- struct cmd_struct *p = commands+i;
- if (strcmp(p->cmd, cmd))
- continue;
+ struct cmd_struct *p = bsearch(cmd, commands,
+ ARRAY_SIZE(commands), sizeof(struct cmd_struct),
+ compare_internal_command);
+
+ if (p)
exit(run_builtin(p, argc, argv));
- }
}
static void execv_dashed_external(const char **argv)
--
1.8.4.rc0.1.g8f6a3e5
next prev parent reply other threads:[~2013-07-27 8:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 20:50 [PATCH] builtins: search builtin commands via binary search Stefan Beller
2013-07-26 20:57 ` Jonathan Nieder
2013-07-27 8:49 ` Stefan Beller
2013-07-27 8:50 ` Stefan Beller [this message]
2013-07-27 9:13 ` Andreas Schwab
2013-07-28 9:05 ` Eric Sunshine
2013-07-29 16:18 ` Junio C Hamano
2013-07-27 0:26 ` Eric Sunshine
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=1374915038-6717-1-git-send-email-stefanbeller@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sunshine@sunshineco.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).