RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-14 17:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: session: move the stick counters declarations to stick_table.h

Browse Source 
They're really not appropriate in session.h as they always require a
stick table, and I'm having a hard time finding them each time I need
to.
This commit is contained in:
Willy Tarreau 2014-06-25 18:30:01 +02:00
parent 3745950a6b
commit 5ed1bbfc75
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/types/session.h
View File

@ -91,20 +91,6 @@
#define SN_COMP_READY 0x00100000 /* the compression is initialized */ #define SN_COMP_READY 0x00100000 /* the compression is initialized */
#define SN_SRV_REUSED 0x00200000 /* the server-side connection was reused */ #define SN_SRV_REUSED 0x00200000 /* the server-side connection was reused */
/* WARNING: if new fields are added, they must be initialized in session_accept()
* and freed in session_free() !
*/
#define STKCTR_TRACK_BACKEND 1
#define STKCTR_TRACK_CONTENT 2
/* stick counter. The <entry> member is a composite address (caddr) made of a
* pointer to an stksess struct, and two flags among STKCTR_TRACK_* above.
*/
struct stkctr {
unsigned long entry; /* entry containing counters currently being tracked by this session */
struct stktable *table; /* table the counters above belong to (undefined if counters are null) */
};
/* /*
* Note: some session flags have dependencies : * Note: some session flags have dependencies :
* - SN_DIRECT cannot exist without SN_ASSIGNED, because a server is * - SN_DIRECT cannot exist without SN_ASSIGNED, because a server is
@ -171,16 +157,6 @@ struct session {
char *unique_id; /* custom unique ID */ char *unique_id; /* custom unique ID */
}; };
/* parameters to configure tracked counters */
struct track_ctr_prm {
struct sample_expr *expr; /* expression used as the key */
union {
struct stktable *t; /* a pointer to the table */
char *n; /* or its name during parsing. */
} table;
};
#endif /* _TYPES_SESSION_H */ #endif /* _TYPES_SESSION_H */
/* /*

23
include/types/stick_table.h
View File

@ -193,4 +193,27 @@ struct stktable_key {
union stktable_key_data data; /* data, must always be last */ union stktable_key_data data; /* data, must always be last */
}; };
/* WARNING: if new fields are added, they must be initialized in session_accept()
* and freed in session_free() !
*/
#define STKCTR_TRACK_BACKEND 1
#define STKCTR_TRACK_CONTENT 2
/* stick counter. The <entry> member is a composite address (caddr) made of a
* pointer to an stksess struct, and two flags among STKCTR_TRACK_* above.
*/
struct stkctr {
unsigned long entry; /* entry containing counters currently being tracked by this session */
struct stktable *table; /* table the counters above belong to (undefined if counters are null) */
};
/* parameters to configure tracked counters */
struct track_ctr_prm {
struct sample_expr *expr; /* expression used as the key */
union {
struct stktable *t; /* a pointer to the table */
char *n; /* or its name during parsing. */
} table;
};
#endif /* _TYPES_STICK_TABLE_H */ #endif /* _TYPES_STICK_TABLE_H */