From: Pierre Habouzit <madcoder@debian.org>
To: git@vger.kernel.org
Cc: Pierre Habouzit <madcoder@debian.org>
Subject: [PATCH 7/7] More strbuf uses in cache-tree.c.
Date: Thu, 6 Sep 2007 13:20:11 +0200 [thread overview]
Message-ID: <11890776111167-git-send-email-madcoder@debian.org> (raw)
In-Reply-To: <11890776112641-git-send-email-madcoder@debian.org>
Should even be marginally faster.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
cache-tree.c | 59 +++++++++++++++++++++------------------------------------
1 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index 077f034..76af6f5 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "strbuf.h"
#include "tree.h"
#include "cache-tree.h"
@@ -235,8 +236,7 @@ static int update_one(struct cache_tree *it,
int missing_ok,
int dryrun)
{
- unsigned long size, offset;
- char *buffer;
+ struct strbuf buffer;
int i;
if (0 <= it->entry_count && has_sha1_file(it->sha1))
@@ -293,9 +293,8 @@ static int update_one(struct cache_tree *it,
/*
* Then write out the tree object for this level.
*/
- size = 8192;
- buffer = xmalloc(size);
- offset = 0;
+ strbuf_init(&buffer);
+ strbuf_grow(&buffer, 8192);
for (i = 0; i < entries; i++) {
struct cache_entry *ce = cache[i];
@@ -332,15 +331,9 @@ static int update_one(struct cache_tree *it,
if (!ce->ce_mode)
continue; /* entry being removed */
- if (size < offset + entlen + 100) {
- size = alloc_nr(offset + entlen + 100);
- buffer = xrealloc(buffer, size);
- }
- offset += sprintf(buffer + offset,
- "%o %.*s", mode, entlen, path + baselen);
- buffer[offset++] = 0;
- hashcpy((unsigned char*)buffer + offset, sha1);
- offset += 20;
+ strbuf_grow(&buffer, entlen + 100);
+ strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
+ strbuf_add(&buffer, sha1, 20);
#if DEBUG
fprintf(stderr, "cache-tree update-one %o %.*s\n",
@@ -349,10 +342,10 @@ static int update_one(struct cache_tree *it,
}
if (dryrun)
- hash_sha1_file(buffer, offset, tree_type, it->sha1);
+ hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
else
- write_sha1_file(buffer, offset, tree_type, it->sha1);
- free(buffer);
+ write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
+ strbuf_release(&buffer);
it->entry_count = i;
#if DEBUG
fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
@@ -378,12 +371,10 @@ int cache_tree_update(struct cache_tree *it,
return 0;
}
-static void *write_one(struct cache_tree *it,
+static void write_one(struct cache_tree *it,
char *path,
int pathlen,
- char *buffer,
- unsigned long *size,
- unsigned long *offset)
+ struct strbuf *buffer)
{
int i;
@@ -393,13 +384,9 @@ static void *write_one(struct cache_tree *it,
* tree-sha1 (missing if invalid)
* subtree_nr "cache-tree" entries for subtrees.
*/
- if (*size < *offset + pathlen + 100) {
- *size = alloc_nr(*offset + pathlen + 100);
- buffer = xrealloc(buffer, *size);
- }
- *offset += sprintf(buffer + *offset, "%.*s%c%d %d\n",
- pathlen, path, 0,
- it->entry_count, it->subtree_nr);
+ strbuf_grow(buffer, pathlen + 100);
+ strbuf_add(buffer, path, pathlen);
+ strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
#if DEBUG
if (0 <= it->entry_count)
@@ -412,8 +399,7 @@ static void *write_one(struct cache_tree *it,
#endif
if (0 <= it->entry_count) {
- hashcpy((unsigned char*)buffer + *offset, it->sha1);
- *offset += 20;
+ strbuf_add(buffer, it->sha1, 20);
}
for (i = 0; i < it->subtree_nr; i++) {
struct cache_tree_sub *down = it->down[i];
@@ -423,21 +409,20 @@ static void *write_one(struct cache_tree *it,
prev->name, prev->namelen) <= 0)
die("fatal - unsorted cache subtree");
}
- buffer = write_one(down->cache_tree, down->name, down->namelen,
- buffer, size, offset);
+ write_one(down->cache_tree, down->name, down->namelen, buffer);
}
- return buffer;
}
void *cache_tree_write(struct cache_tree *root, unsigned long *size_p)
{
char path[PATH_MAX];
- unsigned long size = 8192;
- char *buffer = xmalloc(size);
+ struct strbuf buffer;
- *size_p = 0;
path[0] = 0;
- return write_one(root, path, 0, buffer, &size, size_p);
+ strbuf_init(&buffer);
+ write_one(root, path, 0, &buffer);
+ *size_p = buffer.len;
+ return strbuf_detach(&buffer);
}
static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
--
1.5.3.1
next prev parent reply other threads:[~2007-09-06 11:20 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-02 22:42 strbuf API Pierre Habouzit
2007-09-03 5:43 ` Johan Herland
2007-09-03 8:46 ` Pierre Habouzit
2007-09-04 1:52 ` Miles Bader
2007-09-04 8:47 ` strbuf new semantics, let's give it a try Pierre Habouzit
2007-09-04 8:47 ` [PATCH] Rework strbuf API and semantics Pierre Habouzit
2007-09-04 11:11 ` Johannes Schindelin
2007-09-04 11:53 ` Pierre Habouzit
2007-09-04 13:34 ` Andreas Ericsson
2007-09-04 14:01 ` Pierre Habouzit
2007-09-04 15:44 ` Johannes Schindelin
2007-09-04 16:18 ` Pierre Habouzit
2007-09-04 17:18 ` Wincent Colaiuta
2007-09-04 14:01 ` [PATCH] Simplify strbuf uses in fast-import.c using the proper functions Pierre Habouzit
2007-09-04 23:46 ` René Scharfe
2007-09-04 23:46 ` René Scharfe
2007-09-05 7:48 ` Pierre Habouzit
2007-09-05 8:05 ` Junio C Hamano
2007-09-05 8:57 ` Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Rework strbuf API and semantics Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Simplify strbuf uses in archive-tar.c using the proper functions Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Simplify strbuf uses in fast-import.c " Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Use proper strbuf API, and also simplify cmd_data code Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Simplify write_tree using strbuf's Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Further strbuf re-engineering Pierre Habouzit
2007-09-05 19:18 ` [PATCH] Eradicate yet-another-buffer implementation in buitin-rerere.c Pierre Habouzit
2007-09-05 19:18 ` [PATCH] More strbuf uses in cache-tree.c Pierre Habouzit
2007-09-19 8:05 ` [PATCH] Further strbuf re-engineering Junio C Hamano
2007-09-05 19:21 ` [PATCH] Simplify strbuf uses in fast-import.c using the proper functions Pierre Habouzit
2007-09-19 8:06 ` [PATCH] Simplify strbuf uses in archive-tar.c " Junio C Hamano
2007-09-19 8:36 ` Pierre Habouzit
2007-09-06 9:31 ` [PATCH] Rework strbuf API and semantics Junio C Hamano
2007-09-06 9:49 ` Pierre Habouzit
2007-09-06 10:03 ` Junio C Hamano
2007-09-06 10:22 ` Pierre Habouzit
2007-09-04 14:01 ` [PATCH] Use proper strbuf API, and also simplify cmd_data code Pierre Habouzit
2007-09-05 4:44 ` [PATCH] Rework strbuf API and semantics Miles Bader
2007-09-04 8:48 ` [PATCH] Add strbuf_fread, use it in fast-import.c Pierre Habouzit
2007-09-03 8:32 ` strbuf API Matthieu Moy
2007-09-03 8:49 ` Pierre Habouzit
2007-09-03 9:02 ` Matthieu Moy
2007-09-03 9:18 ` Junio C Hamano
2007-09-03 11:53 ` Pierre Habouzit
2007-09-03 12:29 ` Johannes Schindelin
2007-09-06 11:20 ` strbuf new API, take 2 for inclusion Pierre Habouzit
2007-09-06 11:20 ` [PATCH 1/7] Rework strbuf API and semantics Pierre Habouzit
2007-09-06 11:20 ` [PATCH 2/7] Simplify strbuf uses in archive-tar.c using the proper functions Pierre Habouzit
2007-09-06 11:20 ` [PATCH 3/7] Use proper strbuf API, and also simplify cmd_data code Pierre Habouzit
2007-09-06 11:20 ` [PATCH 4/7] Simplify write_tree using strbuf's Pierre Habouzit
2007-09-06 11:20 ` [PATCH 5/7] Further strbuf re-engineering Pierre Habouzit
2007-09-06 11:20 ` [PATCH 6/7] Eradicate yet-another-buffer implementation in buitin-rerere.c Pierre Habouzit
2007-09-06 11:20 ` Pierre Habouzit [this message]
2007-09-06 14:05 ` Johannes Schindelin
2007-09-06 17:17 ` Pierre Habouzit
2007-09-06 20:16 ` David Kastrup
2007-09-06 20:54 ` Pierre Habouzit
2007-09-07 8:03 ` Junio C Hamano
2007-09-07 9:02 ` Pierre Habouzit
2007-09-06 17:59 ` [PATCH 2/7] Simplify strbuf uses in archive-tar.c using the proper functions Kristian Høgsberg
2007-09-06 18:08 ` Pierre Habouzit
2007-09-06 18:18 ` Kristian Høgsberg
2007-09-06 18:27 ` Pierre Habouzit
2007-09-06 22:54 ` René Scharfe
2007-09-06 14:09 ` [PATCH 1/7] Rework strbuf API and semantics Johannes Schindelin
2007-09-06 14:21 ` Jeff King
2007-09-06 14:44 ` David Kastrup
2007-09-06 14:50 ` Jeff King
2007-09-06 15:06 ` David Kastrup
2007-09-06 15:36 ` Jeff King
2007-09-06 15:53 ` David Kastrup
2007-09-06 15:45 ` Johannes Sixt
2007-09-06 14:43 ` David Kastrup
2007-09-06 14:52 ` Jeff King
2007-09-06 17:49 ` Kristian Høgsberg
2007-09-06 12:58 ` strbuf new API, take 2 for inclusion Jeff King
2007-09-06 17:15 ` Pierre Habouzit
2007-09-06 17:16 ` Jeff King
2007-09-06 17:19 ` Pierre Habouzit
2007-09-08 11:53 ` Use strbufs in commit.c (pretty printing) Pierre Habouzit
2007-09-08 11:53 ` [PATCH 1/3] Add strbuf_rtrim (to remove trailing spaces) Pierre Habouzit
2007-09-08 11:53 ` [PATCH 2/3] Change semantics of interpolate to work like snprintf Pierre Habouzit
2007-09-08 11:53 ` [PATCH 3/3] Rework pretty_print_commit to use strbufs instead of custom buffers Pierre Habouzit
2007-09-08 11:59 ` David Kastrup
2007-09-08 12:17 ` Pierre Habouzit
2007-09-08 12:28 ` Pierre Habouzit
2007-09-08 18:40 ` René Scharfe
2007-09-08 18:49 ` Pierre Habouzit
2007-09-08 16:18 ` [PATCH 1/3] Add strbuf_rtrim (to remove trailing spaces) René Scharfe
2007-09-08 22:53 ` Pierre Habouzit
2007-09-08 23:44 ` Pierre Habouzit
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=11890776111167-git-send-email-madcoder@debian.org \
--to=madcoder@debian.org \
--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).