Skip to content

Fix bug with increment read window #535

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 1 commit into from
Dec 20, 2022
Merged

Fix bug with increment read window #535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix bug with increment read window
  • Loading branch information
@graebm
graebm committed Dec 17, 2022
commit 617f49adf9e5d65b9b26b10a28992c353db90b87
10 changes: 5 additions & 5 deletions source/channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct aws_channel {
size_t window_update_batch_emit_threshold;
struct aws_channel_task window_update_task;
bool read_back_pressure_enabled;
bool window_update_in_progress;
bool window_update_scheduled;
};

struct channel_setup_args {
Expand Down Expand Up @@ -833,6 +833,8 @@ static void s_window_update_task(struct aws_channel_task *channel_task, void *ar
(void)channel_task;
struct aws_channel *channel = arg;

channel->window_update_scheduled = false;

if (status == AWS_TASK_STATUS_RUN_READY && channel->channel_state < AWS_CHANNEL_SHUTTING_DOWN) {
/* get the right-most slot to start the updates. */
struct aws_channel_slot *slot = channel->first;
Expand All @@ -852,15 +854,13 @@ static void s_window_update_task(struct aws_channel_task *channel_task, void *ar
"channel %p: channel update task failed with status %d",
(void *)slot->channel,
aws_last_error());
slot->channel->window_update_in_progress = false;
aws_channel_shutdown(channel, aws_last_error());
return;
}
}
slot = slot->adj_left;
}
}
channel->window_update_in_progress = false;
}

int aws_channel_slot_increment_read_window(struct aws_channel_slot *slot, size_t window) {
Expand All @@ -869,9 +869,9 @@ int aws_channel_slot_increment_read_window(struct aws_channel_slot *slot, size_t
slot->current_window_update_batch_size =
aws_add_size_saturating(slot->current_window_update_batch_size, window);

if (!slot->channel->window_update_in_progress &&
if (!slot->channel->window_update_scheduled &&
slot->window_size <= slot->channel->window_update_batch_emit_threshold) {
slot->channel->window_update_in_progress = true;
slot->channel->window_update_scheduled = true;
aws_channel_task_init(
&slot->channel->window_update_task, s_window_update_task, slot->channel, "window update task");
aws_channel_schedule_task_now(slot->channel, &slot->channel->window_update_task);
Expand Down