From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 05/32] pack-write: add functions for creating simple packs
Date: Wed, 25 Aug 2010 08:19:55 +1000 [thread overview]
Message-ID: <1282688422-7738-6-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1282688422-7738-1-git-send-email-pclouds@gmail.com>
These are ripoffs from pack-objects and do not do deltas at all.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
pack-write.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pack.h | 17 +++++++++++
2 files changed, 104 insertions(+), 0 deletions(-)
diff --git a/pack-write.c b/pack-write.c
index cc7761e..2b71bd2 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -305,3 +305,90 @@ unsigned long compress_object(void **pptr, unsigned long size)
return stream.total_out;
}
+
+int create_pack(struct simple_pack *pack)
+{
+ char tmpname[PATH_MAX];
+ struct pack_header hdr;
+
+ if (pack->fd <= 0) {
+ pack->fd = odb_mkstemp(tmpname, sizeof(tmpname), "pack/tmp_pack_XXXXXX");
+ pack->pack_tmp_name = xstrdup(tmpname);
+ }
+ pack->f = sha1fd(pack->fd, pack->pack_tmp_name ? pack->pack_tmp_name : "<unknown>");
+
+ if (pack->nr_objects) {
+ int pointer_size = sizeof(struct pack_idx_entry*) * pack->nr_objects;
+ int item_size = sizeof(struct pack_idx_entry) * pack->nr_objects;
+ void *buf = xmalloc(item_size + pointer_size);
+ pack->written_list = buf;
+ pack->written_items = (void*)(((char*)buf) + pointer_size);
+ }
+
+ hdr.hdr_signature = htonl(PACK_SIGNATURE);
+ hdr.hdr_version = htonl(PACK_VERSION);
+ hdr.hdr_entries = htonl(pack->nr_objects);
+ sha1write(pack->f, &hdr, sizeof(hdr));
+ if (pack->written_list)
+ pack->offset = sizeof(hdr);
+
+ return 0;
+}
+
+int write_object_to_pack(struct simple_pack *pack,
+ const unsigned char *sha1,
+ void *buf,
+ unsigned long size,
+ enum object_type type)
+{
+ unsigned long datalen;
+ unsigned hdrlen;
+ unsigned char header[10];
+
+ datalen = compress_object(&buf, size);
+ hdrlen = encode_in_pack_object_header(type, size, header);
+ if (pack->written_list)
+ crc32_begin(pack->f);
+ sha1write(pack->f, header, hdrlen);
+ sha1write(pack->f, buf, datalen);
+ free(buf);
+
+ if (pack->written_list) {
+ struct pack_idx_entry *e;
+
+ e = pack->written_list[pack->nr_written] = pack->written_items;
+ e->crc32 = crc32_end(pack->f);
+ hashcpy(e->sha1, sha1);
+ e->offset = pack->offset;
+ pack->offset += datalen+hdrlen;
+ }
+ pack->nr_written++;
+ pack->written_items++;
+
+ return 0;
+}
+
+int close_pack(struct simple_pack *pack)
+{
+ sha1close(pack->f, pack->sha1, CSUM_CLOSE);
+ if (pack->written_list) {
+ char tmpname[PATH_MAX];
+ const char *idx_tmp_name;
+
+ idx_tmp_name = write_idx_file(NULL, pack->written_list, pack->nr_written, pack->sha1);
+
+ snprintf(tmpname, sizeof(tmpname), "%s/pack/pack-%s.pack", get_object_directory(), sha1_to_hex(pack->sha1));
+ free_pack_by_name(tmpname);
+ if (adjust_shared_perm(pack->pack_tmp_name))
+ die_errno("unable to make temporary pack file readable");
+ if (rename(pack->pack_tmp_name, tmpname))
+ die_errno("unable to rename temporary pack file");
+ snprintf(tmpname, sizeof(tmpname), "%s/pack/pack-%s.idx", get_object_directory(), sha1_to_hex(pack->sha1));
+ if (rename(idx_tmp_name, tmpname))
+ die_errno("unable to rename temporary pack file");
+ free(pack->written_list);
+ }
+ if (pack->pack_tmp_name)
+ free(pack->pack_tmp_name);
+ return 0;
+}
diff --git a/pack.h b/pack.h
index 28a966b..a2e32c7 100644
--- a/pack.h
+++ b/pack.h
@@ -55,6 +55,19 @@ struct pack_idx_entry {
off_t offset;
};
+struct simple_pack {
+ uint32_t nr_objects;
+ unsigned char sha1[20];
+
+ int fd;
+ struct sha1file *f;
+ uint32_t nr_written;
+ off_t offset;
+ char *pack_tmp_name;
+ struct pack_idx_entry **written_list;
+ struct pack_idx_entry *written_items;
+};
+
extern const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1);
extern int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr);
extern int verify_pack_index(struct packed_git *);
@@ -64,6 +77,10 @@ extern char *index_pack_lockfile(int fd);
extern int encode_in_pack_object_header(enum object_type, uintmax_t, unsigned char *);
extern unsigned long compress_object(void **, unsigned long size);
+extern int create_pack(struct simple_pack *);
+extern int write_object_to_pack(struct simple_pack *, const unsigned char *, void *, unsigned long, enum object_type);
+extern int close_pack(struct simple_pack *);
+
#define PH_ERROR_EOF (-1)
#define PH_ERROR_PACK_SIGNATURE (-2)
#define PH_ERROR_PROTOCOL (-3)
--
1.7.1.rc1.69.g24c2f7
next prev parent reply other threads:[~2010-08-24 22:22 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 22:19 [RFD PATCH 00/32] subtree clone v2 Nguyễn Thái Ngọc Duy
2010-08-24 22:19 ` [PATCH 01/32] add const to ce_write() Nguyễn Thái Ngọc Duy
2010-08-24 22:19 ` [PATCH 02/32] cache-tree: abstract out write_sha1_file from cache_tree_update() Nguyễn Thái Ngọc Duy
2010-08-24 22:41 ` Jonathan Nieder
2010-08-24 22:19 ` [PATCH 03/32] cache-tree: ignore CE_REMOVE entries in verify_cache() Nguyễn Thái Ngọc Duy
2010-08-24 23:15 ` Jonathan Nieder
2010-08-25 0:23 ` Nguyen Thai Ngoc Duy
2010-08-25 0:48 ` Jonathan Nieder
2010-08-24 22:19 ` [PATCH 04/32] move do_compress() from pack-objects.c to pack-write.c Nguyễn Thái Ngọc Duy
2010-08-24 23:25 ` Jonathan Nieder
2010-08-25 3:19 ` Nguyen Thai Ngoc Duy
2010-08-24 22:19 ` Nguyễn Thái Ngọc Duy [this message]
2010-08-24 22:19 ` [PATCH 06/32] tree.c: Add {set,clear}_tree_marks Nguyễn Thái Ngọc Duy
2010-08-24 22:19 ` [PATCH 07/32] tree.c: find_subtree() to search for a tree Nguyễn Thái Ngọc Duy
2010-08-25 3:35 ` Elijah Newren
2010-08-25 3:43 ` Nguyen Thai Ngoc Duy
2010-08-25 5:35 ` Elijah Newren
2010-08-24 22:19 ` [PATCH 08/32] Add $GIT_DIR/narrow check Nguyễn Thái Ngọc Duy
2010-08-24 22:19 ` [PATCH 09/32] index: make narrow index incompatible with older git Nguyễn Thái Ngọc Duy
2010-08-24 23:43 ` Jonathan Nieder
2010-08-25 0:25 ` Nguyen Thai Ngoc Duy
2010-08-24 22:20 ` [PATCH 10/32] rev-list: support traversing in narrow repository mode Nguyễn Thái Ngọc Duy
2010-08-25 4:11 ` Elijah Newren
2010-08-24 22:20 ` [PATCH 11/32] rev-list: support --narrow-tree Nguyễn Thái Ngọc Duy
2010-08-25 3:59 ` Elijah Newren
2010-08-25 22:11 ` Nguyen Thai Ngoc Duy
2010-08-24 22:20 ` [PATCH 12/32] pack-objects: " Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 13/32] upload-pack: support narrow-tree capability Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 14/32] fetch-pack: support --narrow-tree Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 15/32] unpack_trees: only unpack $GIT_DIR/narrow subtree in narrow repository Nguyễn Thái Ngọc Duy
2010-08-25 5:04 ` Elijah Newren
2010-08-25 5:38 ` Nguyen Thai Ngoc Duy
2010-08-24 22:20 ` [PATCH 16/32] cache-tree: only cache tree within narrow area Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 17/32] tree-diff: add narrow versions of diff_{root_,}tree_sha1 Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 18/32] log-tree: use narrow version of diff_tree_sha1 Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 19/32] clone: support --narrow option Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 20/32] narrow-tree: add join_narrow_tree to do tree fixup for commits Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 21/32] commit: add narrow's commit_tree version Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 22/32] commit: use commit_narrow_tree() to support narrow repo Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 23/32] commit-tree: require --narrow-base in " Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 24/32] merge: refuse to merge if narrow bases are different Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 25/32] merge: prepare commit properly in narrow mode Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 26/32] Add upload-narrow-base command Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 27/32] rev-list: traverse some more trees to make upload-narrow-base happy Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 28/32] narrow-tree: add oldest_narrow_base() Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 29/32] Add command fetch-narrow-base Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 30/32] merge: support merging when narrow bases are different Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 31/32] send-pack: do not use thin pack in narrow mode Nguyễn Thái Ngọc Duy
2010-08-24 22:20 ` [PATCH 32/32] daemon: support upload-narrow-base Nguyễn Thái Ngọc Duy
2010-08-24 22:37 ` [RFD PATCH 00/32] subtree clone v2 Jonathan Nieder
2010-08-24 22:47 ` Nguyen Thai Ngoc Duy
2010-08-24 23:09 ` Jonathan Nieder
2010-08-25 0:20 ` Nguyen Thai Ngoc Duy
2010-08-25 4:37 ` Elijah Newren
2010-08-25 5:21 ` Nguyen Thai Ngoc Duy
2010-08-25 5:31 ` Elijah Newren
2010-08-25 6:21 ` Nguyen Thai Ngoc Duy
2010-08-25 13:06 ` Elijah Newren
2010-08-25 22:13 ` Nguyen Thai Ngoc Duy
2010-08-26 2:50 ` Elijah Newren
2010-08-26 3:52 ` Nguyen Thai Ngoc Duy
2010-08-26 4:39 ` Elijah Newren
2010-08-26 4:45 ` Nguyen Thai Ngoc Duy
2010-08-25 5:21 ` Elijah Newren
2010-08-25 19:27 ` Junio C Hamano
2010-08-25 20:43 ` Elijah Newren
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=1282688422-7738-6-git-send-email-pclouds@gmail.com \
--to=pclouds@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).