git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Herland <johan@herland.net>
To: gitster@pobox.com
Cc: git@vger.kernel.org, johan@herland.net,
	Johannes.Schindelin@gmx.de, trast@student.ethz.ch,
	tavestbo@trolltech.com, git@drmicha.warpmail.net,
	chriscool@tuxfamily.org, spearce@spearce.org
Subject: [PATCHv4 10/12] notes.c: Implement simple memory pooling of leaf nodes
Date: Thu, 27 Aug 2009 03:43:55 +0200	[thread overview]
Message-ID: <1251337437-16947-11-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1251337437-16947-1-git-send-email-johan@herland.net>

Allocate page-sized chunks for holding struct leaf_node objects.

This slightly (but consistently) improves runtime performance of notes
lookup, at a very slight increase (~2K on average) in memory usage.

When allocating a new memory pool, the older pool is leaked, but this is
no worse than the current situation, where (pretty much) all leaf_nodes
are leaked anyway.

Signed-off-by: Johan Herland <johan@herland.net>
---
 notes.c |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/notes.c b/notes.c
index a637056..5d1ee17 100644
--- a/notes.c
+++ b/notes.c
@@ -55,6 +55,23 @@ static int initialized;
 
 static struct int_node root_node;
 
+/* leaf nodes are allocated in simple memory pools */
+#define LEAF_NODE_POOL_SIZE 100
+static struct leaf_node *leaf_node_pool;
+static unsigned int leaf_node_pool_used;
+
+
+static struct leaf_node *new_leaf_node()
+{
+	if (!leaf_node_pool || leaf_node_pool_used >= LEAF_NODE_POOL_SIZE) {
+		/* MEMORY LEAK: */
+		leaf_node_pool = (struct leaf_node *)
+			xcalloc(sizeof(struct leaf_node), LEAF_NODE_POOL_SIZE);
+		leaf_node_pool_used = 0;
+	}
+	return leaf_node_pool + leaf_node_pool_used++;
+}
+
 static void load_subtree(struct leaf_node *subtree, struct int_node *node,
 		unsigned int n);
 
@@ -95,7 +112,6 @@ static struct leaf_node *note_tree_find(struct int_node *tree, unsigned char n,
 			/* unpack tree and resume search */
 			tree->a[i] = NULL;
 			load_subtree(l, tree, n);
-			free(l);
 			return note_tree_find(tree, n, key_sha1);
 		}
 		break;
@@ -118,7 +134,6 @@ static struct leaf_node *note_tree_find(struct int_node *tree, unsigned char n,
 		/* unpack tree and resume search */
 		tree->a[0] = NULL;
 		load_subtree(l, tree, n);
-		free(l);
 		return note_tree_find(tree, n, key_sha1);
 	}
 	return NULL;
@@ -229,8 +244,7 @@ static void load_subtree(struct leaf_node *subtree, struct int_node *node,
 		 */
 		if (len <= 20) {
 			unsigned char type = PTR_TYPE_NOTE;
-			struct leaf_node *l = (struct leaf_node *)
-				xcalloc(sizeof(struct leaf_node), 1);
+			struct leaf_node *l = new_leaf_node();
 			hashcpy(l->key_sha1, commit_sha1);
 			hashcpy(l->val_sha1, entry.sha1);
 			if (len < 20) {
-- 
1.6.4.304.g1365c.dirty

  parent reply	other threads:[~2009-08-27  1:44 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-27  1:43 [PATCHv4 00/12] git notes Johan Herland
2009-08-27  1:43 ` [PATCHv4 01/12] Introduce commit notes Johan Herland
2009-08-27  1:43 ` [PATCHv4 02/12] Add a script to edit/inspect notes Johan Herland
2009-08-27  1:43 ` [PATCHv4 03/12] Speed up git notes lookup Johan Herland
2009-08-27  1:43 ` [PATCHv4 04/12] Add an expensive test for git-notes Johan Herland
2009-08-27  1:43 ` [PATCHv4 05/12] Teach "-m <msg>" and "-F <file>" to "git notes edit" Johan Herland
2009-08-27  1:43 ` [PATCHv4 06/12] fast-import: Add support for importing commit notes Johan Herland
2009-08-27  1:43 ` [PATCHv4 07/12] t3302-notes-index-expensive: Speed up create_repo() Johan Herland
2009-08-27  1:43 ` [PATCHv4 08/12] Teach the notes lookup code to parse notes trees with various fanout schemes Johan Herland
2009-08-27  5:00   ` Junio C Hamano
2009-08-27  9:35     ` Johan Herland
2009-08-27 10:47       ` Johannes Schindelin
2009-08-27 20:58         ` Junio C Hamano
2009-08-28  8:48           ` Johannes Schindelin
2009-08-27 20:55       ` Junio C Hamano
2009-08-27 21:27         ` Shawn O. Pearce
2009-08-27 21:50           ` Junio C Hamano
2009-08-27 23:03             ` Johan Herland
2009-08-27 23:39               ` Jeff King
2009-08-28  0:30                 ` Junio C Hamano
2009-08-28  0:40                   ` Sverre Rabbelier
2009-08-28  1:43                     ` Junio C Hamano
2009-08-28  2:51                       ` Sverre Rabbelier
2009-08-28  3:02                         ` Junio C Hamano
2009-08-28  3:05                           ` Sverre Rabbelier
2009-08-28  3:35                             ` Junio C Hamano
2009-08-28  8:51               ` Johannes Schindelin
2009-08-28 10:40                 ` Johan Herland
2009-08-28 11:56                   ` Johannes Schindelin
2009-08-28 14:15                     ` Johan Herland
2009-08-27 10:42     ` Johannes Schindelin
2009-08-27  1:43 ` [PATCHv4 09/12] Selftests verifying semantics when loading notes trees with various fanouts Johan Herland
2009-08-27  1:43 ` Johan Herland [this message]
2009-08-27  7:39   ` [PATCHv4 10/12] notes.c: Implement simple memory pooling of leaf nodes Alex Riesen
2009-08-27  9:49     ` Johan Herland
2009-08-27 22:43       ` Johan Herland
2009-08-27  1:43 ` [PATCHv4 11/12] Add flags to get_commit_notes() to control the format of the note string Johan Herland
2009-08-27  1:43 ` [PATCHv4 12/12] Add '%N'-format for pretty-printing commit notes Johan Herland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1251337437-16947-11-git-send-email-johan@herland.net \
    --to=johan@herland.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=chriscool@tuxfamily.org \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=spearce@spearce.org \
    --cc=tavestbo@trolltech.com \
    --cc=trast@student.ethz.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).