Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

smp: context lock around vhost destroy

Browse source
This commit is contained in:
Andy Green 2018-06-27 07:49:04 +08:00
parent b58fb2dae3
commit 855114e39a
3 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/core/context.c
View file

@ -1620,8 +1620,10 @@ lws_vhost_destroy1(struct lws_vhost *vh)
lwsl_info("%s\n", __func__);
lws_context_lock(context, "vhost destroy 1"); /* ---------- context { */
if (vh->being_destroyed)
return;
goto out;
lws_vhost_lock(vh); /* -------------- vh { */
@ -1678,10 +1680,13 @@ lws_vhost_destroy1(struct lws_vhost *vh)
* It will start closing all wsi on this vhost. When the last wsi
* is closed, it will trigger lws_vhost_destroy2()
*/
out:
lws_context_unlock(context); /* --------------------------- context { */
}
void
lws_vhost_destroy2(struct lws_vhost *vh)
__lws_vhost_destroy2(struct lws_vhost *vh)
{
const struct lws_protocols *protocol = NULL;
struct lws_context *context = vh->context;
@ -1889,10 +1894,13 @@ LWS_VISIBLE void
lws_vhost_destroy(struct lws_vhost *vh)
{
struct lws_deferred_free *df = lws_malloc(sizeof(*df), "deferred free");
struct lws_context *context = vh->context;
if (!df)
return;
lws_context_lock(context, __func__); /* ------ context { */
lws_vhost_destroy1(vh);
if (!vh->count_bound_wsi) {
@ -1903,10 +1911,10 @@ lws_vhost_destroy(struct lws_vhost *vh)
*
* Finalize the vh destruction immediately
*/
lws_vhost_destroy2(vh);
__lws_vhost_destroy2(vh);
lws_free(df);
return;
goto out;
}
/* part 2 is deferred to allow all the handle closes to complete */
@ -1915,6 +1923,9 @@ lws_vhost_destroy(struct lws_vhost *vh)
df->deadline = lws_now_secs();
df->payload = vh;
vh->context->deferred_free_list = df;
out:
lws_context_unlock(context); /* } context ------------------- */
}
/*
@ -1987,6 +1998,8 @@ lws_context_destroy2(struct lws_context *context)
lwsl_info("%s: ctx %p\n", __func__, context);
lws_context_lock(context, "context destroy 2"); /* ------ context { */
context->being_destroyed2 = 1;
if (context->pt[0].fds)
@ -1999,7 +2012,7 @@ lws_context_destroy2(struct lws_context *context)
vh = context->vhost_list;
while (vh) {
vh1 = vh->vhost_next;
lws_vhost_destroy2(vh);
__lws_vhost_destroy2(vh);
vh = vh1;
}
@ -2007,7 +2020,7 @@ lws_context_destroy2(struct lws_context *context)
while (context->vhost_pending_destruction_list)
/* removes itself from list */
lws_vhost_destroy2(context->vhost_pending_destruction_list);
__lws_vhost_destroy2(context->vhost_pending_destruction_list);
lws_stats_log_dump(context);
@ -2048,6 +2061,8 @@ lws_context_destroy2(struct lws_context *context)
if (context->pt[n].inside_service)
return;
lws_context_unlock(context); /* } context ------------------- */
lws_context_destroy3(context);
}

39
lib/core/libwebsockets.c
View file

@ -123,25 +123,30 @@ lws_vhost_bind_wsi(struct lws_vhost *vh, struct lws *wsi)
void
lws_vhost_unbind_wsi(struct lws *wsi)
{
if (wsi->vhost) {
assert(wsi->vhost->count_bound_wsi > 0);
wsi->vhost->count_bound_wsi--;
lwsl_info("%s: vh %s: count_bound_wsi %d\n", __func__,
wsi->vhost->name, wsi->vhost->count_bound_wsi);
if (!wsi->vhost)
return;
if (!wsi->vhost->count_bound_wsi &&
wsi->vhost->being_destroyed) {
/*
* We have closed all wsi that were bound to this vhost
* by any pt: nothing can be servicing any wsi belonging
* to it any more.
*
* Finalize the vh destruction
*/
lws_vhost_destroy2(wsi->vhost);
}
wsi->vhost = NULL;
lws_context_lock(wsi->context, __func__); /* ---------- context { */
assert(wsi->vhost->count_bound_wsi > 0);
wsi->vhost->count_bound_wsi--;
lwsl_info("%s: vh %s: count_bound_wsi %d\n", __func__,
wsi->vhost->name, wsi->vhost->count_bound_wsi);
if (!wsi->vhost->count_bound_wsi &&
wsi->vhost->being_destroyed) {
/*
* We have closed all wsi that were bound to this vhost
* by any pt: nothing can be servicing any wsi belonging
* to it any more.
*
* Finalize the vh destruction
*/
__lws_vhost_destroy2(wsi->vhost);
}
wsi->vhost = NULL;
lws_context_unlock(wsi->context); /* } context ---------- */
}
void

2
lib/core/private.h
View file

@ -528,7 +528,7 @@ lws_vhost_bind_wsi(struct lws_vhost *vh, struct lws *wsi);
void
lws_vhost_unbind_wsi(struct lws *wsi);
void
lws_vhost_destroy2(struct lws_vhost *vh);
__lws_vhost_destroy2(struct lws_vhost *vh);
struct lws_deferred_free
{