1 files changed, 24 insertions, 21 deletions

diff --git a/hicn-plugin/src/strategy_dpo_ctx.c b/hicn-plugin/src/strategy_dpo_ctx.c
index edfe75aa8..eb4173944 100644
--- a/hicn-plugin/src/strategy_dpo_ctx.c
+++ b/hicn-plugin/src/strategy_dpo_ctx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -21,7 +21,8 @@ hicn_dpo_ctx_t *hicn_strategy_dpo_ctx_pool;
 void
 hicn_strategy_init_dpo_ctx_pool ()
 {
-  pool_init_fixed (hicn_strategy_dpo_ctx_pool, 256);
+  pool_alloc_aligned (hicn_strategy_dpo_ctx_pool, 256,
+		      2 * CLIB_CACHE_LINE_BYTES);
 }
 
 void
@@ -29,9 +30,16 @@ hicn_strategy_dpo_ctx_lock (dpo_id_t *dpo)
 {
   hicn_dpo_ctx_t *dpo_ctx = hicn_strategy_dpo_ctx_get (dpo->dpoi_index);
 
-  if (dpo_ctx != NULL)
+  if (PREDICT_TRUE (dpo_ctx != NULL))
     {
       dpo_ctx->locks++;
+      HICN_DEBUG ("Locking DPO CTX with index %d. Lock now: %d",
+		  dpo->dpoi_index, dpo_ctx->locks);
+    }
+  else
+    {
+      HICN_ERROR ("Trying to lock NULL spo_ctx with index %d",
+		  dpo->dpoi_index);
     }
 }
 
@@ -41,31 +49,23 @@ hicn_strategy_dpo_ctx_unlock (dpo_id_t *dpo)
   hicn_dpo_ctx_t *hicn_strategy_dpo_ctx =
     (hicn_dpo_ctx_t *) hicn_strategy_dpo_ctx_get (dpo->dpoi_index);
 
-  if (hicn_strategy_dpo_ctx != NULL)
+  if (PREDICT_TRUE (hicn_strategy_dpo_ctx != NULL))
     {
       hicn_strategy_dpo_ctx->locks--;
+      HICN_DEBUG ("Unlcking DPO CTX with index %d. Lock now: %d",
+		  dpo->dpoi_index, hicn_strategy_dpo_ctx->locks);
 
       if (0 == hicn_strategy_dpo_ctx->locks)
 	{
+	  HICN_DEBUG ("Releasing DPO CTX %d", dpo->dpoi_index);
 	  pool_put (hicn_strategy_dpo_ctx_pool, hicn_strategy_dpo_ctx);
 	}
     }
-}
-
-u8 *
-hicn_strategy_dpo_format_ctx (u8 *s, va_list *ap)
-{
-  index_t index = va_arg (*ap, index_t);
-  hicn_dpo_ctx_t *dpo = NULL;
-  u32 indent = va_arg (*ap, u32);
-
-  dpo = (hicn_dpo_ctx_t *) hicn_strategy_dpo_ctx_get (index);
-
-  const hicn_dpo_vft_t *dpo_vft = hicn_dpo_get_vft (dpo->dpo_type);
-
-  s = dpo_vft->hicn_dpo_format (s, 2, index, indent);
-
-  return (s);
+  else
+    {
+      HICN_ERROR ("Trying to unlock NULL spo_ctx with index %d",
+		  dpo->dpoi_index);
+    }
 }
 
 index_t
@@ -90,8 +90,11 @@ hicn_strategy_dpo_ctx_get (index_t index)
 hicn_dpo_ctx_t *
 hicn_strategy_dpo_ctx_alloc ()
 {
+  HICN_DEBUG ("Allocating new DPO CTX");
   hicn_dpo_ctx_t *dpo_ctx;
-  pool_get (hicn_strategy_dpo_ctx_pool, dpo_ctx);
+  pool_get_aligned (hicn_strategy_dpo_ctx_pool, dpo_ctx,
+		    2 * CLIB_CACHE_LINE_BYTES);
+  dpo_ctx->locks = 0;
   return dpo_ctx;
 }