Skip to content
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

fix: hanging registration close due to a race in listener stop/close #269

Merged
merged 1 commit into from
May 3, 2024
Merged

fix: hanging registration close due to a race in listener stop/close #269

Show file tree
Hide file tree
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
26 changes: 19 additions & 7 deletions c_src/quicer_listener.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,17 @@ ServerListenerCallback(__unused_parm__ HQUIC Listener,
QuicerConnCTX *c_ctx = NULL;
BOOLEAN is_destroy = FALSE;

BOOLEAN is_worker = (enif_thread_type() == ERL_NIF_THR_UNDEFINED);

if (is_worker)
{
enif_mutex_lock(l_ctx->lock);
}

switch (Event->Type)
{
case QUIC_LISTENER_EVENT_NEW_CONNECTION:
enif_mutex_lock(l_ctx->lock);

//
// Note, c_ctx is newly init here, don't grab lock.
//
Expand Down Expand Up @@ -219,9 +226,8 @@ ServerListenerCallback(__unused_parm__ HQUIC Listener,
break;

case QUIC_LISTENER_EVENT_STOP_COMPLETE:
// **Note**, the callback in msquic for this event is called in the
// MsQuicListenerClose or MsQuicListenerStop. we assume caller should
// ensure the thread safty thus we don't hold lock
// **Note**, this callback event in msquic can be triggered by either
// MsQuicListenerClose or MsQuicListenerStop.
env = l_ctx->env;
enif_send(NULL,
&(l_ctx->listenerPid),
Expand All @@ -238,15 +244,21 @@ ServerListenerCallback(__unused_parm__ HQUIC Listener,
assert(!l_ctx->is_stopped);
is_destroy = TRUE;
}
else
{
l_ctx->is_stopped = TRUE;
}
enif_clear_env(env);
goto Exit2;
break;
default:
break;
}

Error:
enif_mutex_unlock(l_ctx->lock);
Exit2:
if (is_worker)
{
enif_mutex_unlock(l_ctx->lock);
}
if (is_destroy)
{
destroy_l_ctx(l_ctx);
Expand Down
2 changes: 1 addition & 1 deletion c_src/quicer_nif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ resource_listener_down_callback(__unused_parm__ ErlNifEnv *env,
// b. Some pid could still close the stopped listener with nif
// handle.
// c. We close it in resource_listener_dealloc_callback anyway when
// Listener term get GC.
// Listener term get GCed.
*/
MsQuic->ListenerStop(l_ctx->Listener);
put_listener_handle(l_ctx);
Expand Down
Loading