From: Tanay Abhra <tanayabh@gmail.com>
To: git@vger.kernel.org
Cc: Tanay Abhra <tanayabh@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: [PATCH 2/7] rewrite git_config() to use the config-set API
Date: Wed, 23 Jul 2014 11:42:53 -0700 [thread overview]
Message-ID: <1406140978-9472-3-git-send-email-tanayabh@gmail.com> (raw)
In-Reply-To: <1406140978-9472-1-git-send-email-tanayabh@gmail.com>
Of all the functions in `git_config*()` family, `git_config()` has the
most invocations in the whole code base. Each `git_config()` invocation
causes config file rereads which can be avoided using the config-set API.
Use the config-set API to rewrite `git_config()` to use the config caching
layer to avoid config file rereads on each invocation during a git process
lifetime. First invocation constructs the cache, and after that for each
successive invocation, `git_config()` feeds values from the config cache
instead of rereading the configuration files.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
config.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index 6db8f97..a7fb9a4 100644
--- a/config.c
+++ b/config.c
@@ -1232,11 +1232,36 @@ int git_config_with_options(config_fn_t fn, void *data,
return ret;
}
-int git_config(config_fn_t fn, void *data)
+static int git_config_raw(config_fn_t fn, void *data)
{
return git_config_with_options(fn, data, NULL, 1);
}
+static int configset_iter(struct config_set *cs, config_fn_t fn, void *data)
+{
+ int i;
+ struct string_list *strptr;
+ struct config_set_element *entry;
+ struct hashmap_iter iter;
+ hashmap_iter_init(&cs->config_hash, &iter);
+ while ((entry = hashmap_iter_next(&iter))) {
+ strptr = &entry->value_list;
+ for (i = 0; i < strptr->nr; i++) {
+ if (fn(entry->key, strptr->items[i].string, data) < 0)
+ die("bad config file line in (TODO: file/line info)");
+ }
+ }
+ return 0;
+}
+
+static void git_config_check_init(void);
+
+int git_config(config_fn_t fn, void *data)
+{
+ git_config_check_init();
+ return configset_iter(&the_config_set, fn, data);
+}
+
static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
{
struct config_set_element k;
@@ -1418,7 +1443,7 @@ static void git_config_check_init(void)
if (the_config_set.hash_initialized)
return;
git_configset_init(&the_config_set);
- git_config(config_set_callback, &the_config_set);
+ git_config_raw(config_set_callback, &the_config_set);
}
void git_config_clear(void)
--
1.9.0.GIT
next prev parent reply other threads:[~2014-07-23 18:44 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 18:42 [PATCH 0/7] Rewrite `git_config()` using config-set API Tanay Abhra
2014-07-23 18:42 ` [PATCH 1/7] config.c: fix accuracy of line number in errors Tanay Abhra
2014-07-23 21:49 ` Junio C Hamano
2014-07-24 13:33 ` Tanay Abhra
2014-07-24 18:31 ` Junio C Hamano
2014-07-24 18:40 ` Tanay Abhra
2014-07-24 18:49 ` Matthieu Moy
2014-07-23 18:42 ` Tanay Abhra [this message]
2014-07-23 19:55 ` [PATCH 2/7] rewrite git_config() to use the config-set API Matthieu Moy
2014-07-23 19:58 ` Matthieu Moy
2014-07-23 21:58 ` Junio C Hamano
2014-07-24 6:43 ` Matthieu Moy
2014-07-23 18:42 ` [PATCH 3/7] add a test for semantic errors in config files Tanay Abhra
2014-07-23 19:55 ` Matthieu Moy
2014-07-23 22:11 ` Junio C Hamano
2014-07-24 13:56 ` Tanay Abhra
2014-07-24 14:05 ` Matthieu Moy
2014-07-24 16:41 ` Junio C Hamano
2014-07-23 18:42 ` [PATCH 4/7] add line number and file name info to `config_set` Tanay Abhra
2014-07-23 22:24 ` Junio C Hamano
2014-07-23 18:42 ` [PATCH 5/7] enforce `xfuncname` precedence over `funcname` Tanay Abhra
2014-07-23 20:05 ` Matthieu Moy
2014-07-23 21:04 ` Eric Sunshine
2014-07-23 22:34 ` Junio C Hamano
2014-07-24 6:39 ` Matthieu Moy
2014-07-24 17:09 ` Junio C Hamano
2014-07-24 18:33 ` Tanay Abhra
2014-07-24 18:47 ` Matthieu Moy
2014-07-24 19:04 ` John Keeping
2014-07-24 19:20 ` Junio C Hamano
2014-07-24 19:29 ` Tanay Abhra
2014-07-24 19:54 ` Junio C Hamano
2014-07-24 21:22 ` Ramsay Jones
2014-07-25 3:16 ` Tanay Abhra
2014-07-25 6:54 ` Matthieu Moy
2014-07-25 17:09 ` Junio C Hamano
2014-07-25 17:45 ` Matthieu Moy
2014-07-25 18:55 ` Junio C Hamano
2014-07-23 18:42 ` [PATCH 6/7] config: add `git_die_config()` to the config-set API Tanay Abhra
2014-07-23 18:42 ` [PATCH 7/7] Add tests for `git_config_get_string()` Tanay Abhra
2014-07-23 20:08 ` Matthieu Moy
2014-07-23 19:38 ` [PATCH 0/7] Rewrite `git_config()` using config-set API Matthieu Moy
2014-07-23 21:44 ` Junio C Hamano
2014-07-24 15:04 ` Tanay Abhra
2014-07-24 15:39 ` Matthieu Moy
2014-07-24 15:59 ` Tanay Abhra
2014-07-24 16:17 ` Matthieu Moy
2014-07-24 20:03 ` Junio C Hamano
2014-07-24 15:06 ` [PATCH v12 1/2] add `config_set` API for caching config-like files Tanay Abhra
2014-07-24 18:41 ` Junio C Hamano
2014-07-24 15:09 ` [PATCH v12 2/2] test-config: add tests for the config_set API Tanay Abhra
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406140978-9472-3-git-send-email-tanayabh@gmail.com \
--to=tanayabh@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--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.
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 NNTP newsgroup(s).