policer: improve policer struct

[vpp.git] / src / vnet / policer / policer.c

diff --git a/src/vnet/policer/policer.c b/src/vnet/policer/policer.c
index 2c05ae2..f6a19f4 100644 (file)
--- a/src/vnet/policer/policer.c
+++ b/src/vnet/policer/policer.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 #include <stdint.h>
+#include <stdbool.h>
 #include <vnet/policer/policer.h>
 #include <vnet/policer/police_inlines.h>
 #include <vnet/classify/vnet_classify.h>
@@ -53,8 +54,8 @@ policer_add_del (vlib_main_t *vm, u8 *name, qos_pol_cfg_params_st *cfg,
                 u32 *policer_index, u8 is_add)
 {
   vnet_policer_main_t *pm = &vnet_policer_main;
-  policer_read_response_type_st test_policer;
-  policer_read_response_type_st *policer;
+  policer_t test_policer;
+  policer_t *policer;
   uword *p;
   u32 pi;
   int rv;
@@ -98,7 +99,7 @@ policer_add_del (vlib_main_t *vm, u8 *name, qos_pol_cfg_params_st *cfg,
 
   if (rv == 0)
     {
-      policer_read_response_type_st *pp;
+      policer_t *pp;
       qos_pol_cfg_params_st *cp;
       int i;
 
@@ -133,11 +134,41 @@ policer_add_del (vlib_main_t *vm, u8 *name, qos_pol_cfg_params_st *cfg,
   return 0;
 }
 
+int
+policer_bind_worker (u8 *name, u32 worker, bool bind)
+{
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  policer_t *policer;
+  uword *p;
+
+  p = hash_get_mem (pm->policer_index_by_name, name);
+  if (p == 0)
+    {
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+
+  policer = &pm->policers[p[0]];
+
+  if (bind)
+    {
+      if (worker >= vlib_num_workers ())
+       {
+         return VNET_API_ERROR_INVALID_WORKER;
+       }
+
+      policer->thread_index = vlib_get_worker_thread_index (worker);
+    }
+  else
+    {
+      policer->thread_index = ~0;
+    }
+  return 0;
+}
+
 u8 *
 format_policer_instance (u8 * s, va_list * va)
 {
-  policer_read_response_type_st *i
-    = va_arg (*va, policer_read_response_type_st *);
+  policer_t *i = va_arg (*va, policer_t *);
   uword pi = va_arg (*va, uword);
   int result;
   vlib_counter_t counts[NUM_POLICE_RESULTS];
@@ -501,7 +532,7 @@ show_policer_command_fn (vlib_main_t * vm,
   u8 *name;
   uword *pi;
   qos_pol_cfg_params_st *config;
-  policer_read_response_type_st *templ;
+  policer_t *templ;
 
   (void) unformat (input, "name %s", &match_name);