projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
classifier: Use fat_rwlock instead of ovs_rwlock.
[cascardo/ovs.git]
/
ofproto
/
ofproto-dpif.c
diff --git
a/ofproto/ofproto-dpif.c
b/ofproto/ofproto-dpif.c
index
59af464
..
3493fed
100644
(file)
--- a/
ofproto/ofproto-dpif.c
+++ b/
ofproto/ofproto-dpif.c
@@
-1044,9
+1044,9
@@
destruct(struct ofproto *ofproto_)
OFPROTO_FOR_EACH_TABLE (table, &ofproto->up) {
struct cls_cursor cursor;
OFPROTO_FOR_EACH_TABLE (table, &ofproto->up) {
struct cls_cursor cursor;
-
ovs
_rwlock_rdlock(&table->cls.rwlock);
+
fat
_rwlock_rdlock(&table->cls.rwlock);
cls_cursor_init(&cursor, &table->cls, NULL);
cls_cursor_init(&cursor, &table->cls, NULL);
-
ovs
_rwlock_unlock(&table->cls.rwlock);
+
fat
_rwlock_unlock(&table->cls.rwlock);
CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, up.cr, &cursor) {
ofproto_rule_delete(&ofproto->up, &rule->up);
}
CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, up.cr, &cursor) {
ofproto_rule_delete(&ofproto->up, &rule->up);
}
@@
-2925,7
+2925,7
@@
rule_dpif_lookup_in_table(struct ofproto_dpif *ofproto,
}
cls = &ofproto->up.tables[table_id].cls;
}
cls = &ofproto->up.tables[table_id].cls;
-
ovs
_rwlock_rdlock(&cls->rwlock);
+
fat
_rwlock_rdlock(&cls->rwlock);
frag = (flow->nw_frag & FLOW_NW_FRAG_ANY) != 0;
if (frag && ofproto->up.frag_handling == OFPC_FRAG_NORMAL) {
/* We must pretend that transport ports are unavailable. */
frag = (flow->nw_frag & FLOW_NW_FRAG_ANY) != 0;
if (frag && ofproto->up.frag_handling == OFPC_FRAG_NORMAL) {
/* We must pretend that transport ports are unavailable. */
@@
-2942,7
+2942,7
@@
rule_dpif_lookup_in_table(struct ofproto_dpif *ofproto,
*rule = rule_dpif_cast(rule_from_cls_rule(cls_rule));
rule_dpif_ref(*rule);
*rule = rule_dpif_cast(rule_from_cls_rule(cls_rule));
rule_dpif_ref(*rule);
-
ovs
_rwlock_unlock(&cls->rwlock);
+
fat
_rwlock_unlock(&cls->rwlock);
return *rule != NULL;
}
return *rule != NULL;
}