commit - 35c737652c512af7df226e47cd871f42f1390820
commit + 1510f46981bdb735f68ba6cf80ac2ff8e0971b85
blob - ffb585aa6226197301c3981968e715c8af667099
blob + ba5b7f508867f128f83a05c62f39a2159187276b
--- lib/got_lib_pack.h
+++ lib/got_lib_pack.h
const struct got_error *got_pack_close(struct got_pack *);
+#define GOT_PACK_PREFIX "pack-"
+#define GOT_PACKFILE_SUFFIX ".pack"
+#define GOT_PACKIDX_SUFFIX ".idx"
+#define GOT_PACKFILE_NAMELEN (strlen(GOT_PACK_PREFIX) + \
+ SHA1_DIGEST_STRING_LENGTH - 1 + \
+ strlen(GOT_PACKFILE_SUFFIX))
+#define GOT_PACKIDX_NAMELEN (strlen(GOT_PACK_PREFIX) + \
+ SHA1_DIGEST_STRING_LENGTH - 1 + \
+ strlen(GOT_PACKIDX_SUFFIX))
+
/* See Documentation/technical/pack-format.txt in Git. */
struct got_packidx_trailer {
const struct got_error *got_packidx_open(struct got_packidx **,
const char *, int);
const struct got_error* got_packidx_close(struct got_packidx *);
+int got_packidx_get_object_idx(struct got_packidx *, struct got_object_id *);
const struct got_error *got_packfile_open_object(struct got_object **,
struct got_object_id *, struct got_repository *);
struct got_object *, struct got_repository *);
const struct got_error *got_packfile_extract_object_to_mem(uint8_t **, size_t *,
struct got_object *, struct got_repository *);
+const struct got_error *got_pack_get_packfile_size(size_t *, const char *);
+struct got_pack *got_repo_get_cached_pack(struct got_repository *, const char *);
blob - 83664d5c5fa5bdad1b2dc3c1553e78bfe9df2840
blob + 4c18ac2b1f6e9d6d8c7eaf5b8fb1b21cf92d2813
--- lib/got_lib_repository.h
+++ lib/got_lib_repository.h
struct got_object_id *, struct got_commit_object *);
struct got_commit_object *got_repo_get_cached_commit(struct got_repository *,
struct got_object_id *);
+const struct got_error *got_repo_cache_packidx(struct got_repository *,
+ struct got_packidx *);
+const struct got_error *got_repo_search_packidx(struct got_packidx **, int *,
+ struct got_repository *, struct got_object_id *);
+const struct got_error *got_repo_cache_pack(struct got_pack **,
+ struct got_repository *, const char *, struct got_packidx *);
blob - 20a09ecc2a52c54c526be4a47c82245cdab89902
blob + 4ea89f7517554d13e857a8ae0abb3efc4b17e4a7
--- lib/pack.c
+++ lib/pack.c
#include <sys/queue.h>
#include <sys/mman.h>
-#include <dirent.h>
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
#define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
#endif
-#define GOT_PACK_PREFIX "pack-"
-#define GOT_PACKFILE_SUFFIX ".pack"
-#define GOT_PACKIDX_SUFFIX ".idx"
-#define GOT_PACKFILE_NAMELEN (strlen(GOT_PACK_PREFIX) + \
- SHA1_DIGEST_STRING_LENGTH - 1 + \
- strlen(GOT_PACKFILE_SUFFIX))
-#define GOT_PACKIDX_NAMELEN (strlen(GOT_PACK_PREFIX) + \
- SHA1_DIGEST_STRING_LENGTH - 1 + \
- strlen(GOT_PACKIDX_SUFFIX))
-
#ifndef MIN
#define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
#endif
return NULL;
}
-static const struct got_error *
-get_packfile_size(size_t *size, const char *path)
+const struct got_error *
+got_pack_get_packfile_size(size_t *size, const char *path)
{
struct stat sb;
char *dot;
if (p->fd == -1)
return got_error_from_errno();
- err = get_packfile_size(&p->len, path);
+ err = got_pack_get_packfile_size(&p->len, path);
if (err) {
close(p->fd);
free(p);
return err;
}
-static int
-is_packidx_filename(const char *name, size_t len)
-{
- if (len != GOT_PACKIDX_NAMELEN)
- return 0;
-
- if (strncmp(name, GOT_PACK_PREFIX, strlen(GOT_PACK_PREFIX)) != 0)
- return 0;
-
- if (strcmp(name + strlen(GOT_PACK_PREFIX) +
- SHA1_DIGEST_STRING_LENGTH - 1, GOT_PACKIDX_SUFFIX) != 0)
- return 0;
-
- return 1;
-}
-
static off_t
get_object_offset(struct got_packidx *packidx, int idx)
{
return (off_t)(offset & GOT_PACKIDX_OFFSET_VAL_MASK);
}
-static int
-get_object_idx(struct got_packidx *packidx, struct got_object_id *id)
+int
+got_packidx_get_object_idx(struct got_packidx *packidx, struct got_object_id *id)
{
u_int8_t id0 = id->sha1[0];
uint32_t totobj = betoh32(packidx->hdr.fanout_table[0xff]);
}
static const struct got_error *
-cache_packidx(struct got_packidx *packidx, struct got_repository *repo)
-{
- const struct got_error *err = NULL;
- int i;
-
- for (i = 0; i < nitems(repo->packidx_cache); i++) {
- if (repo->packidx_cache[i] == NULL)
- break;
- }
-
- if (i == nitems(repo->packidx_cache)) {
- err = got_packidx_close(repo->packidx_cache[i - 1]);
- if (err)
- return err;
- memmove(&repo->packidx_cache[1], &repo->packidx_cache[0],
- sizeof(repo->packidx_cache) -
- sizeof(repo->packidx_cache[0]));
- i = 0;
- }
-
- repo->packidx_cache[i] = packidx;
- return NULL;
-}
-
-static const struct got_error *
-search_packidx(struct got_packidx **packidx, int *idx,
- struct got_repository *repo, struct got_object_id *id)
-{
- const struct got_error *err;
- char *path_packdir;
- DIR *packdir;
- struct dirent *dent;
- char *path_packidx;
- int i;
-
- /* Search pack index cache. */
- for (i = 0; i < nitems(repo->packidx_cache); i++) {
- if (repo->packidx_cache[i] == NULL)
- break;
- *idx = get_object_idx(repo->packidx_cache[i], id);
- if (*idx != -1) {
- *packidx = repo->packidx_cache[i];
- return NULL;
- }
- }
- /* No luck. Search the filesystem. */
-
- path_packdir = got_repo_get_path_objects_pack(repo);
- if (path_packdir == NULL)
- return got_error_from_errno();
-
- packdir = opendir(path_packdir);
- if (packdir == NULL) {
- err = got_error_from_errno();
- goto done;
- }
-
- while ((dent = readdir(packdir)) != NULL) {
- if (!is_packidx_filename(dent->d_name, dent->d_namlen))
- continue;
-
- if (asprintf(&path_packidx, "%s/%s", path_packdir,
- dent->d_name) == -1) {
- err = got_error_from_errno();
- goto done;
- }
-
- err = got_packidx_open(packidx, path_packidx, 0);
- free(path_packidx);
- if (err)
- goto done;
-
- *idx = get_object_idx(*packidx, id);
- if (*idx != -1) {
- err = NULL; /* found the object */
- err = cache_packidx(*packidx, repo);
- goto done;
- }
-
- err = got_packidx_close(*packidx);
- *packidx = NULL;
- if (err)
- goto done;
- }
-
- err = got_error(GOT_ERR_NO_OBJ);
-done:
- free(path_packdir);
- if (packdir && closedir(packdir) != 0 && err == 0)
- err = got_error_from_errno();
- return err;
-}
-
-static const struct got_error *
get_packfile_path(char **path_packfile, struct got_packidx *packidx)
{
size_t size;
return got_error(GOT_ERR_NO_SPACE);
return NULL;
-}
-
-static const struct got_error *
-read_packfile_hdr(int fd, struct got_packidx *packidx)
-{
- const struct got_error *err = NULL;
- uint32_t totobj = betoh32(packidx->hdr.fanout_table[0xff]);
- struct got_packfile_hdr hdr;
- ssize_t n;
-
- n = read(fd, &hdr, sizeof(hdr));
- if (n < 0)
- return got_error_from_errno();
- if (n != sizeof(hdr))
- return got_error(GOT_ERR_BAD_PACKFILE);
-
- if (betoh32(hdr.signature) != GOT_PACKFILE_SIGNATURE ||
- betoh32(hdr.version) != GOT_PACKFILE_VERSION ||
- betoh32(hdr.nobjects) != totobj)
- err = got_error(GOT_ERR_BAD_PACKFILE);
-
- return err;
}
-static const struct got_error *
-open_packfile(int *fd, const char *path_packfile, struct got_packidx *packidx)
-{
- const struct got_error *err = NULL;
-
- *fd = open(path_packfile, O_RDONLY | O_NOFOLLOW, GOT_DEFAULT_FILE_MODE);
- if (*fd == -1)
- return got_error_from_errno();
-
- if (packidx) {
- err = read_packfile_hdr(*fd, packidx);
- if (err) {
- close(*fd);
- *fd = -1;
- }
- }
- return err;
-}
-
const struct got_error *
got_pack_close(struct got_pack *pack)
{
free(pack->path_packfile);
pack->path_packfile = NULL;
pack->filesize = 0;
-
- return err;
-}
-
-static const struct got_error *
-cache_pack(struct got_pack **packp, const char *path_packfile,
- struct got_packidx *packidx, struct got_repository *repo)
-{
- const struct got_error *err = NULL;
- struct got_pack *pack = NULL;
- int i;
-
- if (packp)
- *packp = NULL;
-
- for (i = 0; i < nitems(repo->packs); i++) {
- pack = &repo->packs[i];
- if (pack->path_packfile == NULL)
- break;
- if (strcmp(pack->path_packfile, path_packfile) == 0)
- return NULL;
- }
-
- if (i == nitems(repo->packs) - 1) {
- err = got_pack_close(&repo->packs[i - 1]);
- if (err)
- return err;
- memmove(&repo->packs[1], &repo->packs[0],
- sizeof(repo->packs) - sizeof(repo->packs[0]));
- i = 0;
- }
-
- pack = &repo->packs[i];
-
- pack->path_packfile = strdup(path_packfile);
- if (pack->path_packfile == NULL) {
- err = got_error_from_errno();
- goto done;
- }
- err = open_packfile(&pack->fd, path_packfile, packidx);
- if (err)
- goto done;
-
- err = get_packfile_size(&pack->filesize, path_packfile);
- if (err)
- goto done;
-
-#ifndef GOT_PACK_NO_MMAP
- pack->map = mmap(NULL, pack->filesize, PROT_READ, MAP_PRIVATE,
- pack->fd, 0);
- if (pack->map == MAP_FAILED)
- pack->map = NULL; /* fall back to read(2) */
-#endif
-done:
- if (err) {
- if (pack) {
- free(pack->path_packfile);
- memset(pack, 0, sizeof(*pack));
- }
- } else if (packp)
- *packp = pack;
return err;
}
-struct got_pack *
-get_cached_pack(const char *path_packfile, struct got_repository *repo)
-{
- struct got_pack *pack = NULL;
- int i;
-
- for (i = 0; i < nitems(repo->packs); i++) {
- pack = &repo->packs[i];
- if (pack->path_packfile == NULL)
- break;
- if (strcmp(pack->path_packfile, path_packfile) == 0)
- return pack;
- }
-
- return NULL;
-}
-
static const struct got_error *
parse_object_type_and_size(uint8_t *type, uint64_t *size, size_t *len,
struct got_pack *pack, off_t offset)
goto done;
/* Delta base must be in the same pack file. */
- idx = get_object_idx(packidx, &id);
+ idx = got_packidx_get_object_idx(packidx, &id);
if (idx == -1) {
err = got_error(GOT_ERR_BAD_PACKFILE);
goto done;
int idx;
char *path_packfile;
- err = search_packidx(&packidx, &idx, repo, id);
+ err = got_repo_search_packidx(&packidx, &idx, repo, id);
if (err)
return err;
if (err)
return err;
- pack = get_cached_pack(path_packfile, repo);
+ pack = got_repo_get_cached_pack(repo, path_packfile);
if (pack == NULL) {
- err = cache_pack(&pack, path_packfile, packidx, repo);
+ err = got_repo_cache_pack(&pack, repo, path_packfile, packidx);
if (err)
goto done;
}
if (err)
goto done;
- err = cache_pack(NULL, (*obj)->path_packfile, packidx, repo);
+ err = got_repo_cache_pack(NULL, repo, (*obj)->path_packfile, packidx);
done:
free(path_packfile);
return err;
if ((obj->flags & GOT_OBJ_FLAG_PACKED) == 0)
return got_error(GOT_ERR_OBJ_NOT_PACKED);
- pack = get_cached_pack(obj->path_packfile, repo);
+ pack = got_repo_get_cached_pack(repo, obj->path_packfile);
if (pack == NULL) {
- err = cache_pack(&pack, obj->path_packfile, NULL, repo);
+ err = got_repo_cache_pack(&pack, repo, obj->path_packfile, NULL);
if (err)
return err;
}
if ((obj->flags & GOT_OBJ_FLAG_PACKED) == 0)
return got_error(GOT_ERR_OBJ_NOT_PACKED);
- pack = get_cached_pack(obj->path_packfile, repo);
+ pack = got_repo_get_cached_pack(repo, obj->path_packfile);
if (pack == NULL) {
- err = cache_pack(&pack, obj->path_packfile, NULL, repo);
+ err = got_repo_cache_pack(&pack, repo, obj->path_packfile, NULL);
if (err)
goto done;
}
blob - 2a9822b7424239898ca9534c7fde9149e577eefc
blob + d7db2f58c13d7070176e00eb3563b5a567520170
--- lib/repository.c
+++ lib/repository.c
#include <sys/uio.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#include <sys/mman.h>
+#include <fcntl.h>
#include <limits.h>
+#include <dirent.h>
#include <stdlib.h>
#include <stdio.h>
#include <sha1.h>
free(path);
else
*in_repo_path = path;
+ return err;
+}
+
+const struct got_error *
+got_repo_cache_packidx(struct got_repository *repo, struct got_packidx *packidx)
+{
+ const struct got_error *err = NULL;
+ int i;
+
+ for (i = 0; i < nitems(repo->packidx_cache); i++) {
+ if (repo->packidx_cache[i] == NULL)
+ break;
+ }
+
+ if (i == nitems(repo->packidx_cache)) {
+ err = got_packidx_close(repo->packidx_cache[i - 1]);
+ if (err)
+ return err;
+ memmove(&repo->packidx_cache[1], &repo->packidx_cache[0],
+ sizeof(repo->packidx_cache) -
+ sizeof(repo->packidx_cache[0]));
+ i = 0;
+ }
+
+ repo->packidx_cache[i] = packidx;
+ return NULL;
+}
+
+static int
+is_packidx_filename(const char *name, size_t len)
+{
+ if (len != GOT_PACKIDX_NAMELEN)
+ return 0;
+
+ if (strncmp(name, GOT_PACK_PREFIX, strlen(GOT_PACK_PREFIX)) != 0)
+ return 0;
+
+ if (strcmp(name + strlen(GOT_PACK_PREFIX) +
+ SHA1_DIGEST_STRING_LENGTH - 1, GOT_PACKIDX_SUFFIX) != 0)
+ return 0;
+
+ return 1;
+}
+
+const struct got_error *
+got_repo_search_packidx(struct got_packidx **packidx, int *idx,
+ struct got_repository *repo, struct got_object_id *id)
+{
+ const struct got_error *err;
+ char *path_packdir;
+ DIR *packdir;
+ struct dirent *dent;
+ char *path_packidx;
+ int i;
+
+ /* Search pack index cache. */
+ for (i = 0; i < nitems(repo->packidx_cache); i++) {
+ if (repo->packidx_cache[i] == NULL)
+ break;
+ *idx = got_packidx_get_object_idx(repo->packidx_cache[i], id);
+ if (*idx != -1) {
+ *packidx = repo->packidx_cache[i];
+ return NULL;
+ }
+ }
+ /* No luck. Search the filesystem. */
+
+ path_packdir = got_repo_get_path_objects_pack(repo);
+ if (path_packdir == NULL)
+ return got_error_from_errno();
+
+ packdir = opendir(path_packdir);
+ if (packdir == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
+ while ((dent = readdir(packdir)) != NULL) {
+ if (!is_packidx_filename(dent->d_name, dent->d_namlen))
+ continue;
+
+ if (asprintf(&path_packidx, "%s/%s", path_packdir,
+ dent->d_name) == -1) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
+ err = got_packidx_open(packidx, path_packidx, 0);
+ free(path_packidx);
+ if (err)
+ goto done;
+
+ *idx = got_packidx_get_object_idx(*packidx, id);
+ if (*idx != -1) {
+ err = NULL; /* found the object */
+ err = got_repo_cache_packidx(repo, *packidx);
+ goto done;
+ }
+
+ err = got_packidx_close(*packidx);
+ *packidx = NULL;
+ if (err)
+ goto done;
+ }
+
+ err = got_error(GOT_ERR_NO_OBJ);
+done:
+ free(path_packdir);
+ if (packdir && closedir(packdir) != 0 && err == 0)
+ err = got_error_from_errno();
return err;
}
+
+static const struct got_error *
+read_packfile_hdr(int fd, struct got_packidx *packidx)
+{
+ const struct got_error *err = NULL;
+ uint32_t totobj = betoh32(packidx->hdr.fanout_table[0xff]);
+ struct got_packfile_hdr hdr;
+ ssize_t n;
+
+ n = read(fd, &hdr, sizeof(hdr));
+ if (n < 0)
+ return got_error_from_errno();
+ if (n != sizeof(hdr))
+ return got_error(GOT_ERR_BAD_PACKFILE);
+
+ if (betoh32(hdr.signature) != GOT_PACKFILE_SIGNATURE ||
+ betoh32(hdr.version) != GOT_PACKFILE_VERSION ||
+ betoh32(hdr.nobjects) != totobj)
+ err = got_error(GOT_ERR_BAD_PACKFILE);
+
+ return err;
+}
+
+static const struct got_error *
+open_packfile(int *fd, const char *path_packfile, struct got_packidx *packidx)
+{
+ const struct got_error *err = NULL;
+
+ *fd = open(path_packfile, O_RDONLY | O_NOFOLLOW, GOT_DEFAULT_FILE_MODE);
+ if (*fd == -1)
+ return got_error_from_errno();
+
+ if (packidx) {
+ err = read_packfile_hdr(*fd, packidx);
+ if (err) {
+ close(*fd);
+ *fd = -1;
+ }
+ }
+
+ return err;
+}
+
+const struct got_error *
+got_repo_cache_pack(struct got_pack **packp, struct got_repository *repo,
+ const char *path_packfile, struct got_packidx *packidx)
+{
+ const struct got_error *err = NULL;
+ struct got_pack *pack = NULL;
+ int i;
+
+ if (packp)
+ *packp = NULL;
+
+ for (i = 0; i < nitems(repo->packs); i++) {
+ pack = &repo->packs[i];
+ if (pack->path_packfile == NULL)
+ break;
+ if (strcmp(pack->path_packfile, path_packfile) == 0)
+ return NULL;
+ }
+
+ if (i == nitems(repo->packs) - 1) {
+ err = got_pack_close(&repo->packs[i - 1]);
+ if (err)
+ return err;
+ memmove(&repo->packs[1], &repo->packs[0],
+ sizeof(repo->packs) - sizeof(repo->packs[0]));
+ i = 0;
+ }
+
+ pack = &repo->packs[i];
+
+ pack->path_packfile = strdup(path_packfile);
+ if (pack->path_packfile == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
+ err = open_packfile(&pack->fd, path_packfile, packidx);
+ if (err)
+ goto done;
+
+ err = got_pack_get_packfile_size(&pack->filesize, path_packfile);
+ if (err)
+ goto done;
+
+#ifndef GOT_PACK_NO_MMAP
+ pack->map = mmap(NULL, pack->filesize, PROT_READ, MAP_PRIVATE,
+ pack->fd, 0);
+ if (pack->map == MAP_FAILED)
+ pack->map = NULL; /* fall back to read(2) */
+#endif
+done:
+ if (err) {
+ if (pack) {
+ free(pack->path_packfile);
+ memset(pack, 0, sizeof(*pack));
+ }
+ } else if (packp)
+ *packp = pack;
+ return err;
+}
+
+struct got_pack *
+got_repo_get_cached_pack(struct got_repository *repo, const char *path_packfile)
+{
+ struct got_pack *pack = NULL;
+ int i;
+
+ for (i = 0; i < nitems(repo->packs); i++) {
+ pack = &repo->packs[i];
+ if (pack->path_packfile == NULL)
+ break;
+ if (strcmp(pack->path_packfile, path_packfile) == 0)
+ return pack;
+ }
+
+ return NULL;
+}
