From owner-p4-projects@FreeBSD.ORG  Sat Dec 29 21:19:47 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6DD2616A469; Sat, 29 Dec 2007 21:19:47 +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 2169616A41B
	for <perforce@FreeBSD.org>; Sat, 29 Dec 2007 21:19:47 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F20A13C442
	for <perforce@FreeBSD.org>; Sat, 29 Dec 2007 21:19:47 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBTLJkqt037776
	for <perforce@FreeBSD.org>; Sat, 29 Dec 2007 21:19:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBTLJkfb037773
	for perforce@freebsd.org; Sat, 29 Dec 2007 21:19:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 29 Dec 2007 21:19:46 GMT
Message-Id: <200712292119.lBTLJkfb037773@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 131987 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: Sat, 29 Dec 2007 21:19:47 -0000

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

Change 131987 by gcooper@shiina-ibook on 2007/12/29 21:18:53

	- Convert follow_link flag from int to unsigned char to save memory.
	- Reorder structs for better memory alignment (I think at least, given my info of the structs involved..). 

Affected files ...

.. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#4 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#3 edit

Differences ...

==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#4 (text+ko) ====

@@ -49,7 +49,7 @@
  */
 struct pkgfile;
 
-struct pkgfile		*pkgfile_new_from_disk(const char *, int);
+struct pkgfile		*pkgfile_new_from_disk(const char *, unsigned char);
 struct pkgfile		*pkgfile_new_regular(const char *, const char *, uint64_t);
 struct pkgfile		*pkgfile_new_symlink(const char *, const char *);
 struct pkgfile		*pkgfile_new_hardlink(const char *, const char *);

==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#3 (text+ko) ====

@@ -51,20 +51,19 @@
 	pkgfile_dir /**< A directory */
 } pkgfile_type;
 
-/** @todo Reorder the struct to remove alignment gaps */
 struct pkgfile {
 	char		*name;
 	char		*cwd;
 	char		*real_name;
-	pkgfile_type	 type;
-	pkgfile_loc	 loc;
-	int		 follow_link;
-	FILE		*fd;
 	char		*data;
+	unsigned char	 follow_link;
+	char		 md5[33];
+	mode_t		 mode;
 	uint64_t	 length;
 	uint64_t	 offset;
-	mode_t		 mode;
-	char		 md5[33];
+	FILE		*fd;
+	pkgfile_type	 type;
+	pkgfile_loc	 loc;
 };
 
 /*
@@ -103,10 +102,11 @@
 	void		 *data;
 
 	char		 *manifest_version;
+	char		 *name;
+	char		 *attrs[pkgm_max];
+
 	struct pkgfile	 *file;
-	char		 *name;
 
-	char		 *attrs[pkgm_max];
 	STAILQ_HEAD(, pkgm_deps) deps;
 	STAILQ_HEAD(, pkgm_conflicts) conflicts;
 	STAILQ_HEAD(, pkgm_items) items;