iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Release 2.20.1

Browse source 
- [BUGFIX] Typo in new "validate peer addr by DCID" code.  It is
  a benign bug (works either way), but better to fix it.
- Simplify Stream Priority Iterator (SPI).
- Minor documentation updates.
This commit is contained in:
Dmitri Tikhonov 2020-09-23 08:18:25 -04:00
parent b1a7c3f944
commit cd35ff02ed
10 changed files with 28 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/liblsquic/lsquic_full_conn.c
View file

@ -2867,7 +2867,7 @@ process_streams_ready_to_send (struct full_conn *conn)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->fc_pub.sending_streams),
TAILQ_LAST(&conn->fc_pub.sending_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_send_stream),
SMQF_SENDING_FLAGS, &conn->fc_conn, "send", NULL, NULL);
&conn->fc_conn, "send", NULL, NULL);
for (stream = lsquic_spi_first(&spi); stream;
stream = lsquic_spi_next(&spi))
@ -3055,7 +3055,7 @@ process_streams_read_events (struct full_conn *conn)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->fc_pub.read_streams),
TAILQ_LAST(&conn->fc_pub.read_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_read_stream),
SMQF_WANT_READ, &conn->fc_conn, "read", NULL, NULL);
&conn->fc_conn, "read", NULL, NULL);
needs_service = 0;
for (stream = lsquic_spi_first(&spi); stream;
@ -3082,7 +3082,7 @@ process_streams_read_events (struct full_conn *conn)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->fc_pub.read_streams),
TAILQ_LAST(&conn->fc_pub.read_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_read_stream),
SMQF_WANT_READ, &conn->fc_conn, "read-new",
&conn->fc_conn, "read-new",
filter_out_old_streams, &fctx);
for (stream = lsquic_spi_first(&spi); stream;
stream = lsquic_spi_next(&spi))
@ -3114,7 +3114,7 @@ process_streams_write_events (struct full_conn *conn, int high_prio)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->fc_pub.write_streams),
TAILQ_LAST(&conn->fc_pub.write_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_write_stream),
SMQF_WANT_WRITE|SMQF_WANT_FLUSH, &conn->fc_conn,
&conn->fc_conn,
high_prio ? "write-high" : "write-low", NULL, NULL);
if (high_prio)

6
src/liblsquic/lsquic_full_conn_ietf.c
View file

@ -2714,7 +2714,7 @@ process_streams_ready_to_send (struct ietf_full_conn *conn)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->ifc_pub.sending_streams),
TAILQ_LAST(&conn->ifc_pub.sending_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_send_stream),
SMQF_SENDING_FLAGS, &conn->ifc_conn, "send", NULL, NULL);
&conn->ifc_conn, "send", NULL, NULL);
for (stream = lsquic_spi_first(&spi); stream;
stream = lsquic_spi_next(&spi))
@ -3960,7 +3960,7 @@ process_streams_read_events (struct ietf_full_conn *conn)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->ifc_pub.read_streams),
TAILQ_LAST(&conn->ifc_pub.read_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_read_stream),
SMQF_WANT_READ, &conn->ifc_conn, labels[iters], NULL, NULL);
&conn->ifc_conn, labels[iters], NULL, NULL);
needs_service = 0;
for (stream = lsquic_spi_first(&spi); stream;
@ -4047,7 +4047,7 @@ process_streams_write_events (struct ietf_full_conn *conn, int high_prio)
lsquic_spi_init(&spi, TAILQ_FIRST(&conn->ifc_pub.write_streams),
TAILQ_LAST(&conn->ifc_pub.write_streams, lsquic_streams_tailq),
(uintptr_t) &TAILQ_NEXT((lsquic_stream_t *) NULL, next_write_stream),
SMQF_WANT_WRITE|SMQF_WANT_FLUSH, &conn->ifc_conn,
&conn->ifc_conn,
high_prio ? "write-high" : "write-low", NULL, NULL);
if (high_prio)

2
src/liblsquic/lsquic_mini_conn_ietf.c
View file

@ -1242,7 +1242,7 @@ imico_maybe_validate_by_dcid (struct ietf_mini_conn *conn,
if (dcid->len >= 8)
/* Generic code with unnecessary loop as future-proofing */
for (i = 0; i < conn->imc_conn.cn_n_cces; ++i)
if ((conn->imc_conn.cn_cces_mask & (i << 1))
if ((conn->imc_conn.cn_cces_mask & (1 << i))
&& (conn->imc_conn.cn_cces[i].cce_flags & CCE_SEQNO)
&& LSQUIC_CIDS_EQ(&conn->imc_conn.cn_cces[i].cce_cid, dcid))
{

42
src/liblsquic/lsquic_spi.c
View file

@ -53,7 +53,7 @@ add_stream_to_spi (struct stream_prio_iter *iter, lsquic_stream_t *stream)
void
lsquic_spi_init (struct stream_prio_iter *iter, struct lsquic_stream *first,
struct lsquic_stream *last, uintptr_t next_ptr_offset,
enum stream_q_flags onlist_mask, const struct lsquic_conn *conn,
const struct lsquic_conn *conn,
const char *name,
int (*filter)(void *filter_ctx, struct lsquic_stream *),
void *filter_ctx)
@ -67,9 +67,7 @@ lsquic_spi_init (struct stream_prio_iter *iter, struct lsquic_stream *first,
iter->spi_set[1] = 0;
iter->spi_set[2] = 0;
iter->spi_set[3] = 0;
iter->spi_onlist_mask = onlist_mask;
iter->spi_cur_prio = 0;
iter->spi_prev_stream = NULL;
iter->spi_next_stream = NULL;
iter->spi_n_added = 0;
@ -195,41 +193,12 @@ find_and_set_next_priority (struct stream_prio_iter *iter)
}
/* Each stream returned by the iterator is processed in some fashion. If,
* as a result of this, the stream gets taken off the original list, we
* have to follow suit and remove it from the iterator's set of streams.
*/
static void
maybe_evict_prev (struct stream_prio_iter *iter)
{
unsigned set, bit;
if (0 == (iter->spi_prev_stream->sm_qflags & iter->spi_onlist_mask))
{
SPI_DEBUG("evict stream %"PRIu64, iter->spi_prev_stream->id);
TAILQ_REMOVE(&iter->spi_streams[ iter->spi_prev_prio ],
iter->spi_prev_stream, next_prio_stream);
if (TAILQ_EMPTY(&iter->spi_streams[ iter->spi_prev_prio ]))
{
set = iter->spi_prev_prio >> 6;
bit = iter->spi_prev_prio & 0x3F;
iter->spi_set[ set ] &= ~(1ULL << bit);
SPI_DEBUG("priority %u now has no elements", iter->spi_prev_prio);
}
iter->spi_prev_stream = NULL;
}
}
lsquic_stream_t *
lsquic_spi_first (struct stream_prio_iter *iter)
{
lsquic_stream_t *stream;
unsigned set, bit;
if (iter->spi_prev_stream)
maybe_evict_prev(iter);
iter->spi_cur_prio = 0;
set = iter->spi_cur_prio >> 6;
bit = iter->spi_cur_prio & 0x3F;
@ -244,8 +213,6 @@ lsquic_spi_first (struct stream_prio_iter *iter)
}
stream = TAILQ_FIRST(&iter->spi_streams[ iter->spi_cur_prio ]);
iter->spi_prev_prio = iter->spi_cur_prio;
iter->spi_prev_stream = stream;
iter->spi_next_stream = TAILQ_NEXT(stream, next_prio_stream);
if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) && !lsquic_stream_is_critical(stream))
SPI_DEBUG("%s: return stream %"PRIu64", priority %u", __func__,
@ -259,14 +226,9 @@ lsquic_spi_next (struct stream_prio_iter *iter)
{
lsquic_stream_t *stream;
if (iter->spi_prev_stream)
maybe_evict_prev(iter);
stream = iter->spi_next_stream;
if (stream)
{
assert(iter->spi_prev_prio == iter->spi_cur_prio);
iter->spi_prev_stream = stream;
iter->spi_next_stream = TAILQ_NEXT(stream, next_prio_stream);
if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) && !lsquic_stream_is_critical(stream))
SPI_DEBUG("%s: return stream %"PRIu64", priority %u", __func__,
@ -281,8 +243,6 @@ lsquic_spi_next (struct stream_prio_iter *iter)
}
stream = TAILQ_FIRST(&iter->spi_streams[ iter->spi_cur_prio ]);
iter->spi_prev_prio = iter->spi_cur_prio;
iter->spi_prev_stream = stream;
iter->spi_next_stream = TAILQ_NEXT(stream, next_prio_stream);
if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) && !lsquic_stream_is_critical(stream))

7
src/liblsquic/lsquic_spi.h
View file

@ -22,12 +22,9 @@ struct stream_prio_iter
const struct lsquic_conn *spi_conn; /* Used for logging */
const char *spi_name; /* Used for logging */
uint64_t spi_set[4]; /* 256 bits */
enum stream_q_flags spi_onlist_mask;
unsigned spi_n_added;
unsigned char spi_cur_prio;
unsigned char spi_prev_prio;
struct lsquic_stream *spi_prev_stream,
*spi_next_stream;
struct lsquic_stream *spi_next_stream;
struct lsquic_streams_tailq spi_streams[256];
};
@ -35,7 +32,7 @@ struct stream_prio_iter
void
lsquic_spi_init (struct stream_prio_iter *, struct lsquic_stream *first,
struct lsquic_stream *last, uintptr_t next_ptr_offset,
enum stream_q_flags onlist_mask, const struct lsquic_conn *,
const struct lsquic_conn *,
const char *name,
int (*filter)(void *filter_ctx, struct lsquic_stream *),
void *filter_ctx);