summaryrefslogtreecommitdiff
path: root/include/haproxy/stream.h
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2021-03-09 15:43:32 +0100
committerWilly Tarreau <w@1wt.eu>2021-03-09 15:44:33 +0100
commite89fae3a4eb6dec00743b436ce164e03d7630b1c (patch)
treee4b09cc4d973f41aeba6cb6c9d93ee51632e629b /include/haproxy/stream.h
parent57647cac622f94e14b5708b87d1d79c446b0eb88 (diff)
downloadhaproxy-e89fae3a4eb6dec00743b436ce164e03d7630b1c.tar.gz
CLEANUP: stream: rename a few remaining occurrences of "stream *sess"
These are some leftovers from the ancient code where they were still called sessions, but these areas in the code remain confusing due to this naming. They were now called "strm" which will not even affect indenting nor alignment.
Diffstat (limited to 'include/haproxy/stream.h')
-rw-r--r--include/haproxy/stream.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/haproxy/stream.h b/include/haproxy/stream.h
index f558a1fa4..bfd92ec0b 100644
--- a/include/haproxy/stream.h
+++ b/include/haproxy/stream.h
@@ -69,7 +69,7 @@ void stream_dump_and_crash(enum obj_type *obj, int rate);
struct ist stream_generate_unique_id(struct stream *strm, struct list *format);
void stream_process_counters(struct stream *s);
-void sess_change_server(struct stream *sess, struct server *newsrv);
+void sess_change_server(struct stream *strm, struct server *newsrv);
struct task *process_stream(struct task *t, void *context, unsigned int state);
void default_srv_error(struct stream *s, struct stream_interface *si);
@@ -280,7 +280,7 @@ static inline void stream_inc_http_fail_ctr(struct stream *s)
}
}
-static inline void stream_add_srv_conn(struct stream *sess, struct server *srv)
+static inline void stream_add_srv_conn(struct stream *strm, struct server *srv)
{
/* note: this inserts in reverse order but we do not care, it's only
* used for massive kills (i.e. almost never). MT_LIST_ADD() is a bit
@@ -288,25 +288,25 @@ static inline void stream_add_srv_conn(struct stream *sess, struct server *srv)
* from a conflict with an adjacent MT_LIST_DEL, and using it improves
* the performance by about 3% on 32-cores.
*/
- MT_LIST_ADD(&srv->per_thr[tid].streams, &sess->by_srv);
- HA_ATOMIC_STORE(&sess->srv_conn, srv);
+ MT_LIST_ADD(&srv->per_thr[tid].streams, &strm->by_srv);
+ HA_ATOMIC_STORE(&strm->srv_conn, srv);
}
-static inline void stream_del_srv_conn(struct stream *sess)
+static inline void stream_del_srv_conn(struct stream *strm)
{
- struct server *srv = sess->srv_conn;
+ struct server *srv = strm->srv_conn;
if (!srv)
return;
- MT_LIST_DEL(&sess->by_srv);
- HA_ATOMIC_STORE(&sess->srv_conn, NULL);
+ MT_LIST_DEL(&strm->by_srv);
+ HA_ATOMIC_STORE(&strm->srv_conn, NULL);
}
-static inline void stream_init_srv_conn(struct stream *sess)
+static inline void stream_init_srv_conn(struct stream *strm)
{
- sess->srv_conn = NULL;
- MT_LIST_INIT(&sess->by_srv);
+ strm->srv_conn = NULL;
+ MT_LIST_INIT(&strm->by_srv);
}
static inline void stream_choose_redispatch(struct stream *s)