return !(si->flags & SI_FL_RX_WAIT_EP);
}
-/* Report that a stream interface failed to put some data into the input buffer */
-static inline void si_cant_put(struct stream_interface *si)
-{
- si->flags |= SI_FL_RXBLK_ROOM;
- si->flags &= ~SI_FL_RX_WAIT_EP;
-}
-
/* The stream interface announces it is ready to try to deliver more data to the input buffer */
static inline void si_rx_endp_more(struct stream_interface *si)
{
si->flags |= SI_FL_RXBLK_BUFF;
}
+/* Tell a stream interface some room was made in the input buffer */
+static inline void si_rx_room_rdy(struct stream_interface *si)
+{
+ si->flags &= ~SI_FL_RXBLK_ROOM;
+}
+
+/* The stream interface announces it failed to put data into the input buffer
+ * by lack of room. Since it indicates a willingness to deliver data to the
+ * buffer that will have to be retried, we automatically clear RXBLK_ENDP to
+ * be called again as soon as RXBLK_ROOM is cleared.
+ */
+static inline void si_rx_room_blk(struct stream_interface *si)
+{
+ si->flags |= SI_FL_RXBLK_ROOM;
+}
+
/* The stream interface announces it will never put new data into the input
* buffer and that it's not waiting for its endpoint to deliver anything else.
* This function obviously doesn't have a _rdy equivalent.
offset = 0;
if (ret <= 0) {
if (ret == -3 || ret == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
break;
}
return -1;
if (!next_key) {
chunk_printf(&trash, "%p: %s (shctx:%p, available blocks:%d)\n", cache, cache->id, shctx_ptr(cache), shctx_ptr(cache)->nbav);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
shctx_unlock(shctx_ptr(cache));
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
* would want to return some info right after parsing.
*/
if (buffer_almost_full(si_ib(si))) {
- si_cant_put(si);
+ si_rx_room_blk(si);
break;
}
cli_get_severity_output(appctx)) != -1)
appctx->st0 = CLI_ST_PROMPT;
else
- si_cant_put(si);
+ si_rx_room_blk(si);
break;
case CLI_ST_PRINT_FREE: {
const char *msg = appctx->ctx.cli.err;
appctx->st0 = CLI_ST_PROMPT;
}
else
- si_cant_put(si);
+ si_rx_room_blk(si);
break;
}
case CLI_ST_CALLBACK: /* use custom pointer */
if (ci_putstr(si_ic(si), prompt) != -1)
appctx->st0 = CLI_ST_GETREQ;
else
- si_cant_put(si);
+ si_rx_room_blk(si);
}
/* If the output functions are still there, it means they require more room. */
chunk_printf(&trash, "%s\n", *var);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
if (appctx->st2 == STAT_ST_END)
chunk_appendf(&trash, "\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
skip:
if (ci_putchk(si_ic(si), &trash) == -1) {
chunk_reset(&trash);
chunk_printf(&trash, "[output too large, cannot dump]\n");
- si_cant_put(si);
+ si_rx_room_blk(si);
}
/* dump complete */
case STAT_ST_INIT:
chunk_printf(&trash, "# socket lvl processes\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
appctx->st2 = STAT_ST_LIST;
}
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
}
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
/* let's try again later from this session. We add ourselves into
* this session's users so that it can remove us upon termination.
*/
- si->flags |= SI_FL_RXBLK_ROOM;
+ si_rx_room_blk(si);
return 0;
}
/* fall through */
ret = ci_putblk(si_ic(si), buf, framesz+4);
if (ret <= 0) {
if ((ret == -3 && b_is_null(&si_ic(si)->buf)) || ret == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 1; /* retry */
}
SPOE_APPCTX(appctx)->status_code = SPOE_FRM_ERR_IO;
* applet, and returns a yield.
*/
if (l < len) {
- si_cant_put(si);
+ si_rx_room_blk(si);
MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_applet_tcp_send_yield, TICK_ETERNITY, 0));
}
* If ret is -1, we dont have room in the buffer, so we yield.
*/
if (ret == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_applet_http_getline_yield, TICK_ETERNITY, 0));
}
appctx->appctx->ctx.hlua_apphttp.flags &= ~APPLET_100C;
* If ret is -1, we dont have room in the buffer, so we yield.
*/
if (ret == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_applet_http_recv_yield, TICK_ETERNITY, 0));
}
appctx->appctx->ctx.hlua_apphttp.flags &= ~APPLET_100C;
* applet, and returns a yield.
*/
if (l < len) {
- si_cant_put(si);
+ si_rx_room_blk(si);
MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_applet_http_send_yield, TICK_ETERNITY, 0));
}
/* If ret is -1, we dont have room in the buffer, so we yield. */
if (ret == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
MAY_LJMP(hlua_yieldk(L, 0, 0, hlua_applet_http_start_response_yield, TICK_ETERNITY, 0));
}
/* no enough space error. */
if (ret == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return;
}
case HLUA_E_AGAIN:
/* We want write. */
if (HLUA_IS_WAKERESWR(hlua))
- si_cant_put(si);
+ si_rx_room_blk(si);
/* Set the timeout. */
if (hlua->wake_time != TICK_ETERNITY)
task_schedule(hlua->task, hlua->wake_time);
const char *msg = (startup_logs ? startup_logs : "No startup alerts/warnings.\n");
if (ci_putstr(si_ic(si), msg) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
return 1;
*/
LIST_ADDQ(&elt->back_refs, &appctx->ctx.map.bref.users);
HA_SPIN_UNLOCK(PATREF_LOCK, &appctx->ctx.map.ref->lock);
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
chunk_reset(&trash);
chunk_appendf(&trash, "# id (file) description\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
*/
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
* this stream's users so that it can remove us upon termination.
*/
HA_SPIN_UNLOCK(PATREF_LOCK, &appctx->ctx.map.ref->lock);
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
dump_pools_to_trash();
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
return 1;
HA_SPIN_UNLOCK(PEER_LOCK, &curpeer->lock);
return;
full:
- si_cant_put(si);
+ si_rx_room_blk(si);
goto out;
}
bk_f_forced_id, srv_f_forced_id, srv->hostname ? srv->hostname : "-", srv->svc_port,
srvrecord ? srvrecord : "-");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
if (appctx->st2 == STAT_ST_HEAD) {
chunk_printf(&trash, "%d\n# %s\n", SRV_STATE_FILE_VERSION, SRV_STATE_FILE_FIELD_NAMES);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
appctx->st2 = STAT_ST_INFO;
if (!appctx->ctx.cli.p0) {
chunk_printf(&trash, "# name\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
appctx->ctx.cli.p0 = proxies_list;
chunk_appendf(&trash, "%s\n", curproxy->id);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
cant_send_unlock:
HA_SPIN_UNLOCK(PROXY_LOCK, &appctx->ctx.errors.px->lock);
cant_send:
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
snprintf(trash.area, trash.size, "%d (initial %d)\n", sv->uweight,
sv->iweight);
if (ci_putstr(si_ic(si), trash.area) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
return 1;
chunk_appendf(&trash, "# id (file)\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
* this stream's users so that it can remove us upon termination.
*/
HA_RWLOCK_RDUNLOCK(TLSKEYS_REF_LOCK, &ref->lock);
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
appctx->ctx.cli.i1++;
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
*/
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
if (appctx->ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_px_hdr(si, px, uri);
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
/* print the frontend */
if (stats_dump_fe_stats(si, px)) {
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
/* stats.l has been initialized above */
for (; appctx->ctx.stats.l != &px->conf.listeners; appctx->ctx.stats.l = l->by_fe.n) {
if (buffer_almost_full(&rep->buf)) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
/* print the frontend */
if (stats_dump_li_stats(si, px, l, flags)) {
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
/* stats.sv has been initialized above */
for (; appctx->ctx.stats.sv != NULL; appctx->ctx.stats.sv = sv->next) {
if (buffer_almost_full(&rep->buf)) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
if (stats_dump_sv_stats(si, px, flags, sv)) {
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
/* print the backend */
if (stats_dump_be_stats(si, px, flags)) {
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
if (appctx->ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_px_end(si, px);
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
stats_dump_csv_header();
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
if (appctx->ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_info(si, uri);
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
/* dump proxies */
while (appctx->ctx.stats.px) {
if (buffer_almost_full(&rep->buf)) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
else
stats_dump_json_end();
if (ci_putchk(rep, &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
}
chunk_appendf(&trash, "\r\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
scope_txt);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
si_ic(si)->to_forward = 0;
chunk_printf(&trash, "\r\n000000\r\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
si_ic(si)->to_forward = last_fwd;
goto out;
}
if (last_len != data_len) {
chunk_printf(&trash, "\r\n%06x\r\n", (last_len - data_len));
if (ci_putchk(si_ic(si), &trash) == -1)
- si_cant_put(si);
+ si_rx_room_blk(si);
si_ic(si)->total += (last_len - data_len);
b_add(si_ib(si), last_len - data_len);
if (appctx->ctx.stats.flags & STAT_CHUNKED) {
chunk_printf(&trash, "\r\n0\r\n\r\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
goto out;
}
}
stats_dump_info_fields(&trash, info);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
stats_dump_json_schema(&trash);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
chunk_appendf(msg, "# contents not dumped due to insufficient privileges\n");
if (ci_putchk(si_ic(si), msg) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
chunk_appendf(msg, "\n");
if (ci_putchk(si_ic(si), msg) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
/* stream changed, no need to go any further */
chunk_appendf(&trash, " *** session terminated while we were watching it ***\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
appctx->ctx.sess.uid = 0;
(unsigned int)strm->res.buf.size);
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
return 0;
}
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
*/
- si_cant_put(si);
+ si_rx_room_blk(si);
LIST_ADDQ(&curr_strm->back_refs, &appctx->ctx.sess.bref.users);
HA_SPIN_UNLOCK(STRMS_LOCK, &streams_lock);
return 0;
chunk_appendf(&trash, "Session not found.\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
- si_cant_put(si);
+ si_rx_room_blk(si);
HA_SPIN_UNLOCK(STRMS_LOCK, &streams_lock);
return 0;
}
if (ic->pipe) {
/* stop reading */
- si->flags |= SI_FL_RXBLK_ROOM;
+ si_rx_room_blk(si);
}
else {
/* (re)start reading */
if ((sio->flags & SI_FL_RXBLK_ROOM) &&
((oc->flags & CF_WRITE_PARTIAL) || channel_is_empty(oc)))
- sio->flags &= ~SI_FL_RXBLK_ROOM;
+ si_rx_room_rdy(sio);
if (oc->flags & CF_DONT_READ)
si_rx_chan_blk(sio);
* buffer or in the pipe.
*/
if (new_len < last_len)
- si->flags &= ~SI_FL_RXBLK_ROOM;
+ si_rx_room_rdy(si);
}
if (!(ic->flags & CF_DONT_READ))
if (!channel_is_empty(ic)) {
/* stop reading, imposed by channel's policy or contents */
- si_cant_put(si);
+ si_rx_room_blk(si);
}
else {
/* (re)start reading and update timeout. Note: we don't recompute the timeout
* update it if is was not yet set. The stream socket handler will already
* have updated it if there has been a completed I/O.
*/
- si->flags &= ~SI_FL_RXBLK_ROOM;
+ si_rx_room_rdy(si);
}
if (si->flags & SI_FL_RXBLK_ANY & ~SI_FL_RX_WAIT_EP)
ic->rex = TICK_ETERNITY;
!(cs->flags & CS_FL_ERROR) &&
!(cs->conn->flags & CO_FL_ERROR)) {
if (si_cs_send(cs))
- si_b->flags &= ~SI_FL_RXBLK_ROOM;
+ si_rx_room_rdy(si_b);
}
/* back stream-int */
!(cs->flags & CS_FL_ERROR) &&
!(cs->conn->flags & CO_FL_ERROR)) {
if (si_cs_send(cs))
- si_f->flags &= ~SI_FL_RXBLK_ROOM;
+ si_rx_room_rdy(si_f);
}
/* let's recompute both sides states */
/* the pipe is full or we have read enough data that it
* could soon be full. Let's stop before needing to poll.
*/
- si_cant_put(si);
+ si_rx_room_blk(si);
goto done_recv;
}
ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max, co_data(ic) ? CO_RFL_BUF_WET : 0);
if (cs->flags & CS_FL_RCV_MORE)
- si_cant_put(si);
+ si_rx_room_blk(si);
if (ret <= 0) {
break;
projects / thirdparty / haproxy.git / commitdiff
