From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 1/9] Extend index to save more flags Date: Wed, 1 Oct 2008 11:04:01 +0700 Message-ID: <1222833849-22129-2-git-send-email-pclouds@gmail.com> References: <1222833849-22129-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?utf-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org, "Shawn O. Pearce" X-From: git-owner@vger.kernel.org Wed Oct 01 06:06:20 2008 connect(): Connection refused Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kksyh-0001Eq-3C for gcvg-git-2@gmane.org; Wed, 01 Oct 2008 06:06:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750785AbYJAEFM convert rfc822-to-quoted-printable (ORCPT ); Wed, 1 Oct 2008 00:05:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750815AbYJAEFM (ORCPT ); Wed, 1 Oct 2008 00:05:12 -0400 Received: from rv-out-0506.google.com ([209.85.198.229]:63785 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755AbYJAEFK (ORCPT ); Wed, 1 Oct 2008 00:05:10 -0400 Received: by rv-out-0506.google.com with SMTP id k40so384855rvb.1 for ; Tue, 30 Sep 2008 21:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=WfDdtyCIK906RMTFVFHq9U6tG9itAL8YFsKuX2gHdd0=; b=VgIIdshrWdAD8DJ0m8Vn79efiRWrvKmSMtStYHZYfg943t/4KkaSwEd1D+QND30BF/ JkP828X7t3XvjfvgDeyPVZknxrVCRZ6Q4ADWYyx81nWvxzty9apjuBvcMOKJSpjYQ4QY E/w0yw9f77u8PzJLBNiz3VHCKwtet7aVjUONQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=ZGt57fdzoq+vTCEwRPgkH+zZ0eUr1gORu24uPMkfitzhabZL2JDhUEvipFQ6v5vCbU 1Td9V1tvmNcZxzeVA1CrLFR+wRP+BiQ0CsStzzDF2tOG2jHaBhJoBUc1k2pGNzWnYEBq JizSjAW99DF8xWUlAxsmfCSLziO0Og+cv/p2I= Received: by 10.141.142.15 with SMTP id u15mr4030969rvn.171.1222833910403; Tue, 30 Sep 2008 21:05:10 -0700 (PDT) Received: from pclouds@gmail.com ([117.5.46.240]) by mx.google.com with ESMTPS id f21sm3977288rvb.5.2008.09.30.21.05.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 30 Sep 2008 21:05:07 -0700 (PDT) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Wed, 1 Oct 2008 11:05:01 +0700 X-Mailer: git-send-email 1.6.0.2.488.gf604a In-Reply-To: <1222833849-22129-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The on-disk format of index only saves 16 bit flags, nearly all have been used. The last bit (CE_EXTENDED) is used to for future extension. This patch extends index entry format to save more flags in future. The new entry format will be used when CE_EXTENDED bit is 1. Because older implementation may not understand CE_EXTENDED bit and misread the new format, if there is any extended entry in index, index header version will turn 3, which makes it incompatible for older git. If there is none, header version will return to 2 again. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- cache.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++++---- read-cache.c | 51 +++++++++++++++++++++++++++++++++++++++++---------= - 2 files changed, 95 insertions(+), 14 deletions(-) diff --git a/cache.h b/cache.h index f4b8ddf..5180879 100644 --- a/cache.h +++ b/cache.h @@ -109,6 +109,26 @@ struct ondisk_cache_entry { char name[FLEX_ARRAY]; /* more */ }; =20 +/* + * This struct is used when CE_EXTENDED bit is 1 + * The struct must match ondisk_cache_entry exactly from + * ctime till flags + */ +struct ondisk_cache_entry_extended { + struct cache_time ctime; + struct cache_time mtime; + unsigned int dev; + unsigned int ino; + unsigned int mode; + unsigned int uid; + unsigned int gid; + unsigned int size; + unsigned char sha1[20]; + unsigned short flags; + unsigned short flags2; + char name[FLEX_ARRAY]; /* more */ +}; + struct cache_entry { unsigned int ce_ctime; unsigned int ce_mtime; @@ -130,7 +150,15 @@ struct cache_entry { #define CE_VALID (0x8000) #define CE_STAGESHIFT 12 =20 -/* In-memory only */ +/* + * Range 0xFFFF0000 in ce_flags is divided into + * two parts: in-memory flags and on-disk ones. + * Flags in CE_EXTENDED_FLAGS will get saved on-disk + * if you want to save a new flag, add it in + * CE_EXTENDED_FLAGS + * + * In-memory only flags + */ #define CE_UPDATE (0x10000) #define CE_REMOVE (0x20000) #define CE_UPTODATE (0x40000) @@ -140,6 +168,24 @@ struct cache_entry { #define CE_UNHASHED (0x200000) =20 /* + * Extended on-disk flags + */ +/* CE_EXTENDED2 is for future extension */ +#define CE_EXTENDED2 0x80000000 + +#define CE_EXTENDED_FLAGS (0) + +/* + * Safeguard to avoid saving wrong flags: + * - CE_EXTENDED2 won't get saved until its semantic is known + * - Bits in 0x0000FFFF have been saved in ce_flags already + * - Bits in 0x003F0000 are currently in-memory flags + */ +#if CE_EXTENDED_FLAGS & 0x803FFFFF +#error "CE_EXTENDED_FLAGS out of range" +#endif + +/* * Copy the sha1 and stat state of a cache entry from one to * another. But we never change the name, or the hash state! */ @@ -171,7 +217,9 @@ static inline size_t ce_namelen(const struct cache_= entry *ce) } =20 #define ce_size(ce) cache_entry_size(ce_namelen(ce)) -#define ondisk_ce_size(ce) ondisk_cache_entry_size(ce_namelen(ce)) +#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \ + ondisk_cache_entry_extended_size(ce_namelen(ce)) : \ + ondisk_cache_entry_size(ce_namelen(ce))) #define ce_stage(ce) ((CE_STAGEMASK & (ce)->ce_flags) >> CE_STAGESHIFT= ) #define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE) #define ce_mark_uptodate(ce) ((ce)->ce_flags |=3D CE_UPTODATE) @@ -214,8 +262,10 @@ static inline int ce_to_dtype(const struct cache_e= ntry *ce) (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \ S_ISLNK(mode) ? S_IFLNK : S_ISDIR(mode) ? S_IFDIR : S_IFGITLINK) =20 -#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (l= en) + 8) & ~7) -#define ondisk_cache_entry_size(len) ((offsetof(struct ondisk_cache_en= try,name) + (len) + 8) & ~7) +#define flexible_size(STRUCT,len) ((offsetof(struct STRUCT,name) + (le= n) + 8) & ~7) +#define cache_entry_size(len) flexible_size(cache_entry,len) +#define ondisk_cache_entry_size(len) flexible_size(ondisk_cache_entry,= len) +#define ondisk_cache_entry_extended_size(len) flexible_size(ondisk_cac= he_entry_extended,len) =20 struct index_state { struct cache_entry **cache; diff --git a/read-cache.c b/read-cache.c index c5a8659..667c36b 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1096,7 +1096,7 @@ static int verify_hdr(struct cache_header *hdr, u= nsigned long size) =20 if (hdr->hdr_signature !=3D htonl(CACHE_SIGNATURE)) return error("bad signature"); - if (hdr->hdr_version !=3D htonl(2)) + if (hdr->hdr_version !=3D htonl(2) && hdr->hdr_version !=3D htonl(3)) return error("bad index version"); SHA1_Init(&c); SHA1_Update(&c, hdr, size - 20); @@ -1131,6 +1131,7 @@ int read_index(struct index_state *istate) static void convert_from_disk(struct ondisk_cache_entry *ondisk, struc= t cache_entry *ce) { size_t len; + const char *name; =20 ce->ce_ctime =3D ntohl(ondisk->ctime.sec); ce->ce_mtime =3D ntohl(ondisk->mtime.sec); @@ -1143,19 +1144,31 @@ static void convert_from_disk(struct ondisk_cac= he_entry *ondisk, struct cache_en /* On-disk flags are just 16 bits */ ce->ce_flags =3D ntohs(ondisk->flags); =20 - /* For future extension: we do not understand this entry yet */ - if (ce->ce_flags & CE_EXTENDED) - die("Unknown index entry format"); hashcpy(ce->sha1, ondisk->sha1); =20 len =3D ce->ce_flags & CE_NAMEMASK; + + if (ce->ce_flags & CE_EXTENDED) { + struct ondisk_cache_entry_extended *ondisk2; + int extended_flags; + ondisk2 =3D (struct ondisk_cache_entry_extended *)ondisk; + extended_flags =3D ntohs(ondisk2->flags2) << 16; + /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */ + if (extended_flags & ~CE_EXTENDED_FLAGS) + die("Unknown index entry format %08x", extended_flags); + ce->ce_flags |=3D extended_flags; + name =3D ondisk2->name; + } + else + name =3D ondisk->name; + if (len =3D=3D CE_NAMEMASK) - len =3D strlen(ondisk->name); + len =3D strlen(name); /* * NEEDSWORK: If the original index is crafted, this copy could * go unchecked. */ - memcpy(ce->name, ondisk->name, len + 1); + memcpy(ce->name, name, len + 1); } =20 static inline size_t estimate_cache_size(size_t ondisk_size, unsigned = int entries) @@ -1415,6 +1428,7 @@ static int ce_write_entry(SHA_CTX *c, int fd, str= uct cache_entry *ce) { int size =3D ondisk_ce_size(ce); struct ondisk_cache_entry *ondisk =3D xcalloc(1, size); + char *name; =20 ondisk->ctime.sec =3D htonl(ce->ce_ctime); ondisk->ctime.nsec =3D 0; @@ -1428,7 +1442,15 @@ static int ce_write_entry(SHA_CTX *c, int fd, st= ruct cache_entry *ce) ondisk->size =3D htonl(ce->ce_size); hashcpy(ondisk->sha1, ce->sha1); ondisk->flags =3D htons(ce->ce_flags); - memcpy(ondisk->name, ce->name, ce_namelen(ce)); + if (ce->ce_flags & CE_EXTENDED) { + struct ondisk_cache_entry_extended *ondisk2; + ondisk2 =3D (struct ondisk_cache_entry_extended *)ondisk; + ondisk2->flags2 =3D htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16); + name =3D ondisk2->name; + } + else + name =3D ondisk->name; + memcpy(name, ce->name, ce_namelen(ce)); =20 return ce_write(c, fd, ondisk, size); } @@ -1437,16 +1459,25 @@ int write_index(const struct index_state *istat= e, int newfd) { SHA_CTX c; struct cache_header hdr; - int i, err, removed; + int i, err, removed, extended; struct cache_entry **cache =3D istate->cache; int entries =3D istate->cache_nr; =20 - for (i =3D removed =3D 0; i < entries; i++) + for (i =3D removed =3D extended =3D 0; i < entries; i++) { if (cache[i]->ce_flags & CE_REMOVE) removed++; =20 + /* reduce extended entries if possible */ + cache[i]->ce_flags &=3D ~CE_EXTENDED; + if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) { + extended++; + cache[i]->ce_flags |=3D CE_EXTENDED; + } + } + hdr.hdr_signature =3D htonl(CACHE_SIGNATURE); - hdr.hdr_version =3D htonl(2); + /* for extended format, increase version so older git won't try to re= ad it */ + hdr.hdr_version =3D htonl(extended ? 3 : 2); hdr.hdr_entries =3D htonl(entries - removed); =20 SHA1_Init(&c); --=20 1.6.0.2.488.gf604a