mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-08 03:01:14 +01:00
Code Issues Projects Releases Wiki Activity

DIET/MINOR: http: reduce the size of struct http_txn by 8 bytes

Browse Source 
Here again we had some oversized and misaligned entries. The method
and the status don't need 4 bytes each, and there was a hole after
the status that does not exist anymore. That's 8 additional bytes
saved from http_txn and as much for the session.

Also some fields were slightly moved to present better memory access
patterns resulting in a steady 0.5% performance increase.
This commit is contained in:
Willy Tarreau 2013-12-06 23:43:17 +01:00
parent 721854f0ac
commit c8987b3664
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/types/proto_http.h
View File

@ -217,7 +217,7 @@ enum {
}; };
/* Known HTTP methods */ /* Known HTTP methods */
typedef enum { enum http_meth_t {
HTTP_METH_NONE = 0, HTTP_METH_NONE = 0,
HTTP_METH_OPTIONS, HTTP_METH_OPTIONS,
HTTP_METH_GET, HTTP_METH_GET,
@ -228,7 +228,7 @@ typedef enum {
HTTP_METH_TRACE, HTTP_METH_TRACE,
HTTP_METH_CONNECT, HTTP_METH_CONNECT,
HTTP_METH_OTHER, HTTP_METH_OTHER,
} http_meth_t; } __attribute__((packed));
enum { enum {
HTTP_AUTH_WRONG = -1, /* missing or unknown */ HTTP_AUTH_WRONG = -1, /* missing or unknown */
@ -405,13 +405,13 @@ struct http_res_rule {
* response message (which can be empty). * response message (which can be empty).
*/ */
struct http_txn { struct http_txn {
struct http_msg req; /* HTTP request message */
struct hdr_idx hdr_idx; /* array of header indexes (max: global.tune.max_http_hdr) */ struct hdr_idx hdr_idx; /* array of header indexes (max: global.tune.max_http_hdr) */
unsigned int flags; /* transaction flags */
http_meth_t meth; /* HTTP method */
int status; /* HTTP status from the server, negative if from proxy */
struct http_msg rsp; /* HTTP response message */ struct http_msg rsp; /* HTTP response message */
struct http_msg req; /* HTTP request message */
unsigned int flags; /* transaction flags */
enum http_meth_t meth; /* HTTP method */
/* 1 unused byte here */
short status; /* HTTP status from the server, negative if from proxy */
char *uri; /* first line if log needed, NULL otherwise */ char *uri; /* first line if log needed, NULL otherwise */
char *cli_cookie; /* cookie presented by the client, in capture mode */ char *cli_cookie; /* cookie presented by the client, in capture mode */

4
src/proto_http.c
View File

@ -294,7 +294,7 @@ void init_proto_http()
* up to 3 entries (2 valid, 1 null). * up to 3 entries (2 valid, 1 null).
*/ */
struct http_method_desc { struct http_method_desc {
http_meth_t meth; enum http_meth_t meth;
int len; int len;
const char text[8]; const char text[8];
}; };
@ -767,7 +767,7 @@ struct chunk *http_error_message(struct session *s, int msgnum)
* returns HTTP_METH_NONE if there is nothing valid to read (empty or non-text * returns HTTP_METH_NONE if there is nothing valid to read (empty or non-text
* string), HTTP_METH_OTHER for unknown methods, or the identified method. * string), HTTP_METH_OTHER for unknown methods, or the identified method.
*/ */
static http_meth_t find_http_meth(const char *str, const int len) static enum http_meth_t find_http_meth(const char *str, const int len)
{ {
unsigned char m; unsigned char m;
const struct http_method_desc *h; const struct http_method_desc *h;