From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: Duy Nguyen <pclouds@gmail.com>, Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/5] add SWAP macro
Date: Mon, 24 Apr 2017 07:29:28 -0400 [thread overview]
Message-ID: <20170424112928.rty5xejep4mnxph2@sigill.intra.peff.net> (raw)
In-Reply-To: <0bdb58a6-3a7f-2218-4b70-c591ae90e95e@web.de>
On Sat, Jan 28, 2017 at 10:38:21PM +0100, René Scharfe wrote:
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 87237b092b..66cd466eea 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -527,6 +527,16 @@ static inline int ends_with(const char *str, const char *suffix)
> return strip_suffix(str, suffix, &len);
> }
>
> +#define SWAP(a, b) do { \
> + void *_swap_a_ptr = &(a); \
> + void *_swap_b_ptr = &(b); \
> + unsigned char _swap_buffer[sizeof(a)]; \
> + memcpy(_swap_buffer, _swap_a_ptr, sizeof(a)); \
> + memcpy(_swap_a_ptr, _swap_b_ptr, sizeof(a) + \
> + BUILD_ASSERT_OR_ZERO(sizeof(a) == sizeof(b))); \
> + memcpy(_swap_b_ptr, _swap_buffer, sizeof(a)); \
> +} while (0)
What should:
SWAP(foo[i], foo[j]);
do when i == j? With this code, it ends up calling
memcpy(&foo[i], &foo[j], ...);
which can cause valgrind to complain about overlapping memory. I suspect
in practice that noop copies are better off than partial overlaps, but I
think it does still violate the standard.
Is it worth comparing the pointers and bailing early?
A related question is whether the caller should ever be asking to swap
something with itself. This particular case[1] comes from
prio_queue_reverse(). I suspect its "<=" could become a "<", but I
haven't thought it through carefully.
-Peff
[1] http://public-inbox.org/git/CACsJy8AAtV5KJHBqWvnYb3Mw9CVzEdG3M-UJA+jd5MR5e-UMsA@mail.gmail.com/
next prev parent reply other threads:[~2017-04-24 11:29 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-28 21:13 [PATCH 0/5] introduce SWAP macro René Scharfe
2017-01-28 21:38 ` [PATCH 1/5] add " René Scharfe
2017-01-30 15:39 ` Johannes Schindelin
2017-01-30 16:48 ` René Scharfe
2017-01-30 20:48 ` Johannes Schindelin
2017-01-30 21:46 ` René Scharfe
2017-01-31 12:13 ` Johannes Schindelin
2017-01-31 21:02 ` René Scharfe
2017-02-01 0:44 ` Ramsay Jones
2017-02-01 11:39 ` Johannes Schindelin
2017-01-30 16:01 ` Johannes Schindelin
2017-01-30 16:59 ` René Scharfe
2017-01-30 18:41 ` Johannes Sixt
2017-01-30 21:03 ` Johannes Schindelin
2017-01-30 22:09 ` René Scharfe
2017-01-30 22:21 ` Brandon Williams
2017-01-31 21:03 ` René Scharfe
2017-01-31 21:35 ` Jeff King
2017-01-31 22:29 ` Junio C Hamano
2017-01-31 22:36 ` Jeff King
2017-02-01 11:28 ` Johannes Schindelin
2017-02-01 11:47 ` Jeff King
2017-02-01 18:06 ` René Scharfe
2017-02-01 18:33 ` Junio C Hamano
2017-02-07 22:04 ` René Scharfe
2017-02-07 22:30 ` Junio C Hamano
2017-02-08 15:14 ` Johannes Schindelin
2017-01-31 12:03 ` Johannes Schindelin
2017-04-24 11:29 ` Jeff King [this message]
2017-04-24 11:49 ` Jeff King
2017-04-24 13:13 ` Duy Nguyen
2017-04-28 17:04 ` René Scharfe
2017-04-28 21:49 ` Jeff King
2017-04-29 18:16 ` René Scharfe
2017-04-30 3:11 ` Jeff King
2017-05-02 5:29 ` René Scharfe
2017-01-28 21:40 ` [PATCH 2/5] apply: use " René Scharfe
2017-01-28 21:40 ` [PATCH 3/5] " René Scharfe
2017-01-30 16:03 ` Johannes Schindelin
2017-01-30 17:18 ` René Scharfe
2017-01-30 22:22 ` Junio C Hamano
2017-01-31 21:02 ` René Scharfe
2017-01-28 21:41 ` [PATCH 4/5] diff: " René Scharfe
2017-01-30 16:04 ` Johannes Schindelin
2017-01-30 17:26 ` René Scharfe
2017-01-30 22:22 ` Junio C Hamano
2017-01-28 21:42 ` [PATCH 5/5] graph: " René Scharfe
2017-01-30 16:16 ` Johannes Schindelin
2017-01-30 17:41 ` René Scharfe
2017-01-30 23:20 ` [PATCH 0/5] introduce " Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170424112928.rty5xejep4mnxph2@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=l.s.r@web.de \
--cc=pclouds@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).