From: Thomas Rast <trast@student.ethz.ch>
To: git@vger.kernel.org
Cc: Junio C Hamano <junio@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Sixt <johannes.sixt@telecom.at>,
Johan Herland <johan@herland.net>
Subject: [PATCH/RFC v3 3/6] reflog: make for_each_reflog_ent use mmap
Date: Sat, 17 Jan 2009 04:30:08 +0100 [thread overview]
Message-ID: <1232163011-20088-4-git-send-email-trast@student.ethz.ch> (raw)
In-Reply-To: <1232163011-20088-3-git-send-email-trast@student.ethz.ch>
In-Reply-To: <7v8wpcs38c.fsf@gitster.siamese.dyndns.org>
Now that all building blocks have been refactored, we can implement
for_each_reflog_ent in terms of them, so that it uses mmap.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
refs.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/refs.c b/refs.c
index 0a57896..3848aa0 100644
--- a/refs.c
+++ b/refs.c
@@ -1478,22 +1478,28 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
{
- const char *logfile;
- FILE *logfp;
- char buf[1024];
+ const char *log_mapped, *buf, *log_end, *logfile;
+ size_t mapsz;
int ret = 0;
- logfile = git_path("logs/%s", ref);
- logfp = fopen(logfile, "r");
- if (!logfp)
+ buf = log_mapped = open_reflog(ref, &mapsz, &logfile);
+ if (!log_mapped)
return -1;
- while (fgets(buf, sizeof(buf), logfp)) {
+ log_end = buf + mapsz;
+
+ while (buf < log_end) {
unsigned char osha1[20], nsha1[20];
char *email, *message;
+ const char *next;
unsigned long timestamp;
int len, tz;
- len = strlen(buf);
+ next = memchr(buf, '\n', log_end - buf);
+ if (next)
+ next++;
+ else
+ next = log_end;
+ len = next - buf;
parse_reflog_line(buf, len,
osha1, nsha1,
&email, ×tamp, &tz, &message,
@@ -1501,8 +1507,9 @@ int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
ret = fn(osha1, nsha1, email, timestamp, tz, message, cb_data);
if (ret)
break;
+ buf = next;
}
- fclose(logfp);
+ munmap((void*) log_mapped, mapsz);
return ret;
}
--
1.6.1.315.g92577
next prev parent reply other threads:[~2009-01-17 3:32 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 0:06 [PATCH] checkout: implement "-" shortcut name for last branch Thomas Rast
2009-01-15 0:12 ` [PATCH v2] " Thomas Rast
2009-01-15 7:27 ` Johannes Sixt
2009-01-15 13:15 ` Johannes Schindelin
2009-01-15 13:59 ` Thomas Rast
2009-01-15 14:09 ` Johannes Schindelin
2009-01-15 14:17 ` Johannes Schindelin
2009-01-15 20:12 ` Junio C Hamano
2009-01-15 20:35 ` Johannes Schindelin
2009-01-16 12:52 ` [PATCH] revision walker: include a detached HEAD in --all Johannes Schindelin
2009-01-16 13:12 ` Santi Béjar
2009-01-16 13:17 ` Johannes Schindelin
2009-01-16 13:22 ` David Kastrup
2009-01-16 13:46 ` Santi Béjar
2009-01-16 13:50 ` Santi Béjar
2009-01-18 6:01 ` Junio C Hamano
2009-01-18 6:36 ` Junio C Hamano
2009-01-18 14:06 ` Johannes Schindelin
2009-01-18 13:42 ` Johannes Schindelin
2009-01-15 16:32 ` [PATCH v2] checkout: implement "-" shortcut name for last branch Johan Herland
2009-01-15 16:50 ` Johannes Schindelin
2009-01-15 20:11 ` Junio C Hamano
2009-01-15 20:50 ` Junio C Hamano
2009-01-17 3:30 ` [PATCH/RFC v3 0/6] N-th last checked out branch Thomas Rast
2009-01-17 5:52 ` Johannes Schindelin
2009-01-17 13:38 ` Thomas Rast
2009-01-17 13:40 ` [PATCH/RFC v3bis 1/2] sha1_name: implement @{-N} syntax for N-th last checked out Thomas Rast
2009-01-17 13:40 ` [PATCH/RFC v3bis 2/2] checkout: implement '@{-N}' and '-' special abbreviations Thomas Rast
2009-01-17 15:04 ` [PATCH] interpret_nth_last_branch(): avoid traversing the reflogs twice Johannes Schindelin
2009-01-17 16:09 ` [PATCH/RFC v4 0/5] N-th last checked out branch Thomas Rast
2009-01-17 16:09 ` [PATCH/RFC v4 1/5] checkout: implement "@{-N}" shortcut name for N-th last branch Thomas Rast
2009-01-17 16:09 ` [PATCH/RFC v4 2/5] sha1_name: tweak @{-N} lookup Thomas Rast
2009-01-17 16:09 ` [PATCH/RFC v4 3/5] sha1_name: support @{-N} syntax in get_sha1() Thomas Rast
2009-01-17 16:09 ` [PATCH/RFC v4 4/5] checkout: implement "-" abbreviation, add docs and tests Thomas Rast
2009-01-17 16:09 ` [PATCH/RFC v4 5/5] interpret_nth_last_branch(): avoid traversing the reflogs twice Thomas Rast
2009-01-17 18:08 ` [PATCH 6/5] Fix parsing of @{-1}@{1} Johannes Schindelin
2009-01-17 20:02 ` Junio C Hamano
2009-01-17 21:22 ` Johannes Schindelin
2009-01-17 19:57 ` [PATCH/RFC v4 4/5] checkout: implement "-" abbreviation, add docs and tests Junio C Hamano
2009-01-17 17:55 ` [PATCH/RFC v4 3/5] sha1_name: support @{-N} syntax in get_sha1() Johannes Schindelin
2009-01-17 19:37 ` Junio C Hamano
2009-01-18 0:54 ` [PATCH/RFC v4 2/5] sha1_name: tweak @{-N} lookup Junio C Hamano
2009-01-17 16:49 ` [PATCH/RFC v4 0/5] N-th last checked out branch Johannes Schindelin
2009-01-17 19:13 ` [PATCH] interpret_nth_last_branch(): avoid traversing the reflogs twice Junio C Hamano
2009-01-17 19:29 ` Johannes Schindelin
2009-01-18 0:43 ` Junio C Hamano
2009-01-18 1:12 ` Johannes Schindelin
2009-01-18 7:25 ` Junio C Hamano
2009-01-18 20:59 ` Johannes Schindelin
2009-01-19 8:08 ` Junio C Hamano
2009-01-19 8:19 ` Junio C Hamano
2009-01-19 12:33 ` Johannes Schindelin
2009-01-20 0:11 ` Thomas Rast
2009-01-20 0:23 ` Johannes Schindelin
2009-01-20 0:41 ` Thomas Rast
2009-01-20 6:21 ` [PATCH] interpret_nth_last_branch(): plug small memleak Junio C Hamano
2009-01-20 10:15 ` Johannes Schindelin
2009-01-20 6:22 ` [PATCH] Introduce for_each_recent_reflog_ent() Junio C Hamano
2009-01-20 10:15 ` Johannes Schindelin
2009-01-20 8:35 ` [PATCH] interpret_nth_last_branch(): avoid traversing the reflogs twice Junio C Hamano
2009-01-21 0:16 ` [VALGRIND PATCH for nth_last patch series] Fix invalid memory access Johannes Schindelin
2009-01-21 8:45 ` Junio C Hamano
2009-01-21 9:18 ` Thomas Rast
2009-01-21 10:13 ` Junio C Hamano
2009-01-21 12:06 ` Johannes Schindelin
2009-01-24 22:21 ` Thomas Rast
2009-01-24 22:23 ` [PATCH next] t1505: remove debugging cruft Thomas Rast
2009-01-25 20:35 ` Junio C Hamano
2009-01-21 11:56 ` [VALGRIND PATCH for nth_last patch series] Fix invalid memory access Johannes Schindelin
2009-01-19 12:41 ` [PATCH] @{-<n>}: avoid crash with corrupt reflog Johannes Schindelin
2009-01-19 14:57 ` Johannes Schindelin
2009-01-17 3:30 ` [PATCH/RFC v3 1/6] reflog: refactor parsing and checking Thomas Rast
2009-01-17 5:35 ` Johannes Schindelin
2009-01-17 3:30 ` [PATCH/RFC v3 2/6] reflog: refactor log open+mmap Thomas Rast
2009-01-17 5:40 ` Johannes Schindelin
2009-01-17 3:30 ` Thomas Rast [this message]
2009-01-17 3:30 ` [PATCH/RFC v3 4/6] reflog: add backwards iterator Thomas Rast
2009-01-17 3:30 ` [PATCH/RFC v3 5/6] sha1_name: implement @{-N} syntax for N-th last checked out Thomas Rast
2009-01-17 3:30 ` [PATCH/RFC v3 6/6] checkout: implement '@{-N}' and '-' special abbreviations Thomas Rast
2009-01-16 12:31 ` [PATCH v2] checkout: implement "-" shortcut name for last branch Johannes Schindelin
2009-01-15 0:45 ` [PATCH] " Johannes Schindelin
2009-01-15 14:01 ` Thomas Rast
2009-01-15 14:14 ` Johannes Schindelin
2009-01-15 17:05 ` Thomas Rast
2009-01-15 18:34 ` Johannes Schindelin
2009-01-16 9:08 ` Thomas Rast
2009-01-16 11:18 ` Johannes Schindelin
2009-01-18 1:38 ` [TOY PATCH] git-resurrect: find traces of a branch name and resurrect it Thomas Rast
2009-01-18 16:19 ` Johannes Schindelin
2009-01-20 9:01 ` Thomas Rast
2009-01-20 16:57 ` Boyd Stephen Smith Jr.
2009-01-20 20:50 ` Boyd Stephen Smith Jr.
2009-01-23 20:03 ` [PATCH] contrib " Thomas Rast
2009-01-23 21:00 ` Boyd Stephen Smith Jr.
2009-01-26 11:54 ` Thomas Rast
2009-01-26 12:40 ` [PATCH v2] " Thomas Rast
2009-01-27 6:31 ` Junio C Hamano
2009-01-30 22:52 ` Thomas Rast
2009-02-01 21:34 ` [PATCH v3] " Thomas Rast
2009-02-02 2:31 ` Junio C Hamano
2009-02-04 10:04 ` [PATCH v4] " Thomas Rast
2009-02-05 8:38 ` Junio C Hamano
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=1232163011-20088-4-git-send-email-trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=johannes.schindelin@gmx.de \
--cc=johannes.sixt@telecom.at \
--cc=junio@pobox.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.
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).