Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
misc: Fix python scripts shebang line
[vpp.git]
/
src
/
plugins
/
nat
/
dslite_in2out.c
diff --git
a/src/plugins/nat/dslite_in2out.c
b/src/plugins/nat/dslite_in2out.c
index
5c1de19
..
2a8b548
100644
(file)
--- a/
src/plugins/nat/dslite_in2out.c
+++ b/
src/plugins/nat/dslite_in2out.c
@@
-16,9
+16,6
@@
#include <nat/nat_inlines.h>
#include <nat/nat_syslog.h>
#include <nat/nat_inlines.h>
#include <nat/nat_syslog.h>
-vlib_node_registration_t dslite_in2out_node;
-vlib_node_registration_t dslite_in2out_slowpath_node;
-
typedef enum
{
DSLITE_IN2OUT_NEXT_IP4_LOOKUP,
typedef enum
{
DSLITE_IN2OUT_NEXT_IP4_LOOKUP,
@@
-71,6
+68,10
@@
slow_path (dslite_main_t * dm, dslite_session_key_t * in2out_key,
b4_index = b4_kv.value = b4 - dm->per_thread_data[thread_index].b4s;
clib_bihash_add_del_16_8 (&dm->per_thread_data[thread_index].b4_hash,
&b4_kv, 1);
b4_index = b4_kv.value = b4 - dm->per_thread_data[thread_index].b4s;
clib_bihash_add_del_16_8 (&dm->per_thread_data[thread_index].b4_hash,
&b4_kv, 1);
+
+ vlib_set_simple_counter (&dm->total_b4s, thread_index, 0,
+ pool_elts (dm->
+ per_thread_data[thread_index].b4s));
}
else
{
}
else
{
@@
-139,6
+140,10
@@
slow_path (dslite_main_t * dm, dslite_session_key_t * in2out_key,
clib_dlist_addtail (dm->per_thread_data[thread_index].list_pool,
s->per_b4_list_head_index,
elt - dm->per_thread_data[thread_index].list_pool);
clib_dlist_addtail (dm->per_thread_data[thread_index].list_pool,
s->per_b4_list_head_index,
elt - dm->per_thread_data[thread_index].list_pool);
+
+ vlib_set_simple_counter (&dm->total_sessions, thread_index, 0,
+ pool_elts (dm->per_thread_data
+ [thread_index].sessions));
}
s->in2out = *in2out_key;
}
s->in2out = *in2out_key;
@@
-241,8
+246,8
@@
dslite_in2out_node_fn_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
dslite_main_t *dm = &dslite_main;
node_index =
dslite_main_t *dm = &dslite_main;
node_index =
- is_slow_path ? d
slite_in2out_slowpath_node.
-
index : dslite_in2out_node.
index;
+ is_slow_path ? d
m->dslite_in2out_slowpath_node_index :
+
dm->dslite_in2out_node_
index;
error_node = vlib_node_get_runtime (vm, node_index);
error_node = vlib_node_get_runtime (vm, node_index);
@@
-437,16
+442,15
@@
dslite_in2out_node_fn_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
return frame->n_vectors;
}
return frame->n_vectors;
}
-static uword
-
dslite_in2out_node_fn (vlib_main_t * vm,
vlib_node_runtime_t * node,
- vlib_frame_t * frame)
+VLIB_NODE_FN (dslite_in2out_node) (vlib_main_t * vm,
+
vlib_node_runtime_t * node,
+
vlib_frame_t * frame)
{
return dslite_in2out_node_fn_inline (vm, node, frame, 0);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (dslite_in2out_node) = {
{
return dslite_in2out_node_fn_inline (vm, node, frame, 0);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (dslite_in2out_node) = {
- .function = dslite_in2out_node_fn,
.name = "dslite-in2out",
.vector_size = sizeof (u32),
.format_trace = format_dslite_trace,
.name = "dslite-in2out",
.vector_size = sizeof (u32),
.format_trace = format_dslite_trace,
@@
-464,18
+468,15
@@
VLIB_REGISTER_NODE (dslite_in2out_node) = {
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (dslite_in2out_node, dslite_in2out_node_fn);
-
-static uword
-dslite_in2out_slowpath_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
- vlib_frame_t * frame)
+VLIB_NODE_FN (dslite_in2out_slowpath_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return dslite_in2out_node_fn_inline (vm, node, frame, 1);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (dslite_in2out_slowpath_node) = {
{
return dslite_in2out_node_fn_inline (vm, node, frame, 1);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (dslite_in2out_slowpath_node) = {
- .function = dslite_in2out_slowpath_node_fn,
.name = "dslite-in2out-slowpath",
.vector_size = sizeof (u32),
.format_trace = format_dslite_trace,
.name = "dslite-in2out-slowpath",
.vector_size = sizeof (u32),
.format_trace = format_dslite_trace,
@@
-493,9
+494,6
@@
VLIB_REGISTER_NODE (dslite_in2out_slowpath_node) = {
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (dslite_in2out_slowpath_node,
- dslite_in2out_slowpath_node_fn);
-
/*
* fd.io coding-style-patch-verification: ON
*
/*
* fd.io coding-style-patch-verification: ON
*