From owner-p4-projects@FreeBSD.ORG  Thu Aug 28 22:34:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92A271065675; Thu, 28 Aug 2008 22:34:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5674C1065671
	for <perforce@freebsd.org>; Thu, 28 Aug 2008 22:34:43 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E4D08FC14
	for <perforce@freebsd.org>; Thu, 28 Aug 2008 22:34:43 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SMYhF2098416
	for <perforce@freebsd.org>; Thu, 28 Aug 2008 22:34:43 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SMYh8C098414
	for perforce@freebsd.org; Thu, 28 Aug 2008 22:34:43 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 28 Aug 2008 22:34:43 GMT
Message-Id: <200808282234.m7SMYh8C098414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148753 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Aug 2008 22:34:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=148753

Change 148753 by gabor@gabor_server on 2008/08/28 22:34:22

	- Drop unnecessary function
	- style(9) and better readable code
	- Add a comment about performance

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/queue.c#6 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#6 (text+ko) ====

@@ -26,7 +26,7 @@
 
 /*
  * A really poor man's queue.  It does only what it has to and gets out of
- * Dodge.
+ * Dodge.  It is used in place of <sys/queue.h> to get a better performance.
  */
 
 #include <sys/cdefs.h>
@@ -62,23 +62,16 @@
 	q_head = q_tail = NULL;
 }
 
-static void
-free_item(struct queue *item)
-{
-
-	free(item);
-}
-
 void
 enqueue(struct str *x)
 {
 	struct queue	*item;
 
-	item = grep_malloc(sizeof *item + x->len);
+	item = grep_malloc(sizeof(struct queue));
+	item->data.dat = grep_malloc(sizeof(char) * x->len);
 	item->data.len = x->len;
 	item->data.line_no = x->line_no;
 	item->data.off = x->off;
-	item->data.dat = (char *)item + sizeof *item;
 	memcpy(item->data.dat, x->dat, x->len);
 	item->data.file = x->file;
 	item->next = NULL;
@@ -91,7 +84,7 @@
 	}
 
 	if (++count > Bflag)
-		free_item(dequeue());
+		free(dequeue());
 }
 
 static struct queue *
@@ -117,7 +110,7 @@
 
 	while ((item = dequeue()) != NULL) {
 		printline(&item->data, '-', (regmatch_t *)NULL, 0);
-		free_item(item);
+		free(item);
 	}
 }
 
@@ -127,5 +120,5 @@
 	struct queue	*item;
 
 	while ((item = dequeue()) != NULL)
-		free_item(item);
+		free(item);
 }