mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-25 07:41:36 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: mux-h2: implement h2s_notify_{send,recv} to report events to subscribers

Browse Source 
Till now we had to open-code all the manipulation of the wait_event,
let's use standarized functions for this and reduce the risk of bugs.
This commit is contained in:
Willy Tarreau 2018-12-19 18:08:52 +01:00
parent 251064b02d
commit 7e094451d0
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/mux_h2.c
View File

@ -598,6 +598,32 @@ static inline __maybe_unused void h2s_error(struct h2s *h2s, enum h2_err err)
} }
} }
/* attempt to notify the data layer of recv availability */
static void __maybe_unused h2s_notify_recv(struct h2s *h2s)
{
struct wait_event *sw;
if (h2s->recv_wait) {
sw = h2s->recv_wait;
sw->events &= ~SUB_RETRY_RECV;
tasklet_wakeup(sw->task);
h2s->recv_wait = NULL;
}
}
/* attempt to notify the data layer of send availability */
static void __maybe_unused h2s_notify_send(struct h2s *h2s)
{
struct wait_event *sw;
if (h2s->send_wait) {
sw = h2s->send_wait;
sw->events &= ~SUB_RETRY_SEND;
tasklet_wakeup(sw->task);
h2s->send_wait = NULL;
}
}
/* writes the 24-bit frame size <len> at address <frame> */ /* writes the 24-bit frame size <len> at address <frame> */
static inline __maybe_unused void h2_set_frame_size(void *frame, uint32_t len) static inline __maybe_unused void h2_set_frame_size(void *frame, uint32_t len)
{ {
@ -2110,11 +2136,7 @@ static void h2_process_demux(struct h2c *h2c)
(h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS)))) { (h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS)))) {
/* we may have to signal the upper layers */ /* we may have to signal the upper layers */
h2s->cs->flags |= CS_FL_RCV_MORE; h2s->cs->flags |= CS_FL_RCV_MORE;
if (h2s->recv_wait) { h2s_notify_recv(h2s);
h2s->recv_wait->events &= ~SUB_RETRY_RECV;
tasklet_wakeup(h2s->recv_wait->task);
h2s->recv_wait = NULL;
}
} }
h2s = tmp_h2s; h2s = tmp_h2s;
@ -2350,11 +2372,7 @@ static void h2_process_demux(struct h2c *h2c)
(h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS)))) { (h2s->cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING|CS_FL_EOS|CS_FL_REOS)))) {
/* we may have to signal the upper layers */ /* we may have to signal the upper layers */
h2s->cs->flags |= CS_FL_RCV_MORE; h2s->cs->flags |= CS_FL_RCV_MORE;
if (h2s->recv_wait) { h2s_notify_recv(h2s);
h2s->recv_wait->events &= ~SUB_RETRY_RECV;
tasklet_wakeup(h2s->recv_wait->task);
h2s->recv_wait = NULL;
}
} }
if (h2_recv_allowed(h2c)) if (h2_recv_allowed(h2c))
@ -2649,13 +2667,8 @@ static int h2_process(struct h2c *h2c)
while (node) { while (node) {
h2s = container_of(node, struct h2s, by_id); h2s = container_of(node, struct h2s, by_id);
if ((h2s->cs->flags & CS_FL_WAIT_FOR_HS) && if (h2s->cs->flags & CS_FL_WAIT_FOR_HS)
h2s->recv_wait) { h2s_notify_recv(h2s);
struct wait_event *sw = h2s->recv_wait;
sw->events &= ~SUB_RETRY_RECV;
tasklet_wakeup(sw->task);
h2s->recv_wait = NULL;
}
node = eb32_next(node); node = eb32_next(node);
} }
} }