[2/2] linux-generic: timer: fix failed static assert

(This document/code contribution attached is provided under the terms of
agreement LES-LTM-21309)

Ensure tick_buf_t structure is max 128 bits large on all platforms,
regardless of support for 64-bit atomic operations.
Only assert that tick_buf_t is 128 bits large when performing
atomic operations on it (requires ODP and platform support for 128
bit atomics).

Signed-off-by: Ola Liljedahl <ola.liljedahl@linaro.org>
---
 platform/linux-generic/odp_timer.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

This part fails to apply with the following error:

bill@Ub16-32:~/linaro/olatimer$ git am --reject ~/Mail/Incoming/Ola/2
Applying: linux-generic: timer: fix failed static assert
Checking patch platform/linux-generic/odp_timer.c...
error: while searching for:
#endif
;

_ODP_STATIC_ASSERT(sizeof(tick_buf_t) == 16, "sizeof(tick_buf_t) == 16");

typedef struct odp_timer_s {
void *user_ptr;

error: patch failed: platform/linux-generic/odp_timer.c:105
Hunk #3 succeeded at 131 (offset -3 lines).
Hunk #4 succeeded at 265 (offset -3 lines).
Hunk #5 succeeded at 951 (offset 12 lines).
Applying patch platform/linux-generic/odp_timer.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Patch failed at 0001 linux-generic: timer: fix failed static assert
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Looks like it needs a rebase?


On Tue, May 17, 2016 at 9:46 AM, Ola Liljedahl <ola.liljedahl@linaro.org>
wrote:

> (This document/code contribution attached is provided under the terms of
> agreement LES-LTM-21309)
>
> Ensure tick_buf_t structure is max 128 bits large on all platforms,
> regardless of support for 64-bit atomic operations.
> Only assert that tick_buf_t is 128 bits large when performing
> atomic operations on it (requires ODP and platform support for 128
> bit atomics).
>
> Signed-off-by: Ola Liljedahl <ola.liljedahl@linaro.org>
> ---
>  platform/linux-generic/odp_timer.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/platform/linux-generic/odp_timer.c
> b/platform/linux-generic/odp_timer.c
> index 66a25b8..613d342 100644
> --- a/platform/linux-generic/odp_timer.c
> +++ b/platform/linux-generic/odp_timer.c
> @@ -94,7 +94,15 @@ static odp_timeout_hdr_t *timeout_hdr(odp_timeout_t tmo)
>
> *****************************************************************************/
>
>  typedef struct tick_buf_s {
> +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2
> +       /* No atomics support for 64-bit variables, will use separate lock
> */
> +       /* Use the same layout as odp_atomic_u64_t but without lock
> variable */
> +       struct {
> +               uint64_t v;
> +       } exp_tck;/* Expiration tick or TMO_xxx */
> +#else
>         odp_atomic_u64_t exp_tck;/* Expiration tick or TMO_xxx */
> +#endif
>         odp_buffer_t tmo_buf;/* ODP_BUFFER_INVALID if timer not active */
>  #ifdef TB_NEEDS_PAD
>         uint32_t pad;/* Need to be able to access padding for successful
> CAS */
> @@ -105,7 +113,10 @@ ODP_ALIGNED(16) /* 16-byte atomic operations need
> properly aligned addresses */
>  #endif
>  ;
>
> +#if __GCC_ATOMIC_LLONG_LOCK_FREE >= 2
> +/* Only assert this when we perform atomic operations on tick_buf_t */
>  _ODP_STATIC_ASSERT(sizeof(tick_buf_t) == 16, "sizeof(tick_buf_t) == 16");
> +#endif
>
>  typedef struct odp_timer_s {
>         void *user_ptr;
> @@ -123,7 +134,11 @@ static void timer_init(odp_timer *tim,
>         /* All pad fields need a defined and constant value */
>         TB_SET_PAD(*tb);
>         /* Release the timer by setting timer state to inactive */
> +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2
> +       tb->exp_tck.v = TMO_INACTIVE;
> +#else
>         _odp_atomic_u64_store_mm(&tb->exp_tck, TMO_INACTIVE,
> _ODP_MEMMODEL_RLS);
> +#endif
>  }
>
>  /* Teardown when timer is freed */
> @@ -253,7 +268,11 @@ static odp_timer_pool *odp_timer_pool_new(
>                 tp->timers[i].queue = ODP_QUEUE_INVALID;
>                 set_next_free(&tp->timers[i], i + 1);
>                 tp->timers[i].user_ptr = NULL;
> +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2
> +               tp->tick_buf[i].exp_tck.v = TMO_UNUSED;
> +#else
>                 odp_atomic_init_u64(&tp->tick_buf[i].exp_tck, TMO_UNUSED);
> +#endif
>                 tp->tick_buf[i].tmo_buf = ODP_BUFFER_INVALID;
>         }
>         tp->tp_idx = tp_idx;
> @@ -920,7 +939,11 @@ int odp_timeout_fresh(odp_timeout_t tmo)
>         odp_timer_pool *tp = handle_to_tp(hdl);
>         uint32_t idx = handle_to_idx(hdl, tp);
>         tick_buf_t *tb = &tp->tick_buf[idx];
> +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2
> +       uint64_t exp_tck = tb->exp_tck.v;
> +#else
>         uint64_t exp_tck = odp_atomic_load_u64(&tb->exp_tck);
> +#endif
>         /* Return true if the timer still has the same expiration tick
>          * (ignoring the inactive/expired bit) as the timeout */
>         return hdr->expiration == (exp_tck & ~TMO_INACTIVE);
> --
> 2.5.0
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
>