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>

1 files changed, 16 insertions, 30 deletions

diff --git a/src/cache.c b/src/cache.c
index 5a9b8415c..fdf5c1b80 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -32,23 +32,6 @@
 #define GIT_CACHE_OPENADR 3
 
 
-GIT_INLINE(int) cached_obj_compare(git_cached_obj *obj, const git_oid *oid)
-{
-	return git_oid_cmp(&obj->oid, oid);
-}
-
-GIT_INLINE(void) cached_obj_incref(git_cached_obj *obj)
-{
-	git_atomic_inc(&obj->refcount);
-}
-
-GIT_INLINE(void) cached_obj_decref(git_cached_obj *obj, git_cached_obj_freeptr free_obj)
-{
-	if (git_atomic_dec(&obj->refcount) == 0)
-		free_obj(obj);
-}
-
-
 void git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr)
 {
 	size_t i;
@@ -82,7 +65,9 @@ void git_cache_free(git_cache *cache)
 	size_t i;
 
 	for (i = 0; i < (cache->size_mask + 1); ++i) {
-		cached_obj_decref(cache->nodes[i].ptr, cache->free_obj);
+		if (cache->nodes[i].ptr)
+			git_cached_obj_decref(cache->nodes[i].ptr, cache->free_obj);
+
 		git_mutex_free(&cache->nodes[i].lock);
 	}
 
@@ -103,8 +88,8 @@ void *git_cache_get(git_cache *cache, const git_oid *oid)
 
 		git_mutex_lock(&node->lock);
 		{
-			if (cached_obj_compare(node->ptr, oid) == 0) {
-				cached_obj_incref(node->ptr);
+			if (node->ptr && git_cached_obj_compare(node->ptr, oid) == 0) {
+				git_cached_obj_incref(node->ptr);
 				node->lru = ++cache->lru_count;
 				found = 1;
 			}
@@ -121,14 +106,14 @@ void *git_cache_try_store(git_cache *cache, void *entry)
 	cache_node *nodes[GIT_CACHE_OPENADR], *lru_node;
 	const uint32_t *hash;
 	const git_oid *oid;
-	size_t i, stored = 0;
+	size_t i;
 
 	oid = &((git_cached_obj*)entry)->oid;
 	hash = (const uint32_t *)oid->id;
 
 	/* increase the refcount on this object, because
 	 * the cache now owns it */
-	cached_obj_incref(entry);
+	git_cached_obj_incref(entry);
 
 	for (i = 0; i < GIT_CACHE_OPENADR; ++i) {
 		size_t pos = hash[i] & cache->size_mask;
@@ -139,34 +124,35 @@ void *git_cache_try_store(git_cache *cache, void *entry)
 
 	lru_node = nodes[0];
 
-	for (i = 0; !stored && entry && i < GIT_CACHE_OPENADR; ++i) {
+	for (i = 0; i < GIT_CACHE_OPENADR; ++i) {
 
 		if (nodes[i]->ptr == NULL) {
 			nodes[i]->ptr = entry;
 			nodes[i]->lru = ++cache->lru_count;
-			stored = 1;
-		} else if (cached_obj_compare(nodes[i]->ptr, oid) == 0) {
-			cached_obj_decref(entry, cache->free_obj);
+			break;
+		} else if (git_cached_obj_compare(nodes[i]->ptr, oid) == 0) {
+			git_cached_obj_decref(entry, cache->free_obj);
 			entry = nodes[i]->ptr;
-			stored = 1;
+			nodes[i]->lru = ++cache->lru_count;
+			break;
 		}
 
 		if (nodes[i]->lru < lru_node->lru)
 			lru_node = nodes[i];
 	}
 
-	if (!stored) {
+	if (i == GIT_CACHE_OPENADR) {
 		void *old_entry = lru_node->ptr;
 		assert(old_entry);
 
-		cached_obj_decref(old_entry, cache->free_obj);
+		git_cached_obj_decref(old_entry, cache->free_obj);
 		lru_node->ptr = entry;
 		lru_node->lru = ++cache->lru_count;
 	}
 
 	/* increase the refcount again, because we are
 	 * returning it to the user */
-	cached_obj_incref(entry);
+	git_cached_obj_incref(entry);
 
 	for (i = 0; i < GIT_CACHE_OPENADR; ++i)
 		git_mutex_unlock(&nodes[i]->lock);