mirror of
https://github.com/haproxy/haproxy.git
synced 2026-02-03 20:39:41 -05:00
590a0514f2
The handshake processing time used to be stored per stream, which was valid when there was exactly one stream per session. With H2 and multiplexing it's not the case anymore and the reported handshake times are wrong in the logs as it's computed between the TCP accept() and the stream creation. Let's first move the handshake where it belongs, which is the session. However, this is not enough because we don't want to report an excessive idle time either for H2 (since many requests use the connection). So the solution used here is to have the stream retrieve sess->tv_accept and the handshake duration when the stream is created, and let the mux immediately reset them. This way, the handshake time becomes zero for the second and subsequent requests in H2 (which was already the case in H1), and the idle time exactly counts how long the connection remained unused while it could be used, so in H1 it runs from the end of the previous response and in H2 it runs from the end of the previous request since the channel is already available. This patch will need to be backported to 1.8.
59 lines
2 KiB
C
59 lines
2 KiB
C
/*
|
|
* include/types/session.h
|
|
* This file defines everything related to sessions.
|
|
*
|
|
* Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
* exclusively.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef _TYPES_SESSION_H
|
|
#define _TYPES_SESSION_H
|
|
|
|
|
|
#include <sys/time.h>
|
|
#include <unistd.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include <common/config.h>
|
|
#include <common/mini-clist.h>
|
|
|
|
#include <types/obj_type.h>
|
|
#include <types/proxy.h>
|
|
#include <types/stick_table.h>
|
|
#include <types/task.h>
|
|
#include <types/vars.h>
|
|
|
|
struct session {
|
|
struct proxy *fe; /* the proxy this session depends on for the client side */
|
|
struct listener *listener; /* the listener by which the request arrived */
|
|
enum obj_type *origin; /* the connection / applet which initiated this session */
|
|
struct timeval accept_date; /* date of the session's accept() in user date */
|
|
struct timeval tv_accept; /* date of the session's accept() in internal date (monotonic) */
|
|
struct stkctr stkctr[MAX_SESS_STKCTR]; /* stick counters for tcp-connection */
|
|
struct vars vars; /* list of variables for the session scope. */
|
|
struct task *task; /* handshake timeout processing */
|
|
long t_handshake; /* handshake duration, -1 = not completed */
|
|
};
|
|
|
|
#endif /* _TYPES_SESSION_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* c-indent-level: 8
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|