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

ev: remove any watchers on close

Browse source
This commit is contained in:
Dustin Lundquist 2024-01-15 06:12:58 +00:00 • committed by Andy Green
parent c57733cb00
commit 9393dd3934
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/event-libs/libev/libev.c
View file

@ -94,6 +94,7 @@ lws_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
struct lws_context_per_thread *pt; struct lws_context_per_thread *pt;
struct lws_pollfd eventfd; struct lws_pollfd eventfd;
struct lws *wsi; struct lws *wsi;
int tsi = 0;
if (revents & EV_ERROR) if (revents & EV_ERROR)
return; return;
@ -112,10 +113,12 @@ lws_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
} }
wsi = wsi_from_fd(context, watcher->fd); wsi = wsi_from_fd(context, watcher->fd);
pt = &context->pt[(int)wsi->tsi]; if (wsi)
tsi = (int)wsi->tsi;
pt = &context->pt[tsi];
ptpr = pt_to_priv_ev(pt); ptpr = pt_to_priv_ev(pt);
lws_service_fd_tsi(context, &eventfd, (int)wsi->tsi); lws_service_fd_tsi(context, &eventfd, tsi);
ev_idle_start(ptpr->io_loop, &ptpr->idle); ev_idle_start(ptpr->io_loop, &ptpr->idle);
} }
@ -413,6 +416,14 @@ elops_destroy_wsi_ev(struct lws *wsi)
ev_io_stop(ptpr->io_loop, &w->w_write.watcher); ev_io_stop(ptpr->io_loop, &w->w_write.watcher);
} }
static int
elops_wsi_logical_close_ev(struct lws *wsi)
{
elops_destroy_wsi_ev(wsi);
return 0;
}
static const struct lws_event_loop_ops event_loop_ops_ev = { static const struct lws_event_loop_ops event_loop_ops_ev = {
/* name */ "libev", /* name */ "libev",
/* init_context */ elops_init_context_ev, /* init_context */ elops_init_context_ev,
@ -420,7 +431,7 @@ static const struct lws_event_loop_ops event_loop_ops_ev = {
/* destroy_context2 */ elops_destroy_context2_ev, /* destroy_context2 */ elops_destroy_context2_ev,
/* init_vhost_listen_wsi */ elops_init_vhost_listen_wsi_ev, /* init_vhost_listen_wsi */ elops_init_vhost_listen_wsi_ev,
/* init_pt */ elops_init_pt_ev, /* init_pt */ elops_init_pt_ev,
/* wsi_logical_close */ NULL, /* wsi_logical_close */ elops_wsi_logical_close_ev,
/* check_client_connect_ok */ NULL, /* check_client_connect_ok */ NULL,
/* close_handle_manually */ NULL, /* close_handle_manually */ NULL,
/* accept */ elops_accept_ev, /* accept */ elops_accept_ev,