Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
buffers: remove unused code
[vpp.git]
/
src
/
vnet
/
pg
/
pg.h
diff --git
a/src/vnet/pg/pg.h
b/src/vnet/pg/pg.h
index
20852ba
..
0b06803
100644
(file)
--- a/
src/vnet/pg/pg.h
+++ b/
src/vnet/pg/pg.h
@@
-43,7
+43,7
@@
#include <vlib/vlib.h> /* for VLIB_N_RX_TX */
#include <vnet/pg/edit.h>
#include <vppinfra/fifo.h> /* for buffer_fifo */
#include <vlib/vlib.h> /* for VLIB_N_RX_TX */
#include <vnet/pg/edit.h>
#include <vppinfra/fifo.h> /* for buffer_fifo */
-#include <v
net/unix
/pcap.h>
+#include <v
ppinfra
/pcap.h>
#include <vnet/interface.h>
extern vnet_device_class_t pg_dev_class;
#include <vnet/interface.h>
extern vnet_device_class_t pg_dev_class;
@@
-89,8
+89,6
@@
typedef struct
/* Buffers pre-initialized with fixed buffer data for this stream. */
u32 *buffer_fifo;
/* Buffers pre-initialized with fixed buffer data for this stream. */
u32 *buffer_fifo;
- /* Buffer free list for this buffer index in stream. */
- vlib_buffer_free_list_index_t free_list_index;
} pg_buffer_index_t;
typedef struct pg_stream_t
} pg_buffer_index_t;
typedef struct pg_stream_t
@@
-169,6
+167,7
@@
typedef struct pg_stream_t
pg_buffer_index_t *buffer_indices;
u8 **replay_packet_templates;
pg_buffer_index_t *buffer_indices;
u8 **replay_packet_templates;
+ u64 *replay_packet_timestamps;
u32 current_replay_packet_index;
} pg_stream_t;
u32 current_replay_packet_index;
} pg_stream_t;
@@
-192,6
+191,7
@@
pg_edit_group_free (pg_edit_group_t * g)
always_inline void
pg_stream_free (pg_stream_t * s)
{
always_inline void
pg_stream_free (pg_stream_t * s)
{
+ int i;
pg_edit_group_t *g;
pg_edit_t *e;
vec_foreach (e, s->non_fixed_edits) pg_edit_free (e);
pg_edit_group_t *g;
pg_edit_t *e;
vec_foreach (e, s->non_fixed_edits) pg_edit_free (e);
@@
-201,6
+201,10
@@
pg_stream_free (pg_stream_t * s)
vec_free (s->fixed_packet_data);
vec_free (s->fixed_packet_data_mask);
vec_free (s->name);
vec_free (s->fixed_packet_data);
vec_free (s->fixed_packet_data_mask);
vec_free (s->name);
+ for (i = 0; i < vec_len (s->replay_packet_templates); i++)
+ vec_free (s->replay_packet_templates[i]);
+ vec_free (s->replay_packet_templates);
+ vec_free (s->replay_packet_timestamps);
{
pg_buffer_index_t *bi;
{
pg_buffer_index_t *bi;
@@
-281,7
+285,7
@@
pg_free_edit_group (pg_stream_t * s)
pg_edit_group_t *g = pg_stream_get_group (s, i);
pg_edit_group_free (g);
pg_edit_group_t *g = pg_stream_get_group (s, i);
pg_edit_group_free (g);
- memset (g, 0, sizeof (g[0]));
+
clib_
memset (g, 0, sizeof (g[0]));
_vec_len (s->edit_groups) = i;
}
_vec_len (s->edit_groups) = i;
}