From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Duy Nguyen <pclouds@gmail.com>
Subject: Re: [PATCH] dir: support platforms that require aligned reads
Date: Sun, 16 Jul 2017 10:04:09 -0400 [thread overview]
Message-ID: <20170716140409.3ywepgvo5c6ognsy@sigill.intra.peff.net> (raw)
In-Reply-To: <d3db2984-f238-7166-affa-f1f7df566404@web.de>
On Sun, Jul 16, 2017 at 02:17:37PM +0200, René Scharfe wrote:
> -static void stat_data_from_disk(struct stat_data *to, const struct stat_data *from)
> +static void stat_data_from_disk(struct stat_data *to, const unsigned char *data)
> {
> - to->sd_ctime.sec = get_be32(&from->sd_ctime.sec);
> - to->sd_ctime.nsec = get_be32(&from->sd_ctime.nsec);
> - to->sd_mtime.sec = get_be32(&from->sd_mtime.sec);
> - to->sd_mtime.nsec = get_be32(&from->sd_mtime.nsec);
> - to->sd_dev = get_be32(&from->sd_dev);
> - to->sd_ino = get_be32(&from->sd_ino);
> - to->sd_uid = get_be32(&from->sd_uid);
> - to->sd_gid = get_be32(&from->sd_gid);
> - to->sd_size = get_be32(&from->sd_size);
> + memcpy(to, data, sizeof(*to));
> + to->sd_ctime.sec = ntohl(to->sd_ctime.sec);
> + to->sd_ctime.nsec = ntohl(to->sd_ctime.nsec);
> + to->sd_mtime.sec = ntohl(to->sd_mtime.sec);
> + to->sd_mtime.nsec = ntohl(to->sd_mtime.nsec);
> + to->sd_dev = ntohl(to->sd_dev);
> + to->sd_ino = ntohl(to->sd_ino);
> + to->sd_uid = ntohl(to->sd_uid);
> + to->sd_gid = ntohl(to->sd_gid);
> + to->sd_size = ntohl(to->sd_size);
> }
Hmm. I would have written this to pull the bytes directly out of the
array, like:
to->sd_ctime.sec = get_be32(data); data += 4;
to->sd_ctime.nsec = get_be32(data); data += 4;
etc. Or even a helper to do the advancing like:
to->sd_ctime.sec = parse_be32(&data);
That reduces assumptions about padding in "struct stat_data". But
looking more at this code, and reading your comment:
> Side note: The OS name is not enough for determining the layout of
> struct ondisk_untracked_cache. Different platforms can have different
> int sizes and padding. Adding the machine type could help, but that
> would be a breaking change. At that point we would be better off
> defining a machine-independent format, no?
it looks like assumptions about struct layout are pervasive and part of
the on-disk format. Yuck. :(
-Peff
next prev parent reply other threads:[~2017-07-16 14:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-16 12:17 [PATCH] dir: support platforms that require aligned reads René Scharfe
2017-07-16 14:04 ` Jeff King [this message]
2017-07-16 15:18 ` René Scharfe
2017-07-16 16:03 ` Jeff King
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=20170716140409.3ywepgvo5c6ognsy@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).