mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

classifier: Constify fields.

Browse Source 
Some struct cls_match and cls_subtable fields were already documented
of being const.  Make them const and use CONST_CAST where appropriate
to initialize them.

This will help catch future errors modifying those fields after
initialization.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Jarno Rajahalme
2014-10-27 10:57:28 -07:00
parent 98abae4aa6
commit f80028fe28
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/classifier-private.h
View File

@@ -33,22 +33,22 @@ struct cls_subtable {
/* The fields are only used by writers. */
int n_rules OVS_GUARDED; /* Number of rules, including
* duplicates. */
int max_priority OVS_GUARDED; /* Max priority of any rule in subtable. */
int max_priority OVS_GUARDED; /* Max priority of any rule in subtable. */
unsigned int max_count OVS_GUARDED; /* Count of max_priority rules. */
/* These fields are accessed by readers who care about wildcarding. */
tag_type tag; /* Tag generated from mask for partitioning (const). */
uint8_t n_indices; /* How many indices to use (const). */
uint8_t index_ofs[CLS_MAX_INDICES]; /* u32 segment boundaries (const). */
const tag_type tag; /* Tag generated from mask for partitioning. */
const uint8_t n_indices; /* How many indices to use. */
const uint8_t index_ofs[CLS_MAX_INDICES]; /* u32 segment boundaries. */
unsigned int trie_plen[CLS_MAX_TRIES]; /* Trie prefix length in 'mask'
* (runtime configurable). */
int ports_mask_len; /* (const) */
const int ports_mask_len;
struct cmap indices[CLS_MAX_INDICES]; /* Staged lookup indices. */
rcu_trie_ptr ports_trie; /* NULL if none. */
/* These fields are accessed by all readers. */
struct cmap rules; /* Contains "struct cls_rule"s. */
struct minimask mask; /* Wildcards for fields (const). */
struct cmap rules; /* Contains 'cls_match'es. */
const struct minimask mask; /* Wildcards for fields. */
/* 'mask' must be the last field. */
};
@@ -64,20 +64,20 @@ struct cls_partition {
/* Internal representation of a rule in a "struct cls_subtable". */
struct cls_match {
/* Accessed only by writers and iterators. */
/* Accessed by everybody. */
struct rculist list OVS_GUARDED; /* Identical, lower-priority rules. */
/* Accessed only by writers. */
struct cls_partition *partition OVS_GUARDED;
/* Accessed by readers interested in wildcarding. */
int priority; /* Larger numbers are higher priorities. */
const int priority; /* Larger numbers are higher priorities. */
struct cmap_node index_nodes[CLS_MAX_INDICES]; /* Within subtable's
* 'indices'. */
/* Accessed by all readers. */
struct cmap_node cmap_node; /* Within struct cls_subtable 'rules'. */
struct cls_rule *cls_rule;
struct miniflow flow; /* Matching rule. Mask is in the subtable. */
const struct cls_rule *cls_rule;
const struct miniflow flow; /* Matching rule. Mask is in the subtable. */
/* 'flow' must be the last field. */
};