Skip to content

Teach http_client to send "priority"; improve logs #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2025
Merged

Teach http_client to send "priority"; improve logs #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6893b8
Teach http_client to send "priority"; improve logs
dtikhonov Nov 27, 2025
16da0b0
Merge branch 'master' into 202511270740-stream-priority-work
dtikhonov Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion bin/http_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
/* This is used to exercise generating and sending of priority frames */
static int randomly_reprioritize_streams;

/* If set, send "priority: i" header */
static int s_priority_incremental;

static int s_display_cert_chain;

/* If this file descriptor is open, the client will accept server push and
Expand Down Expand Up @@ -608,6 +611,8 @@ send_headers (lsquic_stream_ctx_t *st_h)
header_set_ptr(&headers_arr[h_idx++], &hbuf, V(":scheme"), V("https"));
header_set_ptr(&headers_arr[h_idx++], &hbuf, V(":path"), V(st_h->path));
header_set_ptr(&headers_arr[h_idx++], &hbuf, V(":authority"), V(hostname));
if (s_priority_incremental)
header_set_ptr(&headers_arr[h_idx++], &hbuf, V("priority"), V("i"));
header_set_ptr(&headers_arr[h_idx++], &hbuf, V("user-agent"), V(st_h->client_ctx->prog->prog_settings.es_ua));
//header_set_ptr(&headers_arr[h_idx++], &hbuf, V("expect"), V("100-continue"));
if (randomly_reprioritize_streams)
Expand Down Expand Up @@ -1050,6 +1055,7 @@ usage (const char *prog)
" SPEC takes the form stream_id:nread:UI, where U is\n"
" urgency and I is incremental. Matched \\d+:\\d+:[0-7][01]\n"
" -7 DIR Save fetched resources into this directory.\n"
" -N Send \"priority: i\" header (incremental).\n"
" -Q ALPN Use hq ALPN. Specify, for example, \"h3-29\".\n"
" -J TEST Run test. Available tests:\n"
" goaway - call lsquic_conn_going_away() after handshake\n"
Expand Down Expand Up @@ -1644,7 +1650,7 @@ main (int argc, char **argv)
prog_init(&prog, LSENG_HTTP, &sports, &http_client_if, &client_ctx);

while (-1 != (opt = getopt(argc, argv, PROG_OPTS
"46Br:R:IKu:EP:M:n:w:H:p:0:q:e:hatT:b:d:J:"
"46Br:R:IKu:EP:M:n:w:H:p:0:q:e:hatT:b:d:J:N"
"3:" /* 3 is 133+ for "e" ("e" for "early") */
"9:" /* 9 sort of looks like P... */
"7:" /* Download directory */
Expand Down Expand Up @@ -1691,6 +1697,9 @@ main (int argc, char **argv)
srand((uintptr_t) argv);
randomly_reprioritize_streams = 1;
break;
case 'N':
s_priority_incremental = 1;
break;
case 'n':
client_ctx.hcc_concurrency = atoi(optarg);
break;
Expand Down
3 changes: 2 additions & 1 deletion src/liblsquic/lsquic_hpi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ add_stream_to_hpi (struct http_prio_iter *iter,
incr = !!(new_stream->sm_bflags & SMBF_INCREMENTAL);
}

HPI_DEBUG("add stream %"PRIu64": incr: %u; prio: %u", new_stream->id,
incr, prio);
if (!(iter->hpi_set[incr] & (1u << prio)))
{
iter->hpi_set[incr] |= 1u << prio;
Expand Down Expand Up @@ -111,7 +113,6 @@ lsquic_hpi_init (void *iter_p, struct lsquic_stream *first,
else
while (1)
{
HPI_DEBUG("add stream %"PRIu64, stream->id);
add_stream_to_hpi(iter, stream);
++count;
if (stream == last)
Expand Down