On 9/19/2016 3:46 AM, Yuval Shaia wrote:
> Old destination records are removed from EP's dest_map after timeout is
> expired in order to maintain a correct cache.
>
> Signed-off-by: Yuval Shaia <yuval.shaia@xxxxxxxxxx>
> ---
> v0 -> v1:
> * Move the status and timeout check to acmp_acquire_dest (i.e.
> deleteis_dest_ready).
> * Fix typo (Record expiered).
> * Use NULL instead of 0
> ---
> prov/acmp/src/acmp.c | 29 ++++++++++++++++++++---------
> 1 files changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/prov/acmp/src/acmp.c b/prov/acmp/src/acmp.c
> index ec64631..1778ca3 100644
> --- a/prov/acmp/src/acmp.c
> +++ b/prov/acmp/src/acmp.c
> @@ -356,6 +356,16 @@ acmp_put_dest(struct acmp_dest *dest)
> }
> }
>
> +/* Caller must hold ep lock. */
> +static void
> +acmp_remove_dest(struct acmp_ep *ep, struct acmp_dest *dest)
> +{
> + acm_log(2, "%s\n", dest->name);
> + tdelete(dest->address, &ep->dest_map[dest->addr_type - 1],
> + acmp_compare_dest);
> + acmp_put_dest(dest);
> +}
> +
> static struct acmp_dest *
> acmp_acquire_dest(struct acmp_ep *ep, uint8_t addr_type, const uint8_t *addr)
> {
> @@ -366,6 +376,16 @@ acmp_acquire_dest(struct acmp_ep *ep, uint8_t addr_type, const uint8_t *addr)
> acm_log(2, "%s\n", log_data);
> lock_acquire(&ep->lock);
> dest = acmp_get_dest(ep, addr_type, addr);
> + if (dest && dest->state == ACMP_READY &&
> + dest->addr_timeout != 0xFFFFFFFFFFFFFFFF) {
Nit related to the timeout check:
In acmp.c, (uint64_t)~0ULL is used in other places for this. Should this
addr_timeout check be changed to some infinite or no timeout define
along with the other occurrences for consistency and better code
readability ?
-- Hal
> + acm_log(2, "Record valid for the next %ld minute(s)\n",
> + dest->addr_timeout - time_stamp_min());
> + if (time_stamp_min() >= dest->addr_timeout) {
> + acm_log(2, "Record expired\n");
> + acmp_remove_dest(ep, dest);
> + dest = NULL;
> + }
> + }
> if (!dest) {
> dest = acmp_alloc_dest(addr_type, addr);
> if (dest) {
> @@ -378,15 +398,6 @@ acmp_acquire_dest(struct acmp_ep *ep, uint8_t addr_type, const uint8_t *addr)
> return dest;
> }
>
> -/* Caller must hold ep lock. */
> -//static void
> -//acmp_remove_dest(struct acmp_ep *ep, struct acmp_dest *dest)
> -//{
> -// acm_log(2, "%s\n", dest->name);
> -// tdelete(dest->address, &ep->dest_map[dest->addr_type - 1], acmp_compare_dest);
> -// acmp_put_dest(dest);
> -//}
> -
> static struct acmp_request *acmp_alloc_req(uint64_t id, struct acm_msg *msg)
> {
> struct acmp_request *req;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
