RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-25 04:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: sample: Moves ARGS underlying type from 32 to 64 bits.

Browse Source 
ARG# macros allow to create a list up to 7 in theory but 5 in
practice. The change to a guaranteed 64 bits type increase to
up to 12.
This commit is contained in:
David Carlier 2016-03-15 19:00:35 +00:00 committed by Willy Tarreau
parent 8234f6dae8
commit 15073a3393
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/proto/arg.h
View File

@ -31,22 +31,43 @@
* the number of mandatory arguments in a mask.
*/
#define ARGM(m) \
(m & ARGM_MASK)
(uint64_t)(m & ARGM_MASK)
#define ARG1(m, t1) \
(ARGM(m) + (ARGT_##t1 << (ARGM_BITS)))
(ARGM(m) + ((uint64_t)ARGT_##t1 << (ARGM_BITS)))
#define ARG2(m, t1, t2) \
(ARG1(m, t1) + (ARGT_##t2 << (ARGM_BITS + ARGT_BITS)))
(ARG1(m, t1) + ((uint64_t)ARGT_##t2 << (ARGM_BITS + ARGT_BITS)))
#define ARG3(m, t1, t2, t3) \
(ARG2(m, t1, t2) + (ARGT_##t3 << (ARGM_BITS + ARGT_BITS * 2)))
(ARG2(m, t1, t2) + ((uint64_t)ARGT_##t3 << (ARGM_BITS + ARGT_BITS * 2)))
#define ARG4(m, t1, t2, t3, t4) \
(ARG3(m, t1, t2, t3) + (ARGT_##t4 << (ARGM_BITS + ARGT_BITS * 3)))
(ARG3(m, t1, t2, t3) + ((uint64_t)ARGT_##t4 << (ARGM_BITS + ARGT_BITS * 3)))
#define ARG5(m, t1, t2, t3, t4, t5) \
(ARG4(m, t1, t2, t3, t4) + (ARGT_##t5 << (ARGM_BITS + ARGT_BITS * 4)))
(ARG4(m, t1, t2, t3, t4) + ((uint64_t)ARGT_##t5 << (ARGM_BITS + ARGT_BITS * 4)))
#define ARG6(m, t1, t2, t3, t4, t5, t6) \
(ARG5(m, t1, t2, t3, t4, t5) + ((uint64_t)ARGT_##t6 << (ARGM_BITS + ARGT_BITS * 5)))
#define ARG7(m, t1, t2, t3, t4, t5, t6, t7) \
(ARG6(m, t1, t2, t3, t4, t5, t6) + ((uint64_t)ARGT_##t7 << (ARGM_BITS + ARGT_BITS * 6)))
#define ARG8(m, t1, t2, t3, t4, t5, t6, t7, t8) \
(ARG7(m, t1, t2, t3, t4, t5, t6, t7) + ((uint64_t)ARGT_##t8 << (ARGM_BITS + ARGT_BITS * 7)))
#define ARG9(m, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
(ARG8(m, t1, t2, t3, t4, t5, t6, t7, t8) + ((uint64_t)ARGT_##t9 << (ARGM_BITS + ARGT_BITS * 8)))
#define ARG10(m, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) \
(ARG9(m, t1, t2, t3, t4, t5, t6, t7, t8, t9) + ((uint64_t)ARGT_##t10 << (ARGM_BITS + ARGT_BITS * 9)))
#define ARG11(m, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11) \
(ARG10(m, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) + ((uint64_t)ARGT_##t11 << (ARGM_BITS + ARGT_BITS * 10)))
#define ARG12(m, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) \
(ARG11(m, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11) + ((uint64_t)ARGT_##t12 << (ARGM_BITS + ARGT_BITS * 11)))
/* Mapping between argument number and literal description. */
extern const char *arg_type_names[];
@ -58,7 +79,7 @@ extern struct arg empty_arg_list[ARGM_NBARGS];
struct arg_list *arg_list_clone(const struct arg_list *orig);
struct arg_list *arg_list_add(struct arg_list *orig, struct arg *arg, int pos);
int make_arg_list(const char *in, int len, unsigned int mask, struct arg **argp,
int make_arg_list(const char *in, int len, uint64_t mask, struct arg **argp,
char **err_msg, const char **err_ptr, int *err_arg,
struct arg_list *al);

6
include/types/arg.h
View File

@ -35,12 +35,12 @@
#define ARGT_NBTYPES (1 << ARGT_BITS)
#define ARGT_MASK (ARGT_NBTYPES - 1)
/* encoding of the arg count : up to 5 args are possible. 4 bits are left
/* encoding of the arg count : up to 12 args are possible. 4 bits are left
* unused at the top.
*/
#define ARGM_MASK ((1 << ARGM_BITS) - 1)
#define ARGM_BITS 3
#define ARGM_NBARGS (32 - ARGM_BITS) / sizeof(int)
#define ARGM_BITS 4
#define ARGM_NBARGS (sizeof(uint64_t) * 8 - ARGM_BITS) / ARGT_BITS
enum {
ARGT_STOP = 0, /* end of the arg list */

4
include/types/sample.h
View File

@ -280,7 +280,7 @@ struct sample_conv {
int (*process)(const struct arg *arg_p,
struct sample *smp,
void *private); /* process function */
unsigned int arg_mask; /* arguments (ARG*()) */
uint64_t arg_mask; /* arguments (ARG*()) */
int (*val_args)(struct arg *arg_p,
struct sample_conv *smp_conv,
const char *file, int line,
@ -304,7 +304,7 @@ struct sample_fetch {
struct sample *smp,
const char *kw, /* fetch processing function */
void *private); /* private value. */
unsigned int arg_mask; /* arguments (ARG*()) */
uint64_t arg_mask; /* arguments (ARG*()) */
int (*val_args)(struct arg *arg_p,
char **err_msg); /* argument validation function */
unsigned long out_type; /* output sample type */

2
src/arg.c
View File

@ -91,7 +91,7 @@ struct arg_list *arg_list_add(struct arg_list *orig, struct arg *arg, int pos)
* argument type in each subsequent ARGT_BITS-bit sblock. If <err_msg> is not
* NULL, it must point to a freeable or NULL pointer.
*/
int make_arg_list(const char *in, int len, unsigned int mask, struct arg **argp,
int make_arg_list(const char *in, int len, uint64_t mask, struct arg **argp,
char **err_msg, const char **err_ptr, int *err_arg,
struct arg_list *al)
{