mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-15 16:04:37 +00:00
87b09668be
With HTTP/2, we'll have to support multiplexed streams. A stream is in
fact the largest part of what we currently call a session, it has buffers,
logs, etc.
In order to catch any error, this commit removes any reference to the
struct session and tries to rename most "session" occurrences in function
names to "stream" and "sess" to "strm" when that's related to a session.
The files stream.{c,h} were added and session.{c,h} removed.
The session will be reintroduced later and a few parts of the stream
will progressively be moved overthere. It will more or less contain
only what we need in an embryonic session.
Sample fetch functions and converters will have to change a bit so
that they'll use an L5 (session) instead of what's currently called
"L4" which is in fact L6 for now.
Once all changes are completed, we should see approximately this :
L7 - http_txn
L6 - stream
L5 - session
L4 - connection | applet
There will be at most one http_txn per stream, and a same session will
possibly be referenced by multiple streams. A connection will point to
a session and to a stream. The session will hold all the information
we need to keep even when we don't yet have a stream.
Some more cleanup is needed because some code was already far from
being clean. The server queue management still refers to sessions at
many places while comments talk about connections. This will have to
be cleaned up once we have a server-side connection pool manager.
Stream flags "SN_*" still need to be renamed, it doesn't seem like
any of them will need to move to the session.
91 lines
2.8 KiB
C
91 lines
2.8 KiB
C
/*
|
|
* include/proto/queue.h
|
|
* This file defines everything related to queues.
|
|
*
|
|
* Copyright (C) 2000-2012 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 _PROTO_QUEUE_H
|
|
#define _PROTO_QUEUE_H
|
|
|
|
#include <common/config.h>
|
|
#include <common/memory.h>
|
|
#include <common/mini-clist.h>
|
|
|
|
#include <types/proxy.h>
|
|
#include <types/queue.h>
|
|
#include <types/stream.h>
|
|
#include <types/server.h>
|
|
#include <types/task.h>
|
|
|
|
#include <proto/backend.h>
|
|
|
|
extern struct pool_head *pool2_pendconn;
|
|
|
|
int init_pendconn();
|
|
struct stream *pendconn_get_next_strm(struct server *srv, struct proxy *px);
|
|
struct pendconn *pendconn_add(struct stream *strm);
|
|
void pendconn_free(struct pendconn *p);
|
|
void process_srv_queue(struct server *s);
|
|
unsigned int srv_dynamic_maxconn(const struct server *s);
|
|
int pendconn_redistribute(struct server *s);
|
|
int pendconn_grab_from_px(struct server *s);
|
|
|
|
|
|
/* Returns the first pending connection for server <s>, which may be NULL if
|
|
* nothing is pending.
|
|
*/
|
|
static inline struct pendconn *pendconn_from_srv(const struct server *s) {
|
|
if (!s->nbpend)
|
|
return NULL;
|
|
|
|
return LIST_ELEM(s->pendconns.n, struct pendconn *, list);
|
|
}
|
|
|
|
/* Returns the first pending connection for proxy <px>, which may be NULL if
|
|
* nothing is pending.
|
|
*/
|
|
static inline struct pendconn *pendconn_from_px(const struct proxy *px) {
|
|
if (!px->nbpend)
|
|
return NULL;
|
|
|
|
return LIST_ELEM(px->pendconns.n, struct pendconn *, list);
|
|
}
|
|
|
|
/* Returns 0 if all slots are full on a server, or 1 if there are slots available. */
|
|
static inline int server_has_room(const struct server *s) {
|
|
return !s->maxconn || s->cur_sess < srv_dynamic_maxconn(s);
|
|
}
|
|
|
|
/* returns 0 if nothing has to be done for server <s> regarding queued connections,
|
|
* and non-zero otherwise. If the server is down, we only check its own queue. Suited
|
|
* for and if/else usage.
|
|
*/
|
|
static inline int may_dequeue_tasks(const struct server *s, const struct proxy *p) {
|
|
return (s && (s->nbpend || (p->nbpend && srv_is_usable(s))) &&
|
|
(!s->maxconn || s->cur_sess < srv_dynamic_maxconn(s)));
|
|
}
|
|
|
|
#endif /* _PROTO_QUEUE_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* c-indent-level: 8
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|