From: Willy Tarreau Date: Sun, 4 Oct 2009 12:24:59 +0000 (+0200) Subject: [MINOR] remove now obsolete ana_state from the session struct X-Git-Tag: v1.4-dev4~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65671abd32cf6247100446ac8c570c41482c357a;p=thirdparty%2Fhaproxy.git [MINOR] remove now obsolete ana_state from the session struct This one is not used anymore. --- diff --git a/include/types/session.h b/include/types/session.h index 356bdee61b..226e00c985 100644 --- a/include/types/session.h +++ b/include/types/session.h @@ -173,7 +173,6 @@ struct session { struct server *prev_srv; /* the server the was running on, after a redispatch, otherwise NULL */ struct pendconn *pend_pos; /* if not NULL, points to the position in the pending queue */ struct http_txn txn; /* current HTTP transaction being processed. Should become a list. */ - int ana_state; /* analyser state, used by analysers, always set to zero between them */ struct { int logwait; /* log fields waiting to be collected : LW_* */ struct timeval accept_date; /* date of the accept() in user date */ diff --git a/src/client.c b/src/client.c index ba58182ed2..ec768d81a6 100644 --- a/src/client.c +++ b/src/client.c @@ -184,7 +184,6 @@ int event_accept(int fd) { */ s->be = s->fe = p; - s->ana_state = 0; /* analysers may change it but must reset it upon exit */ s->req = s->rep = NULL; /* will be allocated later */ s->si[0].state = s->si[0].prev_state = SI_ST_EST; diff --git a/src/dumpstats.c b/src/dumpstats.c index 54f8bb8785..14cc519063 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -1574,8 +1574,8 @@ int stats_dump_sess_to_buffer(struct session *s, struct buffer *rep) } chunk_printf(&msg, - " as=%d ts=%02x age=%s calls=%d", - curr_sess->ana_state, curr_sess->task->state, + " ts=%02x age=%s calls=%d", + curr_sess->task->state, human_time(now.tv_sec - curr_sess->logs.tv_accept.tv_sec, 1), curr_sess->task->calls); diff --git a/src/proto_uxst.c b/src/proto_uxst.c index 41ae9c66d9..84a38c6aa4 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -439,7 +439,6 @@ int uxst_event_accept(int fd) { s->listener = l; s->fe = s->be = l->private; - s->ana_state = 0; s->req = s->rep = NULL; /* will be allocated later */ s->si[0].state = s->si[0].prev_state = SI_ST_EST;