RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-25 23:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: samples: rename some struct member from "smp" to "data"

Browse Source 
This members contains data and not sample.
This commit is contained in:
Thierry FOURNIER 2015-08-19 08:35:43 +02:00 committed by Willy Tarreau
parent 12ba0c29d6
commit 503bb09873
6 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/map.h
View File

@ -25,10 +25,10 @@
#include <types/map.h>
/* maps output sample parser */
int map_parse_ip(const char *text, struct sample_data *smp);
int map_parse_ip6(const char *text, struct sample_data *smp);
int map_parse_str(const char *text, struct sample_data *smp);
int map_parse_int(const char *text, struct sample_data *smp);
int map_parse_ip(const char *text, struct sample_data *data);
int map_parse_ip6(const char *text, struct sample_data *data);
int map_parse_str(const char *text, struct sample_data *data);
int map_parse_int(const char *text, struct sample_data *data);
struct map_reference *map_get_reference(const char *reference);

6
include/types/pattern.h
View File

@ -129,7 +129,7 @@ struct pat_time {
* "sample" with a tree entry. It is used with maps.
*/
struct pattern_tree {
struct sample_data *smp;
struct sample_data *data;
struct pat_ref_elt *ref;
struct ebmb_node node;
};
@ -168,7 +168,7 @@ struct pattern {
} ptr; /* indirect values, allocated */
int len; /* data length when required */
int sflags; /* flags relative to the storage method. */
struct sample_data *smp; /* used to store a pointer to sample value associated
struct sample_data *data; /* used to store a pointer to sample value associated
with the match. It is used with maps */
struct pat_ref_elt *ref;
};
@ -212,7 +212,7 @@ struct pattern_expr_list {
/* This struct contain a list of pattern expr */
struct pattern_head {
int (*parse)(const char *text, struct pattern *pattern, int flags, char **err);
int (*parse_smp)(const char *text, struct sample_data *smp);
int (*parse_smp)(const char *text, struct sample_data *data);
int (*index)(struct pattern_expr *, struct pattern *, char **);
void (*delete)(struct pattern_expr *, struct pat_ref_elt *);
void (*prune)(struct pattern_expr *);

2
src/dumpstats.c
View File

@ -5696,7 +5696,7 @@ static int stats_map_lookup(struct stream_interface *si)
/* display return value */
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
if (pat->smp && pat->ref && pat->ref->sample)
if (pat->data && pat->ref && pat->ref->sample)
chunk_appendf(&trash, ", value=\"%s\", type=\"%s\"", pat->ref->sample,
smp_to_type[appctx->ctx.map.desc->conv->out_type]);
else

4
src/hlua.c
View File

@ -1379,7 +1379,7 @@ __LJMP static inline int _hlua_map_lookup(struct lua_State *L, int str)
}
pat = pattern_exec_match(&desc->pat, &smp, 1);
if (!pat || !pat->smp) {
if (!pat || !pat->data) {
if (str)
lua_pushstring(L, "");
else
@ -1388,7 +1388,7 @@ __LJMP static inline int _hlua_map_lookup(struct lua_State *L, int str)
}
/* The Lua pattern must return a string, so we can't check the returned type */
lua_pushlstring(L, pat->smp->data.str.str, pat->smp->data.str.len);
lua_pushlstring(L, pat->data->data.str.str, pat->data->data.str.len);
return 1;
}

34
src/map.c
View File

@ -27,22 +27,22 @@
/* Parse an IPv4 address and store it into the sample.
* The output type is IPV4.
*/
int map_parse_ip(const char *text, struct sample_data *smp)
int map_parse_ip(const char *text, struct sample_data *data)
{
if (!buf2ip(text, strlen(text), &smp->data.ipv4))
if (!buf2ip(text, strlen(text), &data->data.ipv4))
return 0;
smp->type = SMP_T_IPV4;
data->type = SMP_T_IPV4;
return 1;
}
/* Parse an IPv6 address and store it into the sample.
* The output type is IPV6.
*/
int map_parse_ip6(const char *text, struct sample_data *smp)
int map_parse_ip6(const char *text, struct sample_data *data)
{
if (!buf2ip6(text, strlen(text), &smp->data.ipv6))
if (!buf2ip6(text, strlen(text), &data->data.ipv6))
return 0;
smp->type = SMP_T_IPV6;
data->type = SMP_T_IPV6;
return 1;
}
@ -52,12 +52,12 @@ int map_parse_ip6(const char *text, struct sample_data *smp)
* overwritten because sample_conv_map() makes a const sample with this
* output.
*/
int map_parse_str(const char *text, struct sample_data *smp)
int map_parse_str(const char *text, struct sample_data *data)
{
smp->data.str.str = (char *)text;
smp->data.str.len = strlen(text);
smp->data.str.size = smp->data.str.len + 1;
smp->type = SMP_T_STR;
data->data.str.str = (char *)text;
data->data.str.len = strlen(text);
data->data.str.size = data->data.str.len + 1;
data->type = SMP_T_STR;
return 1;
}
@ -65,10 +65,10 @@ int map_parse_str(const char *text, struct sample_data *smp)
* number is negative, or UINT if it is positive or null. The function returns
* zero (error) if the number is too large.
*/
int map_parse_int(const char *text, struct sample_data *smp)
int map_parse_int(const char *text, struct sample_data *data)
{
smp->type = SMP_T_SINT;
smp->data.sint = read_int64(&text, text + strlen(text));
data->type = SMP_T_SINT;
data->data.sint = read_int64(&text, text + strlen(text));
if (*text != '\0')
return 0;
return 1;
@ -160,10 +160,10 @@ static int sample_conv_map(const struct arg *arg_p, struct sample *smp, void *pr
/* Match case. */
if (pat) {
/* Copy sample. */
if (pat->smp) {
smp->type = pat->smp->type;
if (pat->data) {
smp->type = pat->data->type;
smp->flags |= SMP_F_CONST;
memcpy(&smp->data, &pat->smp->data, sizeof(smp->data));
memcpy(&smp->data, &pat->data->data, sizeof(smp->data));
return 1;
}

76
src/pattern.c
View File

@ -427,7 +427,7 @@ struct pattern *pat_match_nothing(struct sample *smp, struct pattern_expr *expr,
{
if (smp->data.sint) {
if (fill) {
static_pattern.smp = NULL;
static_pattern.data = NULL;
static_pattern.ref = NULL;
static_pattern.type = 0;
static_pattern.ptr.str = NULL;
@ -464,7 +464,7 @@ struct pattern *pat_match_str(struct sample *smp, struct pattern_expr *expr, int
if (node) {
if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp;
static_pattern.data = elt->data;
static_pattern.ref = elt->ref;
static_pattern.sflags = PAT_SF_TREE;
static_pattern.type = SMP_T_STR;
@ -598,7 +598,7 @@ struct pattern *pat_match_beg(struct sample *smp, struct pattern_expr *expr, int
if (node) {
if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp;
static_pattern.data = elt->data;
static_pattern.ref = elt->ref;
static_pattern.sflags = PAT_SF_TREE;
static_pattern.type = SMP_T_STR;
@ -874,7 +874,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (node) {
if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp;
static_pattern.data = elt->data;
static_pattern.ref = elt->ref;
static_pattern.sflags = PAT_SF_TREE;
static_pattern.type = SMP_T_IPV4;
@ -896,7 +896,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (node) {
if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp;
static_pattern.data = elt->data;
static_pattern.ref = elt->ref;
static_pattern.sflags = PAT_SF_TREE;
static_pattern.type = SMP_T_IPV6;
@ -916,7 +916,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (node) {
if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp;
static_pattern.data = elt->data;
static_pattern.ref = elt->ref;
static_pattern.sflags = PAT_SF_TREE;
static_pattern.type = SMP_T_IPV6;
@ -950,7 +950,7 @@ struct pattern *pat_match_ip(struct sample *smp, struct pattern_expr *expr, int
if (node) {
if (fill) {
elt = ebmb_entry(node, struct pattern_tree, node);
static_pattern.smp = elt->smp;
static_pattern.data = elt->data;
static_pattern.ref = elt->ref;
static_pattern.sflags = PAT_SF_TREE;
static_pattern.type = SMP_T_IPV4;
@ -1009,7 +1009,7 @@ void free_pattern_tree(struct eb_root *root)
next = eb_next(node);
eb_delete(node);
elt = container_of(node, struct pattern_tree, node);
free(elt->smp);
free(elt->data);
free(elt);
node = next;
}
@ -1020,7 +1020,7 @@ void pat_prune_val(struct pattern_expr *expr)
struct pattern_list *pat, *tmp;
list_for_each_entry_safe(pat, tmp, &expr->patterns, list) {
free(pat->pat.smp);
free(pat->pat.data);
free(pat);
}
@ -1035,7 +1035,7 @@ void pat_prune_ptr(struct pattern_expr *expr)
list_for_each_entry_safe(pat, tmp, &expr->patterns, list) {
free(pat->pat.ptr.ptr);
free(pat->pat.smp);
free(pat->pat.data);
free(pat);
}
@ -1050,7 +1050,7 @@ void pat_prune_reg(struct pattern_expr *expr)
list_for_each_entry_safe(pat, tmp, &expr->patterns, list) {
regex_free(pat->pat.ptr.ptr);
free(pat->pat.smp);
free(pat->pat.data);
free(pat);
}
@ -1207,7 +1207,7 @@ int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err)
}
/* copy the pointer to sample associated to this node */
node->smp = pat->smp;
node->data = pat->data;
node->ref = pat->ref;
/* FIXME: insert <addr>/<mask> into the tree here */
@ -1235,7 +1235,7 @@ int pat_idx_tree_ip(struct pattern_expr *expr, struct pattern *pat, char **err)
}
/* copy the pointer to sample associated to this node */
node->smp = pat->smp;
node->data = pat->data;
node->ref = pat->ref;
/* FIXME: insert <addr>/<mask> into the tree here */
@ -1280,7 +1280,7 @@ int pat_idx_tree_str(struct pattern_expr *expr, struct pattern *pat, char **err)
}
/* copy the pointer to sample associated to this node */
node->smp = pat->smp;
node->data = pat->data;
node->ref = pat->ref;
/* copy the string */
@ -1321,7 +1321,7 @@ int pat_idx_tree_pfx(struct pattern_expr *expr, struct pattern *pat, char **err)
}
/* copy the pointer to sample associated to this node */
node->smp = pat->smp;
node->data = pat->data;
node->ref = pat->ref;
/* copy the string and the trailing zero */
@ -1348,7 +1348,7 @@ void pat_del_list_val(struct pattern_expr *expr, struct pat_ref_elt *ref)
/* Delete and free entry. */
LIST_DEL(&pat->list);
free(pat->pat.smp);
free(pat->pat.data);
free(pat);
}
expr->revision = rdtsc();
@ -1372,7 +1372,7 @@ void pat_del_tree_ip(struct pattern_expr *expr, struct pat_ref_elt *ref)
/* Delete and free entry. */
ebmb_delete(node);
free(elt->smp);
free(elt->data);
free(elt);
}
@ -1392,7 +1392,7 @@ void pat_del_tree_ip(struct pattern_expr *expr, struct pat_ref_elt *ref)
/* Delete and free entry. */
ebmb_delete(node);
free(elt->smp);
free(elt->data);
free(elt);
}
expr->revision = rdtsc();
@ -1411,7 +1411,7 @@ void pat_del_list_ptr(struct pattern_expr *expr, struct pat_ref_elt *ref)
/* Delete and free entry. */
LIST_DEL(&pat->list);
free(pat->pat.ptr.ptr);
free(pat->pat.smp);
free(pat->pat.data);
free(pat);
}
expr->revision = rdtsc();
@ -1439,7 +1439,7 @@ void pat_del_tree_str(struct pattern_expr *expr, struct pat_ref_elt *ref)
/* Delete and free entry. */
ebmb_delete(node);
free(elt->smp);
free(elt->data);
free(elt);
}
expr->revision = rdtsc();
@ -1458,7 +1458,7 @@ void pat_del_list_reg(struct pattern_expr *expr, struct pat_ref_elt *ref)
/* Delete and free entry. */
LIST_DEL(&pat->list);
regex_free(pat->pat.ptr.ptr);
free(pat->pat.smp);
free(pat->pat.data);
free(pat);
}
expr->revision = rdtsc();
@ -1606,7 +1606,7 @@ static inline int pat_ref_set_elt(struct pat_ref *ref, struct pat_ref_elt *elt,
const char *value, char **err)
{
struct pattern_expr *expr;
struct sample_data **smp;
struct sample_data **data;
char *sample;
struct sample_data test;
@ -1637,9 +1637,9 @@ static inline int pat_ref_set_elt(struct pat_ref *ref, struct pat_ref_elt *elt,
if (!expr->pat_head->parse_smp)
continue;
smp = pattern_find_smp(expr, elt);
if (smp && *smp && !expr->pat_head->parse_smp(sample, *smp))
*smp = NULL;
data = pattern_find_smp(expr, elt);
if (data && *data && !expr->pat_head->parse_smp(sample, *data))
*data = NULL;
}
return 1;
@ -1823,41 +1823,41 @@ static inline
int pat_ref_push(struct pat_ref_elt *elt, struct pattern_expr *expr,
int patflags, char **err)
{
struct sample_data *smp;
struct sample_data *data;
struct pattern pattern;
/* Create sample */
if (elt->sample && expr->pat_head->parse_smp) {
/* New sample. */
smp = malloc(sizeof(*smp));
if (!smp)
data = malloc(sizeof(*data));
if (!data)
return 0;
/* Parse value. */
if (!expr->pat_head->parse_smp(elt->sample, smp)) {
if (!expr->pat_head->parse_smp(elt->sample, data)) {
memprintf(err, "unable to parse '%s'", elt->sample);
free(smp);
free(data);
return 0;
}
}
else
smp = NULL;
data = NULL;
/* initialise pattern */
memset(&pattern, 0, sizeof(pattern));
pattern.smp = smp;
pattern.data = data;
pattern.ref = elt;
/* parse pattern */
if (!expr->pat_head->parse(elt->pattern, &pattern, expr->mflags, err)) {
free(smp);
free(data);
return 0;
}
/* index pattern */
if (!expr->pat_head->index(expr, &pattern, err)) {
free(smp);
free(data);
return 0;
}
@ -2334,7 +2334,7 @@ struct pattern *pattern_exec_match(struct pattern_head *head, struct sample *smp
if (!head->match) {
if (fill) {
static_pattern.smp = NULL;
static_pattern.data = NULL;
static_pattern.ref = NULL;
static_pattern.sflags = 0;
static_pattern.type = SMP_T_SINT;
@ -2387,7 +2387,7 @@ struct sample_data **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_
node = ebmb_next(node)) {
elt = container_of(node, struct pattern_tree, node);
if (elt->ref == ref)
return &elt->smp;
return &elt->data;
}
for (node = ebmb_first(&expr->pattern_tree_2);
@ -2395,12 +2395,12 @@ struct sample_data **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_
node = ebmb_next(node)) {
elt = container_of(node, struct pattern_tree, node);
if (elt->ref == ref)
return &elt->smp;
return &elt->data;
}
list_for_each_entry(pat, &expr->patterns, list)
if (pat->pat.ref == ref)
return &pat->pat.smp;
return &pat->pat.data;
return NULL;
}