From: Stefan Beller <sbeller@google.com>
To: David Turner <dturner@twopensource.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
"Duy Nguyen" <pclouds@gmail.co>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff
Date: Fri, 15 Apr 2016 17:04:11 -0700 [thread overview]
Message-ID: <CAGZ79kYV6dHzuT51Pg9Oc6yBf_f9407JTe2kRpPyNxgXyfha4g@mail.gmail.com> (raw)
In-Reply-To: <1460507589-25525-4-git-send-email-dturner@twopensource.com>
> +static int try_shm(struct index_state *istate)
> +{
> + void *new_mmap = NULL;
> + size_t old_size = istate->mmap_size;
> + ssize_t new_size;
> + const unsigned char *sha1;
> + struct stat st;
> + int fd;
> +
> + if (!is_main_index(istate) ||
> + old_size <= 20 ||
> + stat(git_path("index-helper.path"), &st))
> + return -1;
> + if (poke_daemon(istate, &st, 0))
> + return -1;
> + sha1 = (unsigned char *)istate->mmap + old_size - 20;
> +
> + fd = open(index_helper_path("git-index-%s", sha1_to_hex(sha1)),
> + O_RDONLY);
> + if (fd < 0)
> + goto fail;
> +
> + if (fstat(fd, &st))
> + goto fail;
> +
> + new_size = st.st_size;
> + new_mmap = mmap(NULL, new_size, PROT_READ, MAP_SHARED, fd, 0);
> + if (new_size <= 20 ||
> + hashcmp((unsigned char *)istate->mmap + old_size - 20,
> + (unsigned char *)new_mmap + new_size - 20)) {
> + if (new_mmap)
> + munmap(new_mmap, new_size);
> + goto fail;
coming from here
> + }
> +
> + /* The memory barrier here matches index-helper.c:share_index. */
> + __sync_synchronize();
> +
> + munmap(istate->mmap, istate->mmap_size);
> + istate->mmap = new_mmap;
> + istate->mmap_size = new_size;
> + istate->from_shm = 1;
> + return 0;
> +
> +fail:
fd may be leaking here?
> + poke_daemon(istate, &st, 1);
> + return -1;
> +}
> +
next prev parent reply other threads:[~2016-04-16 0:04 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 0:32 [PATCH v4 00/16] index-helper, watchman David Turner
2016-04-13 0:32 ` [PATCH v4 01/16] read-cache.c: fix constness of verify_hdr() David Turner
2016-04-13 0:32 ` [PATCH v4 02/16] read-cache: allow to keep mmap'd memory after reading David Turner
2016-04-13 0:32 ` [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff David Turner
2016-04-13 13:43 ` Duy Nguyen
2016-04-13 18:47 ` David Turner
2016-04-14 10:04 ` Duy Nguyen
2016-04-15 20:19 ` David Turner
2016-04-15 11:25 ` Duy Nguyen
2016-04-15 20:21 ` David Turner
2016-04-16 0:22 ` Duy Nguyen
2016-04-13 17:00 ` Ramsay Jones
2016-04-13 17:10 ` David Turner
2016-04-14 16:56 ` Junio C Hamano
2016-04-14 17:02 ` David Turner
2016-04-15 0:07 ` Duy Nguyen
2016-04-16 0:04 ` Stefan Beller [this message]
2016-04-19 22:00 ` David Turner
2016-04-19 22:00 ` David Turner
2016-04-13 0:32 ` [PATCH v4 04/16] index-helper: add --strict David Turner
2016-04-13 0:32 ` [PATCH v4 05/16] daemonize(): set a flag before exiting the main process David Turner
2016-04-13 0:32 ` [PATCH v4 06/16] index-helper: add --detach David Turner
2016-04-13 0:33 ` [PATCH v4 07/16] read-cache: add watchman 'WAMA' extension David Turner
2016-04-13 0:33 ` [PATCH v4 08/16] Add watchman support to reduce index refresh cost David Turner
2016-04-17 5:36 ` Duy Nguyen
2016-04-13 0:33 ` [PATCH v4 09/16] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-04-16 0:07 ` Stefan Beller
2016-04-19 18:54 ` David Turner
2016-04-13 0:33 ` [PATCH v4 10/16] update-index: enable/disable watchman support David Turner
2016-04-13 0:33 ` [PATCH v4 11/16] unpack-trees: preserve index extensions David Turner
2016-04-13 0:33 ` [PATCH v4 12/16] index-helper: kill mode David Turner
2016-04-16 16:08 ` Ævar Arnfjörð Bjarmason
2016-04-19 22:14 ` David Turner
2016-04-13 0:33 ` [PATCH v4 13/16] index-helper: don't run if already running David Turner
2016-04-13 0:33 ` [PATCH v4 14/16] index-helper: autorun mode David Turner
2016-04-13 0:33 ` [PATCH v4 15/16] index-helper: optionally automatically run David Turner
2016-04-17 5:19 ` Duy Nguyen
2016-04-19 22:31 ` David Turner
2016-04-13 0:33 ` [PATCH v4 16/16] read-cache: config for waiting for index-helper David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kYV6dHzuT51Pg9Oc6yBf_f9407JTe2kRpPyNxgXyfha4g@mail.gmail.com \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.co \
--cc=pclouds@gmail.com \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).