aboutsummaryrefslogtreecommitdiffstats
path: root/src/vlib
diff options
context:
space:
mode:
authorDamjan Marion <dmarion@me.com>2018-11-10 10:23:00 +0100
committerDave Barach <openvpp@barachs.net>2018-11-13 12:17:49 +0000
commita3d5986a35743a3ca1020155bed8267b5246d155 (patch)
tree45ce2a42124cab924ddd622862294e0147c54745 /src/vlib
parentb11175d797c11880d19442f178db5df526ca1256 (diff)
vlib rename vlib_frame_args(...) to vlib_frame_scalar_args(..)
Typically we have scalar_size == 0, so it doesn't matter but vlib_frame_args was providing pointer to scalar frame data, not vector data. To avoid future confusion function is renamed to vlib_frame_scalar_args(...) Change-Id: I48b75523b46d487feea24f3f3cb10c528dde516f Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vlib')
-rw-r--r--src/vlib/error.c2
-rw-r--r--src/vlib/main.c1
-rw-r--r--src/vlib/node.c2
-rw-r--r--src/vlib/node_funcs.h5
4 files changed, 4 insertions, 6 deletions
diff --git a/src/vlib/error.c b/src/vlib/error.c
index e6e4f2d5651..691e6396d97 100644
--- a/src/vlib/error.c
+++ b/src/vlib/error.c
@@ -114,7 +114,7 @@ static uword
misc_drop_buffers (vlib_main_t * vm,
vlib_node_runtime_t * node, vlib_frame_t * frame)
{
- return vlib_error_drop_buffers (vm, node, vlib_frame_args (frame),
+ return vlib_error_drop_buffers (vm, node, vlib_frame_vector_args (frame),
/* buffer stride */ 1,
frame->n_vectors,
/* next */ 0,
diff --git a/src/vlib/main.c b/src/vlib/main.c
index 1b9eb39bf95..b46caf1bcb4 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -157,6 +157,7 @@ vlib_frame_alloc_to_node (vlib_main_t * vm, u32 to_node_index,
f->n_vectors = 0;
f->scalar_size = scalar_size;
f->vector_size = vector_size;
+ f->flags = 0;
fs->n_alloc_frames += 1;
diff --git a/src/vlib/node.c b/src/vlib/node.c
index c87400d440c..88185ce921f 100644
--- a/src/vlib/node.c
+++ b/src/vlib/node.c
@@ -529,7 +529,7 @@ null_node_fn (vlib_main_t * vm,
u16 n_vectors = frame->n_vectors;
vlib_node_increment_counter (vm, node->node_index, 0, n_vectors);
- vlib_buffer_free (vm, vlib_frame_args (frame), n_vectors);
+ vlib_buffer_free (vm, vlib_frame_vector_args (frame), n_vectors);
vlib_frame_free (vm, node, frame);
return n_vectors;
diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h
index 3304d0f0d9f..13614aa14cd 100644
--- a/src/vlib/node_funcs.h
+++ b/src/vlib/node_funcs.h
@@ -271,9 +271,6 @@ vlib_frame_vector_args (vlib_frame_t * f)
/** \brief Get pointer to frame scalar data.
- @warning This is almost certainly not the function you wish to call.
- See @ref vlib_frame_vector_args instead.
-
@param f vlib_frame_t pointer
@return arbitrary node scalar data
@@ -281,7 +278,7 @@ vlib_frame_vector_args (vlib_frame_t * f)
@sa vlib_frame_vector_args
*/
always_inline void *
-vlib_frame_args (vlib_frame_t * f)
+vlib_frame_scalar_args (vlib_frame_t * f)
{
return vlib_frame_vector_args (f) - f->scalar_size;
}