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 v4 3/9] read-cache: allow to keep mmap'd memory after reading Date: Sun, 1 Nov 2015 14:42:43 +0100 Message-ID: <1446385369-8669-4-git-send-email-pclouds@gmail.com> References: <1446385369-8669-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Christian Couder , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Nov 01 14:43:44 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Zssv8-0008Lt-Ja for gcvg-git-2@plane.gmane.org; Sun, 01 Nov 2015 14:43:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbbKANng convert rfc822-to-quoted-printable (ORCPT ); Sun, 1 Nov 2015 08:43:36 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:34365 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbbKANnc (ORCPT ); Sun, 1 Nov 2015 08:43:32 -0500 Received: by wikq8 with SMTP id q8so36504251wik.1 for ; Sun, 01 Nov 2015 05:43:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Rbn2zMRB3SEg0ZSbQKJblxAixigKHlzt8NH4Umw0XVw=; b=uhRkz4qQCsZ78MogbAD1oDrojq/Aa+YAZd0BSffcgssIWJlpeUT/qBFn0ze8VM86Ql eYrWsJTWFWgLNS7NB4NJw5rSDDXTkzxYZ9RKXp4EXsiNSUsPuByFEEXCFIn82YX5ipgA fGzw60mKVrjXuqTd9BoYtCuTn8uqaC50UieNMmUhsJVE3lIhcpuUEx8HOXJiOF2eIoHO j0KPkMLkD8MO6nXMR8ehnI0LllHFd5Nmw61mVowcqU11PSnEcs6o6itbc/ESLK7g9BwP WpPo2keJGzNUJFz2rOp0ahOCNrThA4W7Vh/4wN7rmYnYvd9D1c4dP/4hdSVbxkZ0lEnv qpXA== X-Received: by 10.194.24.70 with SMTP id s6mr13127507wjf.101.1446385411597; Sun, 01 Nov 2015 05:43:31 -0800 (PST) Received: from duynguyen-vnpc.dek-tpc.homenet.telecomitalia.it (host171-164-static.60-79-b.business.telecomitalia.it. [79.60.164.171]) by smtp.gmail.com with ESMTPSA id gd10sm17058028wjb.47.2015.11.01.05.43.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Nov 2015 05:43:30 -0800 (PST) X-Mailer: git-send-email 2.2.0.513.g477eb31 In-Reply-To: <1446385369-8669-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: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- cache.h | 3 +++ read-cache.c | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 8791dbc..89e9aaf 100644 --- a/cache.h +++ b/cache.h @@ -311,11 +311,14 @@ struct index_state { struct split_index *split_index; struct cache_time timestamp; unsigned name_hash_initialized : 1, + keep_mmap : 1, initialized : 1; struct hashmap name_hash; struct hashmap dir_hash; unsigned char sha1[20]; struct untracked_cache *untracked; + void *mmap; + size_t mmap_size; }; =20 extern struct index_state the_index; diff --git a/read-cache.c b/read-cache.c index a76c789..7d04108 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1552,6 +1552,10 @@ int do_read_index(struct index_state *istate, co= nst char *path, int must_exist) mmap =3D xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0); if (mmap =3D=3D MAP_FAILED) die_errno("unable to map index file"); + if (istate->keep_mmap) { + istate->mmap =3D mmap; + istate->mmap_size =3D mmap_size; + } close(fd); =20 hdr =3D mmap; @@ -1604,10 +1608,12 @@ int do_read_index(struct index_state *istate, c= onst char *path, int must_exist) src_offset +=3D 8; src_offset +=3D extsize; } - munmap(mmap, mmap_size); + if (!istate->keep_mmap) + munmap(mmap, mmap_size); return istate->cache_nr; =20 unmap: + istate->mmap =3D NULL; munmap(mmap, mmap_size); die("index file corrupt"); } @@ -1632,6 +1638,7 @@ int read_index_from(struct index_state *istate, c= onst char *path) discard_index(split_index->base); else split_index->base =3D xcalloc(1, sizeof(*split_index->base)); + split_index->base->keep_mmap =3D istate->keep_mmap; ret =3D do_read_index(split_index->base, git_path("sharedindex.%s", sha1_to_hex(split_index->base_sha1)), 1); @@ -1675,6 +1682,10 @@ int discard_index(struct index_state *istate) free(istate->cache); istate->cache =3D NULL; istate->cache_alloc =3D 0; + if (istate->keep_mmap && istate->mmap) { + munmap(istate->mmap, istate->mmap_size); + istate->mmap =3D NULL; + } discard_split_index(istate); free_untracked_cache(istate->untracked); istate->untracked =3D NULL; --=20 2.2.0.513.g477eb31