RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-31 07:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: muxes: Remove get_cs_info callback function now useless

Browse Source 
This callback function was only defined by the mux-h1. But it has been
removed in the previous commit because it is unused now. So, we can do a
step forward removing the callback function from the mux definition and the
cs_info structure.
This commit is contained in:
Christopher Faulet 2020-09-30 14:08:30 +02:00
parent 3b536a3131
commit afc02a4436
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/haproxy/connection-t.h
View File

@ -400,7 +400,6 @@ struct mux_ops {
int (*used_streams)(struct connection *conn); /* Returns the number of streams in use on a connection. */ int (*used_streams)(struct connection *conn); /* Returns the number of streams in use on a connection. */
void (*destroy)(void *ctx); /* Let the mux know one of its users left, so it may have to disappear */ void (*destroy)(void *ctx); /* Let the mux know one of its users left, so it may have to disappear */
void (*reset)(struct connection *conn); /* Reset the mux, because we're re-trying to connect */ void (*reset)(struct connection *conn); /* Reset the mux, because we're re-trying to connect */
const struct cs_info *(*get_cs_info)(struct conn_stream *cs); /* Return info on the specified conn_stream or NULL if not defined */
int (*ctl)(struct connection *conn, enum mux_ctl_type mux_ctl, void *arg); /* Provides information about the mux */ int (*ctl)(struct connection *conn, enum mux_ctl_type mux_ctl, void *arg); /* Provides information about the mux */
int (*takeover)(struct connection *conn, int orig_tid); /* Attempts to migrate the connection to the current thread */ int (*takeover)(struct connection *conn, int orig_tid); /* Attempts to migrate the connection to the current thread */
unsigned int flags; /* some flags characterizing the mux's capabilities (MX_FL_*) */ unsigned int flags; /* some flags characterizing the mux's capabilities (MX_FL_*) */
@ -454,19 +453,6 @@ struct conn_stream {
void *ctx; /* mux-specific context */ void *ctx; /* mux-specific context */
}; };
/*
* This structure describes the info related to a conn_stream known by the mux
* only but useful for the upper layer.
* For now, only some dates and durations are reported. This structure will
* envolved. But for now, only the bare minimum is referenced.
*/
struct cs_info {
struct timeval create_date; /* Creation date of the conn_stream in user date */
struct timeval tv_create; /* Creation date of the conn_stream in internal date (monotonic) */
long t_handshake; /* handshake duration, -1 if never occurs */
long t_idle; /* idle duration, -1 if never occurs */
};
/* This structure describes a connection with its methods and data. /* This structure describes a connection with its methods and data.
* A connection may be performed to proxy or server via a local or remote * A connection may be performed to proxy or server via a local or remote
* socket, and can also be made to an internal applet. It can support * socket, and can also be made to an internal applet. It can support

12
include/haproxy/stream_interface.h
View File

@ -534,18 +534,6 @@ static inline void si_update(struct stream_interface *si)
si_update_tx(si); si_update_tx(si);
} }
/* Returns info about the conn_stream <cs>, if not NULL. It call the mux layer's
* get_cs_info() function, if it exists. On success, it returns a cs_info
* structure. Otherwise, on error, if the mux does not implement get_cs_info()
* or if conn_stream is NULL, NULL is returned.
*/
static inline const struct cs_info *si_get_cs_info(struct conn_stream *cs)
{
if (cs && cs->conn->mux->get_cs_info)
return cs->conn->mux->get_cs_info(cs);
return NULL;
}
/* for debugging, reports the stream interface state name */ /* for debugging, reports the stream interface state name */
static inline const char *si_state_str(int state) static inline const char *si_state_str(int state)
{ {