Skip to content

Commit

Permalink
fied scheduling issue in httpout introduced by 3ad5e1e
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanlf committed Dec 11, 2023
1 parent 83c6d0f commit b9ca6cc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/filters/out_http.c
Expand Up @@ -3429,12 +3429,12 @@ static void httpout_process_session(GF_Filter *filter, GF_HTTPOutCtx *ctx, GF_HT
}

if (!gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_WRITE)) {
ctx->next_wake_us=1;
ctx->next_wake_us = 1;
return;
}
//flush session if async, with no select
if (gf_dm_sess_flush_async(sess->http_sess, GF_TRUE)==GF_IP_NETWORK_EMPTY) {
ctx->next_wake_us=1;
ctx->next_wake_us = 1;
return;
}
//resource is not set
Expand Down Expand Up @@ -3483,7 +3483,7 @@ static void httpout_process_session(GF_Filter *filter, GF_HTTPOutCtx *ctx, GF_HT
s32 nb_read = sess->cbk_read(sess->rt_udta, sess->buffer, sess->ctx->block_size);

if (nb_read<0) {
ctx->next_wake_us=1;
ctx->next_wake_us = 1;
sess->last_active_time = gf_sys_clock_high_res();
return;
}
Expand Down Expand Up @@ -4288,11 +4288,11 @@ static void httpout_process_inputs(GF_HTTPOutCtx *ctx)
continue;
}
if (gf_dm_sess_flush_async(in->upload, GF_TRUE) == GF_IP_NETWORK_EMPTY) {
ctx->next_wake_us=1;
ctx->next_wake_us = 1;
continue;
}
if (gf_dm_sess_flush_async(in->llhls_upload, GF_TRUE) == GF_IP_NETWORK_EMPTY) {
ctx->next_wake_us=1;
ctx->next_wake_us = 1;
continue;
}

Expand All @@ -4310,7 +4310,7 @@ static void httpout_process_inputs(GF_HTTPOutCtx *ctx)
if (in->flush_close || in->flush_close_llhls)
keep_alive = GF_TRUE;
}
ctx->next_wake_us=0;
ctx->next_wake_us = 100;
continue;
}
if (in->in_error) {
Expand Down

0 comments on commit b9ca6cc

Please sign in to comment.