Commit 2c90d787 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Remove redundant field

parent a9852b4c
...@@ -198,7 +198,6 @@ struct http_conn { ...@@ -198,7 +198,6 @@ struct http_conn {
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
struct acct { struct acct {
double first;
#define ACCT(foo) uint64_t foo; #define ACCT(foo) uint64_t foo;
#include "tbl/acct_fields.h" #include "tbl/acct_fields.h"
#undef ACCT #undef ACCT
......
...@@ -1019,7 +1019,8 @@ cnt_streambody(struct sess *sp) ...@@ -1019,7 +1019,8 @@ cnt_streambody(struct sess *sp)
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* The very first request * A freshly accepted socket
*
DOT subgraph xcluster_first { DOT subgraph xcluster_first {
DOT first [ DOT first [
DOT shape=box DOT shape=box
...@@ -1040,16 +1041,10 @@ cnt_first(struct sess *sp) ...@@ -1040,16 +1041,10 @@ cnt_first(struct sess *sp)
wrk = sp->wrk; wrk = sp->wrk;
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC); CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
/*
* XXX: If we don't have acceptfilters we are somewhat subject
* XXX: to DoS'ing here. One remedy would be to set a shorter
* XXX: SO_RCVTIMEO and once we have received something here
* XXX: increase it to the normal value.
*/
assert(sp->xid == 0); assert(sp->xid == 0);
assert(sp->restarts == 0); assert(sp->restarts == 0);
AZ(sp->esi_level); AZ(sp->esi_level);
VTCP_name(&sp->sockaddr, sp->sockaddrlen, VTCP_name(&sp->sockaddr, sp->sockaddrlen,
sp->addr, sizeof sp->addr, sp->port, sizeof sp->port); sp->addr, sizeof sp->addr, sp->port, sizeof sp->port);
if (cache_param->log_local_addr) { if (cache_param->log_local_addr) {
...@@ -1063,7 +1058,6 @@ cnt_first(struct sess *sp) ...@@ -1063,7 +1058,6 @@ cnt_first(struct sess *sp)
WSP(sp, SLT_SessionOpen, "%s %s %s", WSP(sp, SLT_SessionOpen, "%s %s %s",
sp->addr, sp->port, sp->mylsock->name); sp->addr, sp->port, sp->mylsock->name);
} }
sp->acct_ses.first = sp->t_open;
/* Receive a HTTP protocol request */ /* Receive a HTTP protocol request */
HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id, HTC_Init(sp->htc, sp->ws, sp->fd, sp->vsl_id,
......
...@@ -345,6 +345,7 @@ SES_Delete(struct sess *sp, const char *reason, double now) ...@@ -345,6 +345,7 @@ SES_Delete(struct sess *sp, const char *reason, double now)
SES_Close(sp, reason); SES_Close(sp, reason);
if (isnan(now)) if (isnan(now))
now = VTIM_real(); now = VTIM_real();
assert(!isnan(sp->t_open));
assert(sp->fd < 0); assert(sp->fd < 0);
AZ(sp->vcl); AZ(sp->vcl);
...@@ -354,11 +355,10 @@ SES_Delete(struct sess *sp, const char *reason, double now) ...@@ -354,11 +355,10 @@ SES_Delete(struct sess *sp, const char *reason, double now)
strcpy(sp->addr, "-"); strcpy(sp->addr, "-");
b = &sp->acct_ses; b = &sp->acct_ses;
assert(!isnan(b->first));
VSL(SLT_StatSess, sp->vsl_id, "%s %s %.0f %ju %ju %ju %ju %ju %ju %ju", VSL(SLT_StatSess, sp->vsl_id, "%s %s %.0f %ju %ju %ju %ju %ju %ju %ju",
sp->addr, sp->port, sp->addr, sp->port,
now - b->first, // XXX ??? now - sp->t_open,
b->sess, b->req, b->pipe, b->pass, b->sess, b->req, b->pipe, b->pass,
b->fetch, b->hdrbytes, b->bodybytes); b->fetch, b->hdrbytes, b->bodybytes);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment