thodg/libgit2/src/object.c

• Show log

  Commit

• Hash : 72a3fe42
  Author :
  Date : 2011-03-18T19:38:49
  

  I broke your bindings Hey. Apologies in advance -- I broke your bindings. This is a major commit that includes a long-overdue redesign of the whole object-database structure. This is expected to be the last major external API redesign of the library until the first non-alpha release. Please get your bindings up to date with these changes. They will be included in the next minor release. Sorry again! Major features include: - Real caching and refcounting on parsed objects - Real caching and refcounting on objects read from the ODB - Streaming writes & reads from the ODB - Single-method writes for all object types - The external API is now partially thread-safe The speed increases are significant in all aspects, specially when reading an object several times from the ODB (revwalking) and when writing big objects to the ODB. Here's a full changelog for the external API: blob.h ------ - Remove `git_blob_new` - Remove `git_blob_set_rawcontent` - Remove `git_blob_set_rawcontent_fromfile` - Rename `git_blob_writefile` -> `git_blob_create_fromfile` - Change `git_blob_create_fromfile`: The `path` argument is now relative to the repository's working dir - Add `git_blob_create_frombuffer` commit.h -------- - Remove `git_commit_new` - Remove `git_commit_add_parent` - Remove `git_commit_set_message` - Remove `git_commit_set_committer` - Remove `git_commit_set_author` - Remove `git_commit_set_tree` - Add `git_commit_create` - Add `git_commit_create_v` - Add `git_commit_create_o` - Add `git_commit_create_ov` tag.h ----- - Remove `git_tag_new` - Remove `git_tag_set_target` - Remove `git_tag_set_name` - Remove `git_tag_set_tagger` - Remove `git_tag_set_message` - Add `git_tag_create` - Add `git_tag_create_o` tree.h ------ - Change `git_tree_entry_2object`: New signature is `(git_object **object_out, git_repository *repo, git_tree_entry *entry)` - Remove `git_tree_new` - Remove `git_tree_add_entry` - Remove `git_tree_remove_entry_byindex` - Remove `git_tree_remove_entry_byname` - Remove `git_tree_clearentries` - Remove `git_tree_entry_set_id` - Remove `git_tree_entry_set_name` - Remove `git_tree_entry_set_attributes` object.h ------------ - Remove `git_object_new - Remove `git_object_write` - Change `git_object_close`: This method is now *mandatory*. Not closing an object causes a memory leak. odb.h ----- - Remove type `git_rawobj` - Remove `git_rawobj_close` - Rename `git_rawobj_hash` -> `git_odb_hash` - Change `git_odb_hash`: New signature is `(git_oid *id, const void *data, size_t len, git_otype type)` - Add type `git_odb_object` - Add `git_odb_object_close` - Change `git_odb_read`: New signature is `(git_odb_object **out, git_odb *db, const git_oid *id)` - Change `git_odb_read_header`: New signature is `(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id)` - Remove `git_odb_write` - Add `git_odb_open_wstream` - Add `git_odb_open_rstream` odb_backend.h ------------- - Change type `git_odb_backend`: New internal signatures are as follows int (* read)(void **, size_t *, git_otype *, struct git_odb_backend *, const git_oid *) int (* read_header)(size_t *, git_otype *, struct git_odb_backend *, const git_oid *) int (* writestream)(struct git_odb_stream **, struct git_odb_backend *, size_t, git_otype) int (* readstream)( struct git_odb_stream **, struct git_odb_backend *, const git_oid *) - Add type `git_odb_stream` - Add enum `git_odb_streammode` Signed-off-by: Vicent Marti <tanoku@gmail.com>

Download

• src/object.c

• /*
   * This file is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License, version 2,
   * as published by the Free Software Foundation.
   *
   * In addition to the permissions in the GNU General Public License,
   * the authors give you unlimited permission to link the compiled
   * version of this file into combinations with other programs,
   * and to distribute those combinations without any restriction
   * coming from the use of this file.  (The General Public License
   * restrictions do apply in other respects; for example, they cover
   * modification of the file, and distribution when not linked into
   * a combined executable.)
   *
   * This file is distributed in the hope that it will be useful, but
   * WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
   * along with this program; see the file COPYING.  If not, write to
   * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
   * Boston, MA 02110-1301, USA.
   */
  #include <stdarg.h>
  
  #include "git2/object.h"
  
  #include "common.h"
  #include "repository.h"
  
  #include "commit.h"
  #include "tree.h"
  #include "blob.h"
  #include "tag.h"
  
  static const int OBJECT_BASE_SIZE = 4096;
  
  static struct {
  	const char	*str;   /* type name string */
  	int			loose;  /* valid loose object type flag */
  	size_t		size;	/* size in bytes of the object structure */
  } git_objects_table[] = {
  	/* 0 = GIT_OBJ__EXT1 */
  	{ "", 0, 0},
  
  	/* 1 = GIT_OBJ_COMMIT */
  	{ "commit", 1, sizeof(struct git_commit)},
  
  	/* 2 = GIT_OBJ_TREE */
  	{ "tree", 1, sizeof(struct git_tree) },
  
  	/* 3 = GIT_OBJ_BLOB */
  	{ "blob", 1, sizeof(struct git_blob) },
  
  	/* 4 = GIT_OBJ_TAG */
  	{ "tag", 1, sizeof(struct git_tag) },
  
  	/* 5 = GIT_OBJ__EXT2 */
  	{ "", 0, 0 },
  
  	/* 6 = GIT_OBJ_OFS_DELTA */
  	{ "OFS_DELTA", 0, 0 },
  
  	/* 7 = GIT_OBJ_REF_DELTA */
  	{ "REF_DELTA", 0, 0	}
  };
  
  static int create_object(git_object **object_out, git_otype type)
  {
  	git_object *object = NULL;
  
  	assert(object_out);
  
  	*object_out = NULL;
  
  	switch (type) {
  	case GIT_OBJ_COMMIT:
  	case GIT_OBJ_TAG:
  	case GIT_OBJ_BLOB:
  	case GIT_OBJ_TREE:
  		object = git__malloc(git_object__size(type));
  		if (object == NULL)
  			return GIT_ENOMEM;
  		memset(object, 0x0, git_object__size(type));
  		break;
  
  	default:
  		return GIT_EINVALIDTYPE;
  	}
  
  	object->type = type;
  
  	*object_out = object;
  	return GIT_SUCCESS;
  }
  
  int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_otype type)
  {
  	git_object *object = NULL;
  	git_odb_object *odb_obj;
  	int error = GIT_SUCCESS;
  
  	assert(repo && object_out && id);
  
  	object = git_cache_get(&repo->objects, id);
  	if (object != NULL) {
  		if (type != GIT_OBJ_ANY && type != object->type)
  			return GIT_EINVALIDTYPE;
  
  		*object_out = object;
  		return GIT_SUCCESS;
  	}
  
  	error = git_odb_read(&odb_obj, repo->db, id);
  	if (error < GIT_SUCCESS)
  		return error;
  
  	if (type != GIT_OBJ_ANY && type != odb_obj->raw.type) {
  		git_odb_object_close(odb_obj);
  		return GIT_EINVALIDTYPE;
  	}
  
  	type = odb_obj->raw.type;
  
  	if ((error = create_object(&object, type)) < GIT_SUCCESS)
  		return error;
  
  	/* Initialize parent object */
  	git_oid_cpy(&object->cached.oid, id);
  	object->repo = repo;
  
  	switch (type) {
  	case GIT_OBJ_COMMIT:
  		error = git_commit__parse((git_commit *)object, odb_obj);
  		break;
  
  	case GIT_OBJ_TREE:
  		error = git_tree__parse((git_tree *)object, odb_obj);
  		break;
  
  	case GIT_OBJ_TAG:
  		error = git_tag__parse((git_tag *)object, odb_obj);
  		break;
  
  	case GIT_OBJ_BLOB:
  		error = git_blob__parse((git_blob *)object, odb_obj);
  		break;
  
  	default:
  		break;
  	}
  
  	git_odb_object_close(odb_obj);
  
  	if (error < GIT_SUCCESS) {
  		git_object__free(object);
  		return error;
  	}
  
  	*object_out = git_cache_try_store(&repo->objects, object);
  	return GIT_SUCCESS;
  }
  
  void git_object__free(void *_obj)
  {
  	git_object *object = (git_object *)_obj;
  
  	assert(object);
  
  	switch (object->type) {
  	case GIT_OBJ_COMMIT:
  		git_commit__free((git_commit *)object);
  		break;
  
  	case GIT_OBJ_TREE:
  		git_tree__free((git_tree *)object);
  		break;
  
  	case GIT_OBJ_TAG:
  		git_tag__free((git_tag *)object);
  		break;
  
  	case GIT_OBJ_BLOB:
  		git_blob__free((git_blob *)object);
  		break;
  
  	default:
  		free(object);
  		break;
  	}
  }
  
  void git_object_close(git_object *object)
  {
  	if (object == NULL)
  		return;
  
  	git_cached_obj_decref((git_cached_obj *)object, git_object__free);
  }
  
  const git_oid *git_object_id(const git_object *obj)
  {
  	assert(obj);
  	return &obj->cached.oid;
  }
  
  git_otype git_object_type(const git_object *obj)
  {
  	assert(obj);
  	return obj->type;
  }
  
  git_repository *git_object_owner(const git_object *obj)
  {
  	assert(obj);
  	return obj->repo;
  }
  
  const char *git_object_type2string(git_otype type)
  {
  	if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
  		return "";
  
  	return git_objects_table[type].str;
  }
  
  git_otype git_object_string2type(const char *str)
  {
  	size_t i;
  
  	if (!str || !*str)
  		return GIT_OBJ_BAD;
  
  	for (i = 0; i < ARRAY_SIZE(git_objects_table); i++)
  		if (!strcmp(str, git_objects_table[i].str))
  			return (git_otype)i;
  
  	return GIT_OBJ_BAD;
  }
  
  int git_object_typeisloose(git_otype type)
  {
  	if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
  		return 0;
  
  	return git_objects_table[type].loose;
  }
  
  size_t git_object__size(git_otype type)
  {
  	if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
  		return 0;
  
  	return git_objects_table[type].size;
  }
  
  

Download