From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v9 02/19] read-cache: allow to keep mmap'd memory after reading Date: Mon, 9 May 2016 16:48:32 -0400 Message-ID: <1462826929-7567-3-git-send-email-dturner@twopensource.com> References: <1462826929-7567-1-git-send-email-dturner@twopensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: David Turner To: git@vger.kernel.org, pclouds@gmail.com X-From: git-owner@vger.kernel.org Mon May 09 22:51:35 2016 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 1azs7G-0003yU-Bq for gcvg-git-2@plane.gmane.org; Mon, 09 May 2016 22:49:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752341AbcEIUtM convert rfc822-to-quoted-printable (ORCPT ); Mon, 9 May 2016 16:49:12 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:36039 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752139AbcEIUtG (ORCPT ); Mon, 9 May 2016 16:49:06 -0400 Received: by mail-qk0-f173.google.com with SMTP id x7so101933412qkd.3 for ; Mon, 09 May 2016 13:49:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=twopensource-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qWsQqUT0TEbkQssEa8cmGJohJfXp0Da97rhFbruFwGg=; b=nv1OYrJPWvBysC3MAAmBtmjvpLJVQ52k38aVdNzvWrNmx4csFax/DPOrldcY4kpRPv pfPFpOxPz6xMBPW3mOCRKblcr6lKHc+0NVpIhMDttDg/GDdl0TKrCxOxqDOUUQuZ6jyn NcB14/wjZ0rHkLEK8ktO/MNobhW5u7jTNs10Y1pFEoRrnJ+lKKFHIioN3xEOyRduJ126 3XhcvCQpmwmr+4jmr3tAfn/avdh2tBhl6YaRcjxQGUjNePLGJsWnFV4oRkyySgvp6Uqi OIqIxC1gE/jvAMoVO7I2rv9wFAI8q3n2TVZ3Y60N7elrN+9IriurH7qp5JWK8b2VJBD1 8wSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qWsQqUT0TEbkQssEa8cmGJohJfXp0Da97rhFbruFwGg=; b=LobM/ZuD9YYbB/ZSwMTQKTRtveUU4pYc3a5y6MUo0xdARA9Dr/6MFg+nWKBGCQPyR8 hLRv0YGeSrxEcncBIKqnVrukrnUxt1alZ0s/ZOzuMWaDS6PDSRkOYPrEJjs4PQLTI23n S6eG2+SqqJH81Bt46lEEHhlTEyg61nJgOK22NXB3wZRAwUgB9vMQ7c2fCTI42v8ubITo S5u3xWPOdHexkZXuk93XKK12uZyvMUaqcVqcUkdJjM032FsAzoAeuSqKG3Tc7pcirKJq PrltC+3HMilXZcIIyL3K8aq8fXDn6TVlXD8s1MW0CrwWBf1FFuWudEfB6C3WXR2vjL6Y NN0A== X-Gm-Message-State: AOPr4FUOGZuF5TimxgaszLhpDHMJqHILI67jKU5UQfedhS+EF5kFN4HARd3K0CQJbGxk2g== X-Received: by 10.55.121.135 with SMTP id u129mr40324104qkc.138.1462826945724; Mon, 09 May 2016 13:49:05 -0700 (PDT) Received: from ubuntu.twitter.biz ([192.133.79.145]) by smtp.gmail.com with ESMTPSA id n1sm12729182qkn.3.2016.05.09.13.49.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2016 13:49:04 -0700 (PDT) X-Mailer: git-send-email 2.4.2.767.g62658d5-twtrsrc In-Reply-To: <1462826929-7567-1-git-send-email-dturner@twopensource.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Later, we will introduce git index-helper to share this memory with other git processes. We only unmap it when we discard the index (although the kernel may of course choose to page it out). Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: David Turner --- cache.h | 3 +++ read-cache.c | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index b829410..4180e2b 100644 --- a/cache.h +++ b/cache.h @@ -333,11 +333,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 16cc487..3cb0ec3 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1574,6 +1574,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; @@ -1626,11 +1630,13 @@ 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: munmap(mmap, mmap_size); + istate->mmap =3D NULL; die("index file corrupt"); } =20 @@ -1655,6 +1661,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); @@ -1698,6 +1705,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.4.2.767.g62658d5-twtrsrc