From: Dave Chinner <david@fromorbit.com>
To: Jan Tulak <jtulak@redhat.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 10/14] xfsprogs: Add a timer implementation for OS X
Date: Wed, 23 Sep 2015 13:25:50 +1000 [thread overview]
Message-ID: <20150923032550.GO3902@dastard> (raw)
In-Reply-To: <1442311164-12921-11-git-send-email-jtulak@redhat.com>
On Tue, Sep 15, 2015 at 11:59:20AM +0200, Jan Tulak wrote:
> OS X does not have the timer used in xfs_repair.
> Add a simple implementation providing the required
> capabilities.
....
> #endif /* __XFS_DARWIN_H__ */
> diff --git a/repair/progress.c b/repair/progress.c
> index 27cbaef..0fee7dc 100644
> --- a/repair/progress.c
> +++ b/repair/progress.c
> @@ -184,10 +184,22 @@ progress_rpt_thread (void *p)
> */
>
> timespec.it_value.tv_sec = msgp->interval;
> - timespec.it_value.tv_nsec = 0;
> timespec.it_interval.tv_sec = msgp->interval;
> + /*
> + * On some platforms (like OS X), timers and time things are slightly
> + * different: itimerspec is replaced with itimerval and timeval struct
> + * has no tv_nsec, but just tv_usec member.
> + * For compatibility, itimerspec is a macro defined to the existing
> + * itimerval on these platforms, and in such case, use usec instead
> + * of nsec.
> + */
> +#ifndef itimerspec
> + timespec.it_value.tv_nsec = 0;
> timespec.it_interval.tv_nsec = 0;
> -
> +#else
> + timespec.it_value.tv_usec = 0;
> + timespec.it_interval.tv_usec = 0;
> +#endif
That's pretty nasty. How about this:
memset(×pec, 0, sizeof(timespec));
timespec.it_value.tv_sec = msgp->interval;
timespec.it_interval.tv_sec = msgp->interval;
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-09-23 3:25 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-15 9:59 [PATCH 00/14 v5] xfsprogs: Partial OSX support Jan Tulak
2015-09-15 9:59 ` [PATCH 01/14] xfsprogs: Add a way to compile without blkid Jan Tulak
2015-09-15 9:59 ` [PATCH 02/14] xfsprogs: Add XATTR_LIST_MAX to OS X headers Jan Tulak
2015-09-15 9:59 ` [PATCH 03/14] xfsprogs: avoid dependency on Linux XATTR_SIZE_MAX Jan Tulak
2015-09-23 3:09 ` Dave Chinner
2015-09-15 9:59 ` [PATCH 04/14] xfsprogs: prefix XATTR_LIST_MAX with XFS_ Jan Tulak
2015-09-23 3:15 ` Dave Chinner
2015-09-24 8:28 ` Jan Tulak
2015-09-24 22:41 ` Dave Chinner
2015-10-07 11:17 ` [PATCH 04/14 v2] " Jan Tulak
2015-09-15 9:59 ` [PATCH 05/14] xfsprogs: Add includes required for OS X builds (delta) Jan Tulak
2015-09-15 9:59 ` [PATCH 06/14] xfsprogs: Add autoconf check for fsetxattr call Jan Tulak
2015-09-15 9:59 ` [PATCH 07/14] xfsprogs: uuid changes for OS X Jan Tulak
2015-09-15 9:59 ` [PATCH 08/14] xfsprogs: Remove conflicting define " Jan Tulak
2015-09-15 9:59 ` [PATCH 09/14] xfsprogs: change nftw64 to nftw Jan Tulak
2015-09-15 9:59 ` [PATCH 10/14] xfsprogs: Add a timer implementation for OS X Jan Tulak
2015-09-23 3:25 ` Dave Chinner [this message]
2015-09-24 9:26 ` Jan Tulak
2015-09-30 8:23 ` [PATCH 10/14 v2] " Jan Tulak
2015-09-15 9:59 ` [PATCH 11/14] xfsprogs: Add statvfs64 for osx Jan Tulak
2015-09-23 3:32 ` Dave Chinner
2015-09-24 9:33 ` Jan Tulak
2015-09-30 8:21 ` [PATCH 11/14 v2] " Jan Tulak
2015-09-15 9:59 ` [PATCH 12/14] xfsprogs: make fsr use mntinfo when there is no mntent Jan Tulak
2015-09-23 3:36 ` Dave Chinner
2015-09-24 14:38 ` Jan Tulak
2015-09-24 22:53 ` Dave Chinner
2015-09-29 16:07 ` Jan Tulak
2015-09-29 16:04 ` [PATCH 12/14 v2] " Jan Tulak
2015-10-13 4:54 ` Dave Chinner
2015-10-13 8:45 ` Jan Tulak
2015-10-13 9:56 ` [PATCH 12/14 v3] " Jan Tulak
2015-09-15 9:59 ` [PATCH 13/14] xfsprogs: Make mremap conditional Jan Tulak
2015-10-13 4:42 ` Dave Chinner
2015-09-15 9:59 ` [PATCH 14/14] xfsprogs: rename lstat64 to lstat for OS X Jan Tulak
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=20150923032550.GO3902@dastard \
--to=david@fromorbit.com \
--cc=jtulak@redhat.com \
--cc=xfs@oss.sgi.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