From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v7 02/19] read-cache: allow to keep mmap'd memory after reading Date: Fri, 29 Apr 2016 21:01:56 -0400 Message-ID: <1461978133-13966-3-git-send-email-dturner@twopensource.com> References: <1461978133-13966-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 Sat Apr 30 03:02:36 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 1awJIp-0007qi-Fl for gcvg-git-2@plane.gmane.org; Sat, 30 Apr 2016 03:02:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbcD3BCa convert rfc822-to-quoted-printable (ORCPT ); Fri, 29 Apr 2016 21:02:30 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:34551 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbcD3BC0 (ORCPT ); Fri, 29 Apr 2016 21:02:26 -0400 Received: by mail-qk0-f171.google.com with SMTP id r184so53109175qkc.1 for ; Fri, 29 Apr 2016 18:02:26 -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=evzDk/9ShSVQ33p+CC+HpCJX8kuO7k9cPkw30B1Bbbgpzm9KyKHuLpUHlL5I2vGRlD R4yK72VzaDYUlc+MPEPYLL2155Ra2TH8xOQvQn6b3wLiF0kqlzkLwgGYcjXX7uu5sDic C+1K8KZgrGhCYfzBvhnGgpFAouh4NZ0HZuSDY9cVDbgbN1WLyShPhF2NorORrEsiNoI7 R1L+WTLeIMTpL3uo+xWf5cRUYR8y5rfm/EkCKlDWrPWFlp2zuCa5eB56go/LaRfoyAtV RsmoB2F7SkseuY44Od+7SX0HumUDZFNZKL/v0Jrbuk7bfKY91A2Q3D2o0qZWjzp6cW6w vhTg== 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=jH3YVHr3OSXbiHIssddcfls4K45sMcabYOy7t+EXtJw59YUveNsfvIKGq6/1BKkl10 jRGZ/UY1dYchwr1VFSkJvdqBY29LWYmOUacVlE6QEqwdOfnnoVSn+toHblmqV5wvpuDj PjEolyvsDOPSP/N8MyjL7lSbjDEHQkYN0OGEWgusMHrZYCFlCRkX57afSpNAkkcoQP5K zE7VB6ZprEZ6kRb25fRgFVt9Ek5MoizZJ0G2gDH8iSDMxZDkWd72A/ZYQ6GQAzhm/CzM Agm69QpXvgBjVf9tbJH6cCKzzE9MP7B3WncI4ke68NtNYMF0LeSIEZvAtw6e5sFDEJyz a8mg== X-Gm-Message-State: AOPr4FXa2qkNs/1VfFgZeQZt1bSYIHcF6M0ChQA2UQOAKwpv+A2h4OOlN1wHcXTUA5awUg== X-Received: by 10.55.134.6 with SMTP id i6mr23063210qkd.185.1461978145886; Fri, 29 Apr 2016 18:02:25 -0700 (PDT) Received: from ubuntu.twitter.biz ([192.133.79.145]) by smtp.gmail.com with ESMTPSA id g11sm5284485qhg.22.2016.04.29.18.02.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Apr 2016 18:02:24 -0700 (PDT) X-Mailer: git-send-email 2.4.2.767.g62658d5-twtrsrc In-Reply-To: <1461978133-13966-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