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
ofproto: Add a ref_count to "struct rule" to protect it from being freed.
[sliver-openvswitch.git]
/
ofproto
/
ofproto-dpif.h
diff --git
a/ofproto/ofproto-dpif.h
b/ofproto/ofproto-dpif.h
index
befd458
..
14a9669
100644
(file)
--- a/
ofproto/ofproto-dpif.h
+++ b/
ofproto/ofproto-dpif.h
@@
-61,15
+61,14
@@
struct OVS_LOCKABLE rule_dpif;
* actions into datapath actions. */
void rule_dpif_lookup(struct ofproto_dpif *, const struct flow *,
* actions into datapath actions. */
void rule_dpif_lookup(struct ofproto_dpif *, const struct flow *,
- struct flow_wildcards *, struct rule_dpif **rule)
- OVS_ACQ_RDLOCK(*rule);
+ struct flow_wildcards *, struct rule_dpif **rule);
bool rule_dpif_lookup_in_table(struct ofproto_dpif *, const struct flow *,
struct flow_wildcards *, uint8_t table_id,
bool rule_dpif_lookup_in_table(struct ofproto_dpif *, const struct flow *,
struct flow_wildcards *, uint8_t table_id,
- struct rule_dpif **rule)
- OVS_TRY_RDLOCK(true, *rule);
+ struct rule_dpif **rule);
-void rule_dpif_release(struct rule_dpif *rule) OVS_RELEASES(rule);
+void rule_dpif_ref(struct rule_dpif *);
+void rule_dpif_unref(struct rule_dpif *);
void rule_dpif_credit_stats(struct rule_dpif *rule ,
const struct dpif_flow_stats *);
void rule_dpif_credit_stats(struct rule_dpif *rule ,
const struct dpif_flow_stats *);
@@
-86,8
+85,7
@@
void rule_dpif_reduce_timeouts(struct rule_dpif *rule, uint16_t idle_timeout,
void choose_miss_rule(enum ofputil_port_config,
struct rule_dpif *miss_rule,
struct rule_dpif *no_packet_in_rule,
void choose_miss_rule(enum ofputil_port_config,
struct rule_dpif *miss_rule,
struct rule_dpif *no_packet_in_rule,
- struct rule_dpif **rule)
- OVS_ACQ_RDLOCK(*rule);
+ struct rule_dpif **rule);
bool ofproto_has_vlan_splinters(const struct ofproto_dpif *);
ofp_port_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,
bool ofproto_has_vlan_splinters(const struct ofproto_dpif *);
ofp_port_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,