summaryrefslogtreecommitdiffstats
path: root/src/vnet/interface_output.c
diff options
context:
space:
mode:
authorWei CHEN <weichen@astri.org>2019-06-26 11:01:15 +0800
committerDave Barach <openvpp@barachs.net>2019-07-15 11:09:53 +0000
commitf974794e2e47ad2dfa244c2c2408d503e9120e2b (patch)
tree45705fd0a0abd1bcf0dc3a8082914c3a050b74de /src/vnet/interface_output.c
parent692b9498ee5511a17bfbc3a2c6e87339aa3b8df8 (diff)
interface: fix issue that pcap rx/tx trace not available when there are worker threads
Type: fix Change-Id: Ie9a3a78b45b53344a0a5d7e2027c0e0354a49ebe Signed-off-by: Wei CHEN <weichen@astri.org>
Diffstat (limited to 'src/vnet/interface_output.c')
-rw-r--r--src/vnet/interface_output.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 2a41271852a..1a9f5dbab8f 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -800,7 +800,7 @@ static_always_inline void vnet_interface_pcap_tx_trace
u32 n_left_from, *from;
u32 sw_if_index;
- if (PREDICT_TRUE (vm->pcap[VLIB_TX].pcap_enable == 0))
+ if (PREDICT_TRUE (vlib_global_main.pcap[VLIB_TX].pcap_enable == 0))
return;
if (sw_if_index_from_buffer == 0)
@@ -822,9 +822,10 @@ static_always_inline void vnet_interface_pcap_tx_trace
if (sw_if_index_from_buffer)
sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
- if (vm->pcap[VLIB_TX].pcap_sw_if_index == 0 ||
- vm->pcap[VLIB_TX].pcap_sw_if_index == sw_if_index)
- pcap_add_buffer (&vm->pcap[VLIB_TX].pcap_main, vm, bi0, 512);
+ if (vlib_global_main.pcap[VLIB_TX].pcap_sw_if_index == 0 ||
+ vlib_global_main.pcap[VLIB_TX].pcap_sw_if_index == sw_if_index)
+ pcap_add_buffer (&vlib_global_main.pcap[VLIB_TX].pcap_main, vm, bi0,
+ 512);
from++;
n_left_from--;
}
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
[gerrit]
host=gerrit.fd.io
port=29418
project=vpp