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

lib/classifier: Unify struct classifier and cls_classifier.

Browse Source 
Now that it is clear that struct cls_classifier itself does not
need RCU indirection and pvector is defined in its own header, it
is possible get rid of the indirection from struct classifier to
struct cls_classifier.

Suggested-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Jarno Rajahalme
2014-07-18 02:24:26 -07:00
parent 033e9df25f
commit e48eccd133
3 changed files with 76 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/classifier.h
View File

@@ -216,23 +216,43 @@
#include "cmap.h"
#include "match.h"
#include "meta-flow.h"
#include "ovs-thread.h"
#include "pvector.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Classifier internal data structures. */
struct cls_classifier;
struct cls_subtable;
struct cls_match;
struct trie_node;
typedef OVSRCU_TYPE(struct trie_node *) rcu_trie_ptr;
/* Prefix trie for a 'field' */
struct cls_trie {
const struct mf_field *field; /* Trie field, or NULL. */
rcu_trie_ptr root; /* NULL if none. */
};
enum {
CLS_MAX_TRIES = 3 /* Maximum number of prefix trees per classifier. */
CLS_MAX_INDICES = 3, /* Maximum number of lookup indices per subtable. */
CLS_MAX_TRIES = 3 /* Maximum number of prefix trees per classifier. */
};
/* A flow classifier. */
struct classifier {
struct cls_classifier *cls;
struct ovs_mutex mutex;
int n_rules OVS_GUARDED; /* Total number of rules. */
uint8_t n_flow_segments;
uint8_t flow_segments[CLS_MAX_INDICES]; /* Flow segment boundaries to use
* for staged lookup. */
struct cmap subtables_map; /* Contains "struct cls_subtable"s. */
struct pvector subtables;
struct cmap partitions; /* Contains "struct cls_partition"s. */
struct cls_trie tries[CLS_MAX_TRIES]; /* Prefix tries. */
unsigned int n_tries;
};
/* A rule to be inserted to the classifier. */
@@ -291,7 +311,7 @@ struct cls_rule *classifier_find_match_exactly(const struct classifier *,
/* Iteration. */
struct cls_cursor {
const struct cls_classifier *cls;
const struct classifier *cls;
const struct cls_subtable *subtable;
const struct cls_rule *target;
struct cmap_cursor subtables;
@@ -299,7 +319,6 @@ struct cls_cursor {
bool safe;
};
/* Iteration requires mutual exclusion of writers. We do this by taking
* a mutex for the duration of the iteration, except for the
* 'SAFE' variant, where we release the mutex for the body of the loop. */