Skip to content

Commit

Permalink
config: use getc_unlocked when reading from file
Browse files Browse the repository at this point in the history
We read config files character-by-character from a stdio
handle using fgetc(). This incurs significant locking
overhead, even though we know that only one thread can
possibly access the handle. We can speed this up by taking
the lock ourselves, and then using getc_unlocked to read
each character.

On a silly pathological case:

  perl -le '
    print "[core]";
    print "key$_ = value$_" for (1..1000000)
  ' >input
  git config -f input core.key1

this dropped the time to run git-config from:

  real    0m0.263s
  user    0m0.260s
  sys     0m0.000s

to:

  real    0m0.159s
  user    0m0.152s
  sys     0m0.004s

for a savings of 39%.  Most config files are not this big,
but the savings should be proportional to the size of the
file (i.e., we always save 39%, just of a much smaller
number).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Apr 16, 2015
1 parent 82912d1 commit 260d408
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion config.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static struct config_set the_config_set;

static int config_file_fgetc(struct config_source *conf)
{
return fgetc(conf->u.file);
return getc_unlocked(conf->u.file);
}

static int config_file_ungetc(int c, struct config_source *conf)
Expand Down Expand Up @@ -1088,7 +1088,9 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)

f = fopen(filename, "r");
if (f) {
flockfile(f);
ret = do_config_from_file(fn, filename, filename, f, data);
funlockfile(f);
fclose(f);
}
return ret;
Expand Down

0 comments on commit 260d408

Please sign in to comment.