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

windows: remove unused event array

Browse source
This commit is contained in:
Andy Green 2018-05-26 19:41:06 +08:00
parent cfa15b4a73
commit 44efcd6196
1 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/plat/lws-plat-win.c
View file

@ -20,7 +20,7 @@ lws_plat_pipe_signal(struct lws *wsi)
{ {
struct lws_context_per_thread *pt = &wsi->context->pt[(int)wsi->tsi]; struct lws_context_per_thread *pt = &wsi->context->pt[(int)wsi->tsi];
WSASetEvent(pt->events[0]); /* trigger the cancel event */ WSASetEvent(pt->events); /* trigger the cancel event */
return 0; return 0;
} }
@ -245,7 +245,7 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
* any wsi has truncated, force him signalled * any wsi has truncated, force him signalled
*/ */
if (wsi->trunc_len) if (wsi->trunc_len)
WSASetEvent(pt->events[0]); WSASetEvent(pt->events);
} }
/* /*
@ -276,7 +276,7 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
if (ev == WSA_WAIT_EVENT_0) { if (ev == WSA_WAIT_EVENT_0) {
unsigned int eIdx, err; unsigned int eIdx, err;
WSAResetEvent(pt->events[0]); WSAResetEvent(pt->events);
if (pt->context->tls_ops && if (pt->context->tls_ops &&
pt->context->tls_ops->fake_POLLIN_for_buffered) pt->context->tls_ops->fake_POLLIN_for_buffered)
@ -415,10 +415,7 @@ lws_plat_context_early_destroy(struct lws_context *context)
int n = context->count_threads; int n = context->count_threads;
while (n--) { while (n--) {
if (pt->events) { WSACloseEvent(pt->events);
WSACloseEvent(pt->events[0]);
lws_free(pt->events);
}
pt++; pt++;
} }
} }
@ -472,8 +469,7 @@ lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)
struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi]; struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi];
pt->fds[pt->fds_count++].revents = 0; pt->fds[pt->fds_count++].revents = 0;
pt->events[pt->fds_count] = pt->events[0]; WSAEventSelect(wsi->desc.sockfd, pt->events,
WSAEventSelect(wsi->desc.sockfd, pt->events[0],
LWS_POLLIN | LWS_POLLHUP | FD_CONNECT); LWS_POLLIN | LWS_POLLHUP | FD_CONNECT);
} }
@ -481,9 +477,6 @@ LWS_VISIBLE void
lws_plat_delete_socket_from_fds(struct lws_context *context, lws_plat_delete_socket_from_fds(struct lws_context *context,
struct lws *wsi, int m) struct lws *wsi, int m)
{ {
struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi];
pt->events[m + 1] = pt->events[pt->fds_count--];
} }
LWS_VISIBLE void LWS_VISIBLE void
@ -521,8 +514,7 @@ lws_plat_change_pollfd(struct lws_context *context,
if ((pfd->events & LWS_POLLOUT)) if ((pfd->events & LWS_POLLOUT))
networkevents |= LWS_POLLOUT; networkevents |= LWS_POLLOUT;
if (WSAEventSelect(wsi->desc.sockfd, if (WSAEventSelect(wsi->desc.sockfd, pt->events,
pt->events[0],
networkevents) != SOCKET_ERROR) networkevents) != SOCKET_ERROR)
return 0; return 0;
@ -738,23 +730,16 @@ lws_plat_init(struct lws_context *context,
for (i = 0; i < FD_HASHTABLE_MODULUS; i++) { for (i = 0; i < FD_HASHTABLE_MODULUS; i++) {
context->fd_hashtable[i].wsi = context->fd_hashtable[i].wsi =
lws_zalloc(sizeof(struct lws*) * context->max_fds, "win hashtable"); lws_zalloc(sizeof(struct lws*) * context->max_fds,
"win hashtable");
if (!context->fd_hashtable[i].wsi) if (!context->fd_hashtable[i].wsi)
return -1; return -1;
} }
while (n--) { while (n--) {
pt->events = lws_malloc(sizeof(WSAEVENT) *
(context->fd_limit_per_thread + 1), "event table");
if (pt->events == NULL) {
lwsl_err("Unable to allocate events array for %d connections\n",
context->fd_limit_per_thread + 1);
return 1;
}
pt->fds_count = 0; pt->fds_count = 0;
pt->events[0] = WSACreateEvent(); /* the cancel event */ pt->events = WSACreateEvent(); /* the cancel event */
pt++; pt++;
} }