Re: [PATCH 10/14] xfsprogs: Add a timer implementation for OS X

[Jan Tulak <jtulak@xxxxxxxxxx>]

On Wed, Sep 23, 2015 at 5:25 AM, Dave Chinner <david@xxxxxxxxxxxxx> wrote:

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(&timespec, 0, sizeof(timespec));
    timespec.it_value.tv_sec = msgp->interval;
    timespec.it_interval.tv_sec = msgp->interval;

âThis is much better and elegant âsolution. :-)

Cheers,

Jan

--

Jan Tulak

jtulak@xxxxxxxxxxÂ/ jan@xxxxxxxx