Skip to content

Commit

Permalink
fsck: use oids rather than objects for object_name API
Browse files Browse the repository at this point in the history 
We don't actually care about having object structs; we only need to look
up decorations by oid. Let's accept this more limited form, which will
give our callers more flexibility.

Note that the decoration API we rely on uses object structs itself (even
though it only looks at their oids). We can solve this by switching to
a kh_oid_map (we could also use the hashmap oidmap, but it's more
awkward for the simple case of just storing a void pointer).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
@peff @gitster
peff authored and gitster committed Oct 28, 2019
1 parent d40bbc1 commit 7339029
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 37 deletions.
12 changes: 6 additions & 6 deletions builtin/fsck.c
View file
Expand Up @@ -52,7 +52,7 @@ static int name_objects;

static const char *describe_object(struct object *obj)
{
return fsck_describe_object(&fsck_walk_options, obj);
return fsck_describe_object(&fsck_walk_options, &obj->oid);
}

static const char *printable_type(struct object *obj)
Expand Down Expand Up @@ -483,7 +483,7 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
obj = lookup_object(the_repository, oid);
if (obj && (obj->flags & HAS_OBJ)) {
if (timestamp)
fsck_put_object_name(&fsck_walk_options, obj,
fsck_put_object_name(&fsck_walk_options, oid,
"%s@{%"PRItime"}",
refname, timestamp);
obj->flags |= USED;
Expand Down Expand Up @@ -550,7 +550,7 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
default_refs++;
obj->flags |= USED;
fsck_put_object_name(&fsck_walk_options,
obj, "%s", refname);
oid, "%s", refname);
mark_object_reachable(obj);

return 0;
Expand Down Expand Up @@ -724,7 +724,7 @@ static int fsck_cache_tree(struct cache_tree *it)
return 1;
}
obj->flags |= USED;
fsck_put_object_name(&fsck_walk_options, obj, ":");
fsck_put_object_name(&fsck_walk_options, &it->oid, ":");
mark_object_reachable(obj);
if (obj->type != OBJ_TREE)
err |= objerror(obj, _("non-tree in cache-tree"));
Expand Down Expand Up @@ -869,7 +869,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
}

obj->flags |= USED;
fsck_put_object_name(&fsck_walk_options, obj,
fsck_put_object_name(&fsck_walk_options, &oid,
"%s", arg);
mark_object_reachable(obj);
continue;
Expand Down Expand Up @@ -906,7 +906,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
continue;
obj = &blob->object;
obj->flags |= USED;
fsck_put_object_name(&fsck_walk_options, obj,
fsck_put_object_name(&fsck_walk_options, &obj->oid,
":%s", active_cache[i]->name);
mark_object_reachable(obj);
}
Expand Down
61 changes: 34 additions & 27 deletions fsck.c
View file
Expand Up @@ -315,48 +315,56 @@ static int report(struct fsck_options *options, struct object *object,
void fsck_enable_object_names(struct fsck_options *options)
{
if (!options->object_names)
options->object_names = xcalloc(1, sizeof(struct decoration));
options->object_names = kh_init_oid_map();
}

const char *fsck_get_object_name(struct fsck_options *options, struct object *obj)
const char *fsck_get_object_name(struct fsck_options *options,
const struct object_id *oid)
{
khiter_t pos;
if (!options->object_names)
return NULL;
return lookup_decoration(options->object_names, obj);
pos = kh_get_oid_map(options->object_names, *oid);
if (pos >= kh_end(options->object_names))
return NULL;
return kh_value(options->object_names, pos);
}

void fsck_put_object_name(struct fsck_options *options, struct object *obj,
void fsck_put_object_name(struct fsck_options *options,
const struct object_id *oid,
const char *fmt, ...)
{
va_list ap;
struct strbuf buf = STRBUF_INIT;
char *existing;
khiter_t pos;
int hashret;

if (!options->object_names)
return;
existing = lookup_decoration(options->object_names, obj);
if (existing)

pos = kh_put_oid_map(options->object_names, *oid, &hashret);
if (!hashret)
return;
va_start(ap, fmt);
strbuf_vaddf(&buf, fmt, ap);
add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL));
kh_value(options->object_names, pos) = strbuf_detach(&buf, NULL);
va_end(ap);
}

const char *fsck_describe_object(struct fsck_options *options,
struct object *obj)
const struct object_id *oid)
{
static struct strbuf bufs[] = {
STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
};
static int b = 0;
struct strbuf *buf;
const char *name = fsck_get_object_name(options, obj);
const char *name = fsck_get_object_name(options, oid);

buf = bufs + b;
b = (b + 1) % ARRAY_SIZE(bufs);
strbuf_reset(buf);
strbuf_addstr(buf, oid_to_hex(&obj->oid));
strbuf_addstr(buf, oid_to_hex(oid));
if (name)
strbuf_addf(buf, " (%s)", name);

Expand All @@ -373,7 +381,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
if (parse_tree(tree))
return -1;

name = fsck_get_object_name(options, &tree->object);
name = fsck_get_object_name(options, &tree->object.oid);
if (init_tree_desc_gently(&desc, tree->buffer, tree->size))
return -1;
while (tree_entry_gently(&desc, &entry)) {
Expand All @@ -386,20 +394,20 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
if (S_ISDIR(entry.mode)) {
obj = (struct object *)lookup_tree(the_repository, &entry.oid);
if (name && obj)
fsck_put_object_name(options, obj, "%s%s/",
fsck_put_object_name(options, &entry.oid, "%s%s/",
name, entry.path);
result = options->walk(obj, OBJ_TREE, data, options);
}
else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
obj = (struct object *)lookup_blob(the_repository, &entry.oid);
if (name && obj)
fsck_put_object_name(options, obj, "%s%s",
fsck_put_object_name(options, &entry.oid, "%s%s",
name, entry.path);
result = options->walk(obj, OBJ_BLOB, data, options);
}
else {
result = error("in tree %s: entry %s has bad mode %.6o",
fsck_describe_object(options, &tree->object),
fsck_describe_object(options, &tree->object.oid),
entry.path, entry.mode);
}
if (result < 0)
Expand All @@ -421,9 +429,9 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
if (parse_commit(commit))
return -1;

name = fsck_get_object_name(options, &commit->object);
name = fsck_get_object_name(options, &commit->object.oid);
if (name)
fsck_put_object_name(options, &get_commit_tree(commit)->object,
fsck_put_object_name(options, get_commit_tree_oid(commit),
"%s:", name);

result = options->walk((struct object *)get_commit_tree(commit),
Expand Down Expand Up @@ -452,18 +460,17 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio

while (parents) {
if (name) {
struct object *obj = &parents->item->object;
struct object_id *oid = &parents->item->object.oid;

if (counter++)
fsck_put_object_name(options, obj, "%s^%d",
fsck_put_object_name(options, oid, "%s^%d",
name, counter);
else if (generation > 0)
fsck_put_object_name(options, obj, "%.*s~%d",
fsck_put_object_name(options, oid, "%.*s~%d",
name_prefix_len, name,
generation + 1);
else
fsck_put_object_name(options, obj, "%s^",
name);
fsck_put_object_name(options, oid, "%s^", name);
}
result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options);
if (result < 0)
Expand All @@ -477,12 +484,12 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio

static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *options)
{
const char *name = fsck_get_object_name(options, &tag->object);
const char *name = fsck_get_object_name(options, &tag->object.oid);

if (parse_tag(tag))
return -1;
if (name)
fsck_put_object_name(options, tag->tagged, "%s", name);
fsck_put_object_name(options, &tag->tagged->oid, "%s", name);
return options->walk(tag->tagged, OBJ_ANY, data, options);
}

Expand All @@ -505,7 +512,7 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options)
return fsck_walk_tag((struct tag *)obj, data, options);
default:
error("Unknown object type for %s",
fsck_describe_object(options, obj));
fsck_describe_object(options, &obj->oid));
return -1;
}
}
Expand Down Expand Up @@ -979,10 +986,10 @@ int fsck_error_function(struct fsck_options *o,
struct object *obj, int msg_type, const char *message)
{
if (msg_type == FSCK_WARN) {
warning("object %s: %s", fsck_describe_object(o, obj), message);
warning("object %s: %s", fsck_describe_object(o, &obj->oid), message);
return 0;
}
error("object %s: %s", fsck_describe_object(o, obj), message);
error("object %s: %s", fsck_describe_object(o, &obj->oid), message);
return 1;
}

Expand Down
9 changes: 5 additions & 4 deletions fsck.h
View file
Expand Up @@ -38,7 +38,7 @@ struct fsck_options {
unsigned strict:1;
int *msg_type;
struct oidset skiplist;
struct decoration *object_names;
kh_oid_map_t *object_names;
};

#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL, OIDSET_INIT }
Expand Down Expand Up @@ -84,11 +84,12 @@ int fsck_finish(struct fsck_options *options);
*/
void fsck_enable_object_names(struct fsck_options *options);
const char *fsck_get_object_name(struct fsck_options *options,
struct object *obj);
const struct object_id *oid);
__attribute__((format (printf,3,4)))
void fsck_put_object_name(struct fsck_options *options, struct object *obj,
void fsck_put_object_name(struct fsck_options *options,
const struct object_id *oid,
const char *fmt, ...);
const char *fsck_describe_object(struct fsck_options *options,
struct object *obj);
const struct object_id *oid);

#endif

0 comments on commit 7339029

Please sign in to comment.