RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-09 18:51:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: pattern: Rename "pat_idx_elt" to "pattern_tree"

Browse Source 
This is just for having coherent struct names.
This commit is contained in:
Thierry FOURNIER 2013-12-13 16:09:50 +01:00 committed by Willy Tarreau
parent edc15c3a35
commit e1bcac5b8f
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/proto/pattern.h
View File

@ -58,7 +58,7 @@ static inline int pat_find_match_name(const char *name)
* associated to the matching patterned will be put there. The function returns * associated to the matching patterned will be put there. The function returns
* PAT_MATCH or PAT_NOMATCH. * PAT_MATCH or PAT_NOMATCH.
*/ */
enum pat_match_res pattern_exec_match(struct pattern_expr *expr, struct sample *smp, struct sample_storage **sample, struct pattern **pat, struct pat_idx_elt **elt); enum pat_match_res pattern_exec_match(struct pattern_expr *expr, struct sample *smp, struct sample_storage **sample, struct pattern **pat, struct pattern_tree **elt);
/* /*
* *
@ -160,7 +160,7 @@ int pattern_read_from_file(struct pattern_expr *expr, const char *filename, int
void pattern_free(struct pattern_list *pat); void pattern_free(struct pattern_list *pat);
void pattern_prune_expr(struct pattern_expr *expr); void pattern_prune_expr(struct pattern_expr *expr);
void pattern_init_expr(struct pattern_expr *expr); void pattern_init_expr(struct pattern_expr *expr);
int pattern_lookup(const char *args, struct pattern_expr *expr, struct pattern_list **pat_elt, struct pat_idx_elt **idx_elt, char **err); int pattern_lookup(const char *args, struct pattern_expr *expr, struct pattern_list **pat_elt, struct pattern_tree **idx_elt, char **err);
#endif #endif

2
include/types/pattern.h
View File

@ -97,7 +97,7 @@ struct pat_time {
/* This contain each tree indexed entry. This struct permit to associate /* This contain each tree indexed entry. This struct permit to associate
* "sample" with a tree entry. It is used with maps. * "sample" with a tree entry. It is used with maps.
*/ */
struct pat_idx_elt { struct pattern_tree {
struct sample_storage *smp; struct sample_storage *smp;
struct ebmb_node node; struct ebmb_node node;
}; };

6
src/dumpstats.c
View File

@ -1561,7 +1561,7 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
} }
else if (strcmp(args[1], "map") == 0) { else if (strcmp(args[1], "map") == 0) {
struct pattern_list *pat_elt; struct pattern_list *pat_elt;
struct pat_idx_elt *idx_elt; struct pattern_tree *idx_elt;
char *value = NULL; char *value = NULL;
/* Expect three parameters: map name, key and new value. */ /* Expect three parameters: map name, key and new value. */
@ -1849,7 +1849,7 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
else if (strcmp(args[0], "del") == 0) { else if (strcmp(args[0], "del") == 0) {
if (strcmp(args[1], "map") == 0) { if (strcmp(args[1], "map") == 0) {
struct pattern_list *pat_elt; struct pattern_list *pat_elt;
struct pat_idx_elt *idx_elt; struct pattern_tree *idx_elt;
struct map_entry *ent; struct map_entry *ent;
/* Expect two parameters: map name and key. */ /* Expect two parameters: map name and key. */
@ -4826,7 +4826,7 @@ static int stats_map_lookup(struct stream_interface *si)
struct sample_storage *smp; struct sample_storage *smp;
struct sample sample; struct sample sample;
struct pattern *pat; struct pattern *pat;
struct pat_idx_elt *elt; struct pattern_tree *elt;
enum pat_match_res res; enum pat_match_res res;
struct sockaddr_in addr; struct sockaddr_in addr;
char addr_str[INET_ADDRSTRLEN]; char addr_str[INET_ADDRSTRLEN];

22
src/pattern.c
View File

@ -739,13 +739,13 @@ void free_pattern_list(struct list *head)
void free_pattern_tree(struct eb_root *root) void free_pattern_tree(struct eb_root *root)
{ {
struct eb_node *node, *next; struct eb_node *node, *next;
struct pat_idx_elt *elt; struct pattern_tree *elt;
node = eb_first(root); node = eb_first(root);
while (node) { while (node) {
next = eb_next(node); next = eb_next(node);
eb_delete(node); eb_delete(node);
elt = container_of(node, struct pat_idx_elt, node); elt = container_of(node, struct pattern_tree, node);
free(elt->smp); free(elt->smp);
free(elt); free(elt);
node = next; node = next;
@ -889,7 +889,7 @@ int pat_idx_list_reg(struct pattern_expr *expr, struct pattern *pat, char **err)
int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err) int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err)
{ {
unsigned int mask; unsigned int mask;
struct pat_idx_elt *node; struct pattern_tree *node;
/* Only IPv4 can be indexed */ /* Only IPv4 can be indexed */
if (pat->type == SMP_T_IPV4) { if (pat->type == SMP_T_IPV4) {
@ -930,7 +930,7 @@ int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err)
int pat_idx_tree_str(struct pattern_expr *expr, struct pattern *pat, char **err) int pat_idx_tree_str(struct pattern_expr *expr, struct pattern *pat, char **err)
{ {
int len; int len;
struct pat_idx_elt *node; struct pattern_tree *node;
/* Only string can be indexed */ /* Only string can be indexed */
if (pat->type != SMP_T_CSTR && pat->type != SMP_T_STR) { if (pat->type != SMP_T_CSTR && pat->type != SMP_T_STR) {
@ -1066,12 +1066,12 @@ int pattern_read_from_file(struct pattern_expr *expr,
*/ */
enum pat_match_res pattern_exec_match(struct pattern_expr *expr, struct sample *smp, enum pat_match_res pattern_exec_match(struct pattern_expr *expr, struct sample *smp,
struct sample_storage **sample, struct sample_storage **sample,
struct pattern **pat, struct pat_idx_elt **idx_elt) struct pattern **pat, struct pattern_tree **idx_elt)
{ {
enum pat_match_res pat_res = PAT_NOMATCH; enum pat_match_res pat_res = PAT_NOMATCH;
struct pattern_list *pattern; struct pattern_list *pattern;
struct ebmb_node *node = NULL; struct ebmb_node *node = NULL;
struct pat_idx_elt *elt; struct pattern_tree *elt;
if (expr->match == pat_match_nothing) { if (expr->match == pat_match_nothing) {
if (smp->data.uint) if (smp->data.uint)
@ -1096,7 +1096,7 @@ enum pat_match_res pattern_exec_match(struct pattern_expr *expr, struct sample *
} }
if (node) { if (node) {
pat_res |= PAT_MATCH; pat_res |= PAT_MATCH;
elt = ebmb_entry(node, struct pat_idx_elt, node); elt = ebmb_entry(node, struct pattern_tree, node);
if (sample) if (sample)
*sample = elt->smp; *sample = elt->smp;
if (idx_elt) if (idx_elt)
@ -1126,12 +1126,12 @@ enum pat_match_res pattern_exec_match(struct pattern_expr *expr, struct sample *
* NULL. Pointers are not set if they're passed as NULL. * NULL. Pointers are not set if they're passed as NULL.
*/ */
int pattern_lookup(const char *key, struct pattern_expr *expr, int pattern_lookup(const char *key, struct pattern_expr *expr,
struct pattern_list **pat_elt, struct pat_idx_elt **idx_elt, char **err) struct pattern_list **pat_elt, struct pattern_tree **idx_elt, char **err)
{ {
struct pattern pattern; struct pattern pattern;
struct pattern_list *pat; struct pattern_list *pat;
struct ebmb_node *node; struct ebmb_node *node;
struct pat_idx_elt *elt; struct pattern_tree *elt;
unsigned int mask = 0; unsigned int mask = 0;
/* no real pattern */ /* no real pattern */
@ -1170,7 +1170,7 @@ int pattern_lookup(const char *key, struct pattern_expr *expr,
for (node = ebmb_first(&expr->pattern_tree); for (node = ebmb_first(&expr->pattern_tree);
node; node;
node = ebmb_next(node)) { node = ebmb_next(node)) {
elt = container_of(node, struct pat_idx_elt, node); elt = container_of(node, struct pattern_tree, node);
if (strcmp(pattern.ptr.str, (char *)elt->node.key) == 0) if (strcmp(pattern.ptr.str, (char *)elt->node.key) == 0)
goto found; goto found;
} }
@ -1179,7 +1179,7 @@ int pattern_lookup(const char *key, struct pattern_expr *expr,
for (node = ebmb_first(&expr->pattern_tree); for (node = ebmb_first(&expr->pattern_tree);
node; node;
node = ebmb_next(node)) { node = ebmb_next(node)) {
elt = container_of(node, struct pat_idx_elt, node); elt = container_of(node, struct pattern_tree, node);
if (elt->node.node.pfx == mask && if (elt->node.node.pfx == mask &&
memcmp(&pattern.val.ipv4.addr.s_addr, elt->node.key, 4) == 0) memcmp(&pattern.val.ipv4.addr.s_addr, elt->node.key, 4) == 0)
goto found; goto found;