commit - e01590338c3e32a0e096d3409844b7e587ab894b
commit + 133d2798cc7d235f7491a2969b2cbb700841d8e8
blob - d0d1be448ea98d718d4cb76352f3fc9bc41de44a
blob + 0e9c41091b0428d930e156d856221cc4b93568b9
--- lib/fileindex.c
+++ lib/fileindex.c
*/
#include <sys/queue.h>
+#include <sys/tree.h>
#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
#include <sha1.h>
#include <endian.h>
+#include <limits.h>
#include "got_error.h"
-#include "got_lib_pathset.h"
+#include "got_lib_path.h"
#include "got_lib_fileindex.h"
+RB_HEAD(got_fileindex_tree, got_fileindex_entry);
+
+struct got_fileindex {
+ struct got_fileindex_tree entries;
+ int nentries;
+#define GOT_FILEIDX_MAX_ENTRIES INT_MAX
+};
+
+static int
+cmp_entries(const struct got_fileindex_entry *e1,
+ const struct got_fileindex_entry *e2)
+{
+ return got_compare_paths(e1->path, e2->path);
+}
+
+RB_PROTOTYPE(got_fileindex_tree, got_fileindex_entry, entry, cmp_entries);
+
const struct got_error *
got_fileindex_entry_update(struct got_fileindex_entry *entry,
const char *ondisk_path, uint8_t *blob_sha1, uint8_t *commit_sha1)
got_fileindex_entry_add(struct got_fileindex *fileindex,
struct got_fileindex_entry *entry)
{
- return got_pathset_add(fileindex->entries, entry->path, entry);
+ if (fileindex->nentries >= GOT_FILEIDX_MAX_ENTRIES)
+ return got_error(GOT_ERR_NO_SPACE);
+
+ RB_INSERT(got_fileindex_tree, &fileindex->entries, entry);
+ fileindex->nentries++;
+ return NULL;
}
-const struct got_error *
+void
got_fileindex_entry_remove(struct got_fileindex *fileindex,
struct got_fileindex_entry *entry)
{
- return got_pathset_remove(NULL, fileindex->entries, entry->path);
+ RB_REMOVE(got_fileindex_tree, &fileindex->entries, entry);
+ fileindex->nentries--;
}
struct got_fileindex_entry *
got_fileindex_entry_get(struct got_fileindex *fileindex, const char *path)
{
- struct got_fileindex_entry *entry;
- entry = (struct got_fileindex_entry *)got_pathset_get(
- fileindex->entries, path);
- return entry;
+ struct got_fileindex_entry key;
+ memset(&key, 0, sizeof(key));
+ key.path = (char *)path;
+ return RB_FIND(got_fileindex_tree, &fileindex->entries, &key);
}
-struct pathset_cb_arg {
- got_fileindex_cb cb;
- void *cb_arg;
-};
-
-static const struct got_error *
-pathset_cb(const char *path, void *data, void *arg)
-{
- struct got_fileindex_entry *entry = data;
- struct pathset_cb_arg *a = arg;
- return (*a->cb)(a->cb_arg, entry);
-}
-
const struct got_error *
got_fileindex_for_each_entry_safe(struct got_fileindex *fileindex,
got_fileindex_cb cb, void *cb_arg)
{
- struct pathset_cb_arg arg;
-
- arg.cb = cb;
- arg.cb_arg = cb_arg;
- return got_pathset_for_each_safe(fileindex->entries, pathset_cb, &arg);
-}
-
-const struct got_error *
-got_fileindex_alloc(struct got_fileindex **fileindex)
-{
- *fileindex = calloc(1, sizeof(**fileindex));
- if (*fileindex == NULL)
- return got_error_from_errno();
+ const struct got_error *err;
+ struct got_fileindex_entry *entry, *tmp;
- (*fileindex)->entries = got_pathset_alloc();
- if ((*fileindex)->entries == NULL) {
- free(*fileindex);
- *fileindex = NULL;
- return got_error_from_errno();
+ RB_FOREACH_SAFE(entry, got_fileindex_tree, &fileindex->entries, tmp) {
+ err = (*cb)(cb_arg, entry);
+ if (err)
+ return err;
}
-
return NULL;
}
-static const struct got_error *
-free_entry_cb(const char *path, void *data, void *arg)
+struct got_fileindex *
+got_fileindex_alloc(void)
{
- struct got_fileindex_entry *entry = data;
- got_fileindex_entry_free(entry);
- return NULL;
+ struct got_fileindex *fileindex;
+
+ fileindex = calloc(1, sizeof(*fileindex));
+ if (fileindex == NULL)
+ return NULL;
+
+ RB_INIT(&fileindex->entries);
+ return fileindex;
}
void
got_fileindex_free(struct got_fileindex *fileindex)
{
- got_pathset_for_each_safe(fileindex->entries, free_entry_cb, NULL);
- got_pathset_free(fileindex->entries);
+ struct got_fileindex_entry *entry;
+
+ while ((entry = RB_MIN(got_fileindex_tree, &fileindex->entries))) {
+ RB_REMOVE(got_fileindex_tree, &fileindex->entries, entry);
+ got_fileindex_entry_free(entry);
+ }
free(fileindex);
}
return err;
}
-struct write_entry_cb_arg {
- SHA1_CTX *ctx;
- FILE *outfile;
-};
-
-static const struct got_error *
-write_entry_cb(const char *path, void *data, void *arg)
-{
- struct got_fileindex_entry *entry = data;
- struct write_entry_cb_arg *a = arg;
-
- return write_fileindex_entry(a->ctx, entry, a->outfile);
-}
-
const struct got_error *
got_fileindex_write(struct got_fileindex *fileindex, FILE *outfile)
{
const size_t len = sizeof(hdr.signature) + sizeof(hdr.version) +
sizeof(hdr.nentries);
uint8_t buf[len];
- struct write_entry_cb_arg arg;
+ struct got_fileindex_entry *entry;
SHA1Init(&ctx);
hdr.signature = htobe32(GOT_FILE_INDEX_SIGNATURE);
hdr.version = htobe32(GOT_FILE_INDEX_VERSION);
- hdr.nentries = htobe32(got_pathset_num_elements(fileindex->entries));
+ hdr.nentries = htobe32(fileindex->nentries);
memcpy(buf, &hdr, len);
SHA1Update(&ctx, buf, len);
if (n != len)
return got_ferror(outfile, GOT_ERR_IO);
- arg.ctx = &ctx;
- arg.outfile = outfile;
- err = got_pathset_for_each_safe(fileindex->entries, write_entry_cb,
- &arg);
- if (err)
- return err;
+ RB_FOREACH(entry, got_fileindex_tree, &fileindex->entries) {
+ err = write_fileindex_entry(&ctx, entry, outfile);
+ if (err)
+ return err;
+ }
SHA1Final(sha1, &ctx);
n = fwrite(sha1, 1, sizeof(sha1), outfile);
return NULL;
}
+
+RB_GENERATE(got_fileindex_tree, got_fileindex_entry, entry, cmp_entries);
blob - 4330cebe1b3a76ce972add2e1139baa62d8d43c0
blob + a4eea20ed8786fb17ccd6fc5fef8407373f53b8d
--- lib/got_lib_fileindex.h
+++ lib/got_lib_fileindex.h
* applied back to the filesystem.
*/
struct got_fileindex_entry {
+ RB_ENTRY(got_fileindex_entry) entry;
uint64_t ctime_sec;
uint64_t ctime_nsec;
uint64_t mtime_sec;
#define GOT_INDEX_ENTRY_STAGE_OURS 2
#define GOT_INDEX_ENTRY_STAGE_THEIRS 3
-struct got_fileindex {
- struct got_pathset *entries;
-};
+struct got_fileindex;
/* On-disk file index header structure. */
struct got_fileindex_hdr {
const struct got_error *got_fileindex_entry_alloc(struct got_fileindex_entry **,
const char *, const char *, uint8_t *, uint8_t *);
void got_fileindex_entry_free(struct got_fileindex_entry *);
-const struct got_error *got_fileindex_alloc(struct got_fileindex **);
+struct got_fileindex *got_fileindex_alloc(void);
void got_fileindex_free(struct got_fileindex *);
const struct got_error *got_fileindex_write(struct got_fileindex *, FILE *);
const struct got_error *got_fileindex_entry_add(struct got_fileindex *,
struct got_fileindex_entry *);
-const struct got_error *got_fileindex_entry_remove(struct got_fileindex *,
+void got_fileindex_entry_remove(struct got_fileindex *,
struct got_fileindex_entry *);
struct got_fileindex_entry *got_fileindex_entry_get(struct got_fileindex *,
const char *);
blob - 55c345789881a19b86a5f73f6ce10fb6fbde2ff0
blob + d4cd4a81a07a392be5d29d277af8a84eda0030db
--- lib/worktree.c
+++ lib/worktree.c
#include <sys/stat.h>
#include <sys/limits.h>
#include <sys/queue.h>
+#include <sys/tree.h>
#include <stddef.h>
#include <string.h>
if (err)
return err;
- err = got_fileindex_alloc(&fileindex);
- if (err)
+ fileindex = got_fileindex_alloc();
+ if (fileindex == NULL) {
+ err = got_error_from_errno();
goto done;
+ }
if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
