git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log errors from host command
[sliver-openvswitch.git]
/
ofproto
/
ofproto-dpif-sflow.c
diff --git
a/ofproto/ofproto-dpif-sflow.c
b/ofproto/ofproto-dpif-sflow.c
index
ac80ff9
..
b387b94
100644
(file)
--- a/
ofproto/ofproto-dpif-sflow.c
+++ b/
ofproto/ofproto-dpif-sflow.c
@@
-146,7
+146,7
@@
sflow_agent_send_packet_cb(void *ds_, SFLAgent *agent OVS_UNUSED,
static struct dpif_sflow_port *
dpif_sflow_find_port(const struct dpif_sflow *ds, odp_port_t odp_port)
static struct dpif_sflow_port *
dpif_sflow_find_port(const struct dpif_sflow *ds, odp_port_t odp_port)
- OVS_REQ
_WRLOCK(&
mutex)
+ OVS_REQ
UIRES(
mutex)
{
struct dpif_sflow_port *dsp;
{
struct dpif_sflow_port *dsp;
@@
-162,7
+162,7
@@
dpif_sflow_find_port(const struct dpif_sflow *ds, odp_port_t odp_port)
static void
sflow_agent_get_counters(void *ds_, SFLPoller *poller,
SFL_COUNTERS_SAMPLE_TYPE *cs)
static void
sflow_agent_get_counters(void *ds_, SFLPoller *poller,
SFL_COUNTERS_SAMPLE_TYPE *cs)
- OVS_REQ
_WRLOCK(&
mutex)
+ OVS_REQ
UIRES(
mutex)
{
struct dpif_sflow *ds = ds_;
SFLCounters_sample_element elem;
{
struct dpif_sflow *ds = ds_;
SFLCounters_sample_element elem;
@@
-276,7
+276,7
@@
success:
}
static void
}
static void
-dpif_sflow_clear__(struct dpif_sflow *ds) OVS_REQ
_WRLOCK
(mutex)
+dpif_sflow_clear__(struct dpif_sflow *ds) OVS_REQ
UIRES
(mutex)
{
if (ds->sflow_agent) {
sfl_agent_release(ds->sflow_agent);
{
if (ds->sflow_agent) {
sfl_agent_release(ds->sflow_agent);
@@
-382,7
+382,7
@@
dpif_sflow_unref(struct dpif_sflow *ds) OVS_EXCLUDED(mutex)
static void
dpif_sflow_add_poller(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)
static void
dpif_sflow_add_poller(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)
- OVS_REQ
_WRLOCK
(mutex)
+ OVS_REQ
UIRES
(mutex)
{
SFLPoller *poller = sfl_agent_addPoller(ds->sflow_agent, &dsp->dsi, ds,
sflow_agent_get_counters);
{
SFLPoller *poller = sfl_agent_addPoller(ds->sflow_agent, &dsp->dsi, ds,
sflow_agent_get_counters);
@@
-426,7
+426,7
@@
out:
static void
dpif_sflow_del_port__(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)
static void
dpif_sflow_del_port__(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)
- OVS_REQ
_WRLOCK
(mutex)
+ OVS_REQ
UIRES
(mutex)
{
if (ds->sflow_agent) {
sfl_agent_removePoller(ds->sflow_agent, &dsp->dsi);
{
if (ds->sflow_agent) {
sfl_agent_removePoller(ds->sflow_agent, &dsp->dsi);