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

519 lines
13 KiB
C
Raw Normal View History

Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
/*
* libwebsockets - small server side websockets and web server implementation
*
license: switch LGPLv2.1+SLE parts to MIT
2019-08-14 10:44:14 +01:00
* Copyright (C) 2010 - 2019 Andy Green <andy@warmcat.com>
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
*
license: switch LGPLv2.1+SLE parts to MIT
2019-08-14 10:44:14 +01:00
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
*
license: switch LGPLv2.1+SLE parts to MIT
2019-08-14 10:44:14 +01:00
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
*
license: switch LGPLv2.1+SLE parts to MIT
2019-08-14 10:44:14 +01:00
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
*/
private.h: rename to contain dir Having unique private header names is a requirement of a particular platform build system it's desirable to work with
2019-08-15 10:49:52 +01:00
#include "private-lib-core.h"
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
#include "private-lib-event-libs-libevent.h"
#define pt_to_priv_event(_pt) ((struct lws_pt_eventlibs_libevent *)(_pt)->evlib_pt)
#define wsi_to_priv_event(_w) ((struct lws_wsi_eventlibs_libevent *)(_w)->evlib_wsi)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
static void
lws_event_hrtimer_cb(int fd, short event, void *p)
{
struct lws_context_per_thread *pt = (struct lws_context_per_thread *)p;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr = pt_to_priv_event(pt);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
struct timeval tv;
lws_usec_t us;
lws_pt_lock(pt, __func__);
sul: multiple timer domains Adapt the pt sul owner list to be an array, and define two different lists, one that acts like before and is the default for existing users, and another that has the ability to cooperate with systemwide suspend to restrict the interval spent suspended so that it will wake in time for the earliest thing on this wake-suspend sul list. Clean the api a bit and add lws_sul_cancel() that only needs the sul as the argument. Add a flag for client creation info to indicate that this client connection is important enough that, eg, validity checking it to detect silently dead connections should go on the wake-suspend sul list. That flag is exposed in secure streams policy so it can be added to a streamtype with "swake_validity": true Deprecate out the old vhost timer stuff that predates sul. Add a flag LWS_WITH_DEPRECATED_THINGS in cmake so users can get it back temporarily before it will be removed in a v4.2. Adapt all remaining in-tree users of it to use explicit suls.
2020-05-28 12:48:17 +01:00
us = __lws_sul_service_ripe(pt->pt_sul_owner, LWS_COUNT_PT_SUL_OWNERS,
lws_now_usecs());
sequencer: upgrade timeout to use us Adapt service loops and event libs to use microsecond waits internally, for hrtimer and sequencer. Reduce granularity according to platform / event lib wait. Add a helper so there's a single place to extend it.
2019-08-08 06:30:14 +01:00
if (us) {
tv.tv_sec = us / LWS_US_PER_SEC;
tv.tv_usec = us - (tv.tv_sec * LWS_US_PER_SEC);
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
evtimer_add(ptpr->hrtimer, &tv);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
}
lws_pt_unlock(pt);
}
static void
lws_event_idle_timer_cb(int fd, short event, void *p)
{
struct lws_context_per_thread *pt = (struct lws_context_per_thread *)p;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr = pt_to_priv_event(pt);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
struct timeval tv;
lws_usec_t us;
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
if (pt->is_destroyed)
return;
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
lws_service_do_ripe_rxflow(pt);
/*
* is there anybody with pending stuff that needs service forcing?
*/
if (!lws_service_adjust_timeout(pt->context, 1, pt->tid)) {
/* -1 timeout means just do forced service */
service: resurrect timeout_ms being -1 as return immediately There's no longer any reason to come out of sleep for periodic service which has been eliminated by lws_sul. With event libs, there is no opportunity to do it anyway since their event loop is atomic and makes callbacks and sleeps until it is stopped. But some users are relying on the old poll() service loop as glue that's difficult to replace. So for now help that happen by accepting the timeout_ms of -1 as meaning sample poll and service what's there without any wait.
2019-09-16 15:36:12 +01:00
_lws_plat_service_forced_tsi(pt->context, pt->tid);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
/* still somebody left who wants forced service? */
if (!lws_service_adjust_timeout(pt->context, 1, pt->tid)) {
/* yes... come back again later */
tv.tv_sec = 0;
tv.tv_usec = 1000;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
evtimer_add(ptpr->idle_timer, &tv);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
return;
}
}
libevent: idle timer should not be EV_PERSIST
2019-02-16 17:26:10 +08:00
lwsl_debug("%s: wait\n", __func__);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
/* account for hrtimer */
lws_pt_lock(pt, __func__);
sul: multiple timer domains Adapt the pt sul owner list to be an array, and define two different lists, one that acts like before and is the default for existing users, and another that has the ability to cooperate with systemwide suspend to restrict the interval spent suspended so that it will wake in time for the earliest thing on this wake-suspend sul list. Clean the api a bit and add lws_sul_cancel() that only needs the sul as the argument. Add a flag for client creation info to indicate that this client connection is important enough that, eg, validity checking it to detect silently dead connections should go on the wake-suspend sul list. That flag is exposed in secure streams policy so it can be added to a streamtype with "swake_validity": true Deprecate out the old vhost timer stuff that predates sul. Add a flag LWS_WITH_DEPRECATED_THINGS in cmake so users can get it back temporarily before it will be removed in a v4.2. Adapt all remaining in-tree users of it to use explicit suls.
2020-05-28 12:48:17 +01:00
us = __lws_sul_service_ripe(pt->pt_sul_owner, LWS_COUNT_PT_SUL_OWNERS,
lws_now_usecs());
sequencer: upgrade timeout to use us Adapt service loops and event libs to use microsecond waits internally, for hrtimer and sequencer. Reduce granularity according to platform / event lib wait. Add a helper so there's a single place to extend it.
2019-08-08 06:30:14 +01:00
if (us) {
tv.tv_sec = us / LWS_US_PER_SEC;
tv.tv_usec = us - (tv.tv_sec * LWS_US_PER_SEC);
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
evtimer_add(ptpr->hrtimer, &tv);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
}
lws_pt_unlock(pt);
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
if (pt->destroy_self)
lws_context_destroy(pt->context);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
}
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
static void
lws_event_cb(evutil_socket_t sock_fd, short revents, void *ctx)
{
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_signal_watcher_libevent *lws_io =
(struct lws_signal_watcher_libevent *)ctx;
clean
2017-09-23 12:55:21 +08:00
struct lws_context *context = lws_io->context;
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
struct lws_context_per_thread *pt;
clean
2017-09-23 12:55:21 +08:00
struct lws_pollfd eventfd;
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
struct timeval tv;
struct lws *wsi;
clean
2017-09-23 12:55:21 +08:00
if (revents & EV_TIMEOUT)
return;
/* !!! EV_CLOSED doesn't exist in libevent2 */
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
#if LIBEVENT_VERSION_NUMBER < 0x02000000
clean
2017-09-23 12:55:21 +08:00
if (revents & EV_CLOSED) {
refactor: isolate event_loop struct content same way as roles
2018-04-29 08:34:19 +08:00
event_del(lws_io->event.watcher);
event_free(lws_io->event.watcher);
clean
2017-09-23 12:55:21 +08:00
return;
}
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
#endif
clean
2017-09-23 12:55:21 +08:00
eventfd.fd = sock_fd;
eventfd.events = 0;
eventfd.revents = 0;
if (revents & EV_READ) {
eventfd.events |= LWS_POLLIN;
eventfd.revents |= LWS_POLLIN;
}
if (revents & EV_WRITE) {
eventfd.events |= LWS_POLLOUT;
eventfd.revents |= LWS_POLLOUT;
}
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
wsi = wsi_from_fd(context, sock_fd);
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
if (!wsi)
minimal-http-server-eventlib-smp
2019-03-21 09:27:45 +08:00
return;
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
pt = &context->pt[(int)wsi->tsi];
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
if (pt->is_destroyed)
return;
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
lws_service_fd_tsi(context, &eventfd, wsi->tsi);
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
if (pt->destroy_self) {
event libs: context_destroy sequencing
2020-03-10 19:13:43 +00:00
lwsl_notice("%s: pt destroy self coming true\n", __func__);
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
lws_context_destroy(pt->context);
return;
}
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
/* set the idle timer for 1ms ahead */
tv.tv_sec = 0;
tv.tv_usec = 1000;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
evtimer_add(pt_to_priv_event(pt)->idle_timer, &tv);
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
cleaning
2020-01-02 08:32:23 +00:00
void
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
lws_event_sigint_cb(evutil_socket_t sock_fd, short revents, void *ctx)
{
clean
2017-09-23 12:55:21 +08:00
struct lws_context_per_thread *pt = ctx;
libevent: fix typo in signal handler https://github.com/warmcat/libwebsockets/issues/2095
2020-10-17 12:52:18 +01:00
struct event *signal = pt_to_priv_event(pt)->w_sigint.watcher;
clean
2017-09-23 12:55:21 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
if (pt->context->eventlib_signal_cb) {
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
pt->context->eventlib_signal_cb((void *)(lws_intptr_t)sock_fd,
event_get_signal(signal));
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
return;
}
refactor: isolate event_loop struct content same way as roles
2018-04-29 08:34:19 +08:00
if (!pt->event_loop_foreign)
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_base_loopbreak(pt_to_priv_event(pt)->io_loop);
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
static int
elops_init_pt_event(struct lws_context *context, void *_loop, int tsi)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
{
clean
2017-09-23 12:55:21 +08:00
struct lws_vhost *vh = context->vhost_list;
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
struct event_base *loop = (struct event_base *)_loop;
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
struct lws_context_per_thread *pt = &context->pt[tsi];
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr = pt_to_priv_event(pt);
clean
2017-09-23 12:55:21 +08:00
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
lwsl_info("%s: loop %p\n", __func__, _loop);
clean
2017-09-23 12:55:21 +08:00
if (!loop)
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
loop = event_base_new();
else
refactor: isolate event_loop struct content same way as roles
2018-04-29 08:34:19 +08:00
context->pt[tsi].event_loop_foreign = 1;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
if (!loop) {
lwsl_err("%s: creating event base failed\n", __func__);
return -1;
clean
2017-09-23 12:55:21 +08:00
}
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr->io_loop = loop;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
clean
2017-09-23 12:55:21 +08:00
/*
* Initialize all events with the listening sockets
* and register a callback for read operations
*/
while (vh) {
if (vh->lserv_wsi) {
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_io_watcher_libevent *w_read =
&(wsi_to_priv_event(vh->lserv_wsi)->w_read);
w_read->context = context;
w_read->watcher = event_new(
clean
2017-09-23 12:55:21 +08:00
loop, vh->lserv_wsi->desc.sockfd,
(EV_READ | EV_PERSIST), lws_event_cb,
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
w_read);
event_add(w_read->watcher, NULL);
w_read->set = 1;
clean
2017-09-23 12:55:21 +08:00
}
vh = vh->vhost_next;
}
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
/* static event loop objects */
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr->hrtimer = event_new(loop, -1, EV_PERSIST,
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
lws_event_hrtimer_cb, pt);
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr->idle_timer = event_new(loop, -1, 0,
libevent: idle timer should not be EV_PERSIST
2019-02-16 17:26:10 +08:00
lws_event_idle_timer_cb, pt);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
/* Register the signal watcher unless it's a foreign loop */
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
if (pt->event_loop_foreign)
clean
2017-09-23 12:55:21 +08:00
return 0;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr->w_sigint.watcher = evsignal_new(loop, SIGINT,
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
lws_event_sigint_cb, pt);
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_add(ptpr->w_sigint.watcher, NULL);
clean
2017-09-23 12:55:21 +08:00
return 0;
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
static int
elops_init_context_event(struct lws_context *context,
const struct lws_context_creation_info *info)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
{
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
int n;
clean
2017-09-23 12:55:21 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
context->eventlib_signal_cb = info->signal_cb;
clean
2017-09-23 12:55:21 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
for (n = 0; n < context->count_threads; n++)
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
pt_to_priv_event(&context->pt[n])->w_sigint.context = context;
clean
2017-09-23 12:55:21 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
return 0;
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
uv: allocate watcher Until now the uv watcher has been composed in the wsi. This works fine except in the case of a client wsi that meets a redirect when the event loop is libuv with its requirement for handle close via the event loop. We want to reuse the wsi, since the originator of it has a copy of the wsi pointer, and we want to conceal the redirect. Since the redirect is commonly to a different IP, we want to keep the wsi alive while closing its socket cleanly. That's not too difficult, unless you are using uv. With UV the comoposed watcher is a disaster, since after the close is requested the wsi will start to reconnect. We tried to deal with that by copying the uv handle and freeing it when the handle close finalizes. But it turns out the handle is in a linked-list scheme in uv. This patch hopefully finally solves it by giving the uv handle its own allocation from the start. When we want to close the socket and reuse the wsi, we simply take responsibility for freeing the handle and set the wsi watcher pointer to NULL.
2018-10-13 11:59:04 +08:00
static int
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
elops_accept_event(struct lws *wsi)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
{
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
struct lws_context *context = lws_get_context(wsi);
clean
2017-09-23 12:55:21 +08:00
struct lws_context_per_thread *pt;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr;
struct lws_wsi_eventlibs_libevent *wpr = wsi_to_priv_event(wsi);
clean
2017-09-23 12:55:21 +08:00
int fd;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
wpr->w_read.context = context;
wpr->w_write.context = context;
clean
2017-09-23 12:55:21 +08:00
// Initialize the event
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
pt = &context->pt[(int)wsi->tsi];
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr = pt_to_priv_event(pt);
clean
2017-09-23 12:55:21 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
if (wsi->role_ops->file_handle)
fd = wsi->desc.filefd;
clean
2017-09-23 12:55:21 +08:00
else
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
fd = wsi->desc.sockfd;
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
wpr->w_read.watcher = event_new(ptpr->io_loop, fd,
(EV_READ | EV_PERSIST), lws_event_cb, &wpr->w_read);
wpr->w_write.watcher = event_new(ptpr->io_loop, fd,
(EV_WRITE | EV_PERSIST), lws_event_cb, &wpr->w_write);
uv: allocate watcher Until now the uv watcher has been composed in the wsi. This works fine except in the case of a client wsi that meets a redirect when the event loop is libuv with its requirement for handle close via the event loop. We want to reuse the wsi, since the originator of it has a copy of the wsi pointer, and we want to conceal the redirect. Since the redirect is commonly to a different IP, we want to keep the wsi alive while closing its socket cleanly. That's not too difficult, unless you are using uv. With UV the comoposed watcher is a disaster, since after the close is requested the wsi will start to reconnect. We tried to deal with that by copying the uv handle and freeing it when the handle close finalizes. But it turns out the handle is in a linked-list scheme in uv. This patch hopefully finally solves it by giving the uv handle its own allocation from the start. When we want to close the socket and reuse the wsi, we simply take responsibility for freeing the handle and set the wsi watcher pointer to NULL.
2018-10-13 11:59:04 +08:00
return 0;
libevent: fix memory leak - Added event free function for accept.
2018-01-17 02:05:45 +01:00
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
static void
elops_io_event(struct lws *wsi, int flags)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
{
fakewsi: replace with smaller substructure Currently we always reserve a fakewsi per pt so events that don't have a related actual wsi, like vhost-protocol-init or vhost cert init via protocol callback can make callbacks that look reasonable to user protocol handler code expecting a valid wsi every time. This patch splits out stuff that user callbacks often unconditionally expect to be in a wsi, like context pointer, vhost pointer etc into a substructure, which is composed into struct lws at the top of it. Internal references (struct lws is opaque, so there are only internal references) are all updated to go via the substructre, the compiler should make that a NOP. Helpers are added when fakewsi is used and referenced. If not PLAT_FREERTOS, we continue to provide a full fakewsi in the pt as before, although the helpers improve consistency by zeroing down the substructure. There is a huge amount of user code out there over the last 10 years that did not always have the minimal examples to follow, some of it does some unexpected things. If it is PLAT_FREERTOS, that is a newer thing in lws and users have the benefit of being able to follow the minimal examples' approach. For PLAT_FREERTOS we don't reserve the fakewsi in the pt any more, saving around 800 bytes. The helpers then create a struct lws_a (the substructure) on the stack, zero it down (but it is only like 4 pointers) and prepare it with whatever we know like the context. Then we cast it to a struct lws * and use it in the user protocol handler call. In this case, the remainder of the struct lws is undefined. However the amount of old protocol handlers that might touch things outside of the substructure in PLAT_FREERTOS is very limited compared to legacy lws user code and the saving is significant on constrained devices. User handlers should not be touching everything in a wsi every time anyway, there are several cases where there is no valid wsi to do the call with. Dereference of things outside the substructure should only happen when the callback reason shows there is a valid wsi bound to the activity (as in all the minimal examples).
2020-07-19 08:33:46 +01:00
struct lws_context_per_thread *pt = &wsi->a.context->pt[(int)wsi->tsi];
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr = pt_to_priv_event(pt);
struct lws_wsi_eventlibs_libevent *wpr = wsi_to_priv_event(wsi);
clean
2017-09-23 12:55:21 +08:00
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if (!ptpr->io_loop || wsi->a.context->being_destroyed ||
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
pt->is_destroyed)
clean
2017-09-23 12:55:21 +08:00
return;
assert((flags & (LWS_EV_START | LWS_EV_STOP)) &&
(flags & (LWS_EV_READ | LWS_EV_WRITE)));
if (flags & LWS_EV_START) {
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if ((flags & LWS_EV_WRITE) && !wpr->w_write.set) {
event_add(wpr->w_write.watcher, NULL);
wpr->w_write.set = 1;
libevent: enforce no event state duplication https://github.com/warmcat/libwebsockets/issues/1956
2020-06-19 19:54:17 +01:00
}
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if ((flags & LWS_EV_READ) && !wpr->w_read.set) {
event_add(wpr->w_read.watcher, NULL);
wpr->w_read.set = 1;
libevent: enforce no event state duplication https://github.com/warmcat/libwebsockets/issues/1956
2020-06-19 19:54:17 +01:00
}
clean
2017-09-23 12:55:21 +08:00
} else {
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if ((flags & LWS_EV_WRITE) && wpr->w_write.set) {
event_del(wpr->w_write.watcher);
wpr->w_write.set = 0;
libevent: enforce no event state duplication https://github.com/warmcat/libwebsockets/issues/1956
2020-06-19 19:54:17 +01:00
}
clean
2017-09-23 12:55:21 +08:00
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if ((flags & LWS_EV_READ) && wpr->w_read.set) {
event_del(wpr->w_read.watcher);
wpr->w_read.set = 0;
libevent: enforce no event state duplication https://github.com/warmcat/libwebsockets/issues/1956
2020-06-19 19:54:17 +01:00
}
clean
2017-09-23 12:55:21 +08:00
}
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
static void
elops_run_pt_event(struct lws_context *context, int tsi)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
{
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
/* Run / Dispatch the event_base loop */
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if (pt_to_priv_event(&context->pt[tsi])->io_loop)
event_base_dispatch(
pt_to_priv_event(&context->pt[tsi])->io_loop);
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
}
clean
2017-09-23 12:55:21 +08:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
static void
elops_destroy_pt_event(struct lws_context *context, int tsi)
{
struct lws_context_per_thread *pt = &context->pt[tsi];
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr = pt_to_priv_event(pt);
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
struct lws_vhost *vh = context->vhost_list;
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
lwsl_info("%s\n", __func__);
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if (!ptpr->io_loop)
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
return;
/*
* Free all events with the listening sockets
*/
while (vh) {
if (vh->lserv_wsi) {
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_wsi_eventlibs_libevent *w =
wsi_to_priv_event(vh->lserv_wsi);
event_free(w->w_read.watcher);
w->w_read.watcher = NULL;
event_free(w->w_write.watcher);
w->w_write.watcher = NULL;
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
}
vh = vh->vhost_next;
}
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_free(ptpr->hrtimer);
event_free(ptpr->idle_timer);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
if (!pt->event_loop_foreign) {
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_del(ptpr->w_sigint.watcher);
event_free(ptpr->w_sigint.watcher);
event_base_loopexit(ptpr->io_loop, NULL);
event libs: context_destroy sequencing
2020-03-10 19:13:43 +00:00
// event_base_free(pt->event.io_loop);
// pt->event.io_loop = NULL;
lwsl_notice("%s: set to exit loop\n", __func__);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
}
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
static void
elops_destroy_wsi_event(struct lws *wsi)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
{
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
struct lws_context_per_thread *pt;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_wsi_eventlibs_libevent *w;
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
if (!wsi)
return;
fakewsi: replace with smaller substructure Currently we always reserve a fakewsi per pt so events that don't have a related actual wsi, like vhost-protocol-init or vhost cert init via protocol callback can make callbacks that look reasonable to user protocol handler code expecting a valid wsi every time. This patch splits out stuff that user callbacks often unconditionally expect to be in a wsi, like context pointer, vhost pointer etc into a substructure, which is composed into struct lws at the top of it. Internal references (struct lws is opaque, so there are only internal references) are all updated to go via the substructre, the compiler should make that a NOP. Helpers are added when fakewsi is used and referenced. If not PLAT_FREERTOS, we continue to provide a full fakewsi in the pt as before, although the helpers improve consistency by zeroing down the substructure. There is a huge amount of user code out there over the last 10 years that did not always have the minimal examples to follow, some of it does some unexpected things. If it is PLAT_FREERTOS, that is a newer thing in lws and users have the benefit of being able to follow the minimal examples' approach. For PLAT_FREERTOS we don't reserve the fakewsi in the pt any more, saving around 800 bytes. The helpers then create a struct lws_a (the substructure) on the stack, zero it down (but it is only like 4 pointers) and prepare it with whatever we know like the context. Then we cast it to a struct lws * and use it in the user protocol handler call. In this case, the remainder of the struct lws is undefined. However the amount of old protocol handlers that might touch things outside of the substructure in PLAT_FREERTOS is very limited compared to legacy lws user code and the saving is significant on constrained devices. User handlers should not be touching everything in a wsi every time anyway, there are several cases where there is no valid wsi to do the call with. Dereference of things outside the substructure should only happen when the callback reason shows there is a valid wsi bound to the activity (as in all the minimal examples).
2020-07-19 08:33:46 +01:00
pt = &wsi->a.context->pt[(int)wsi->tsi];
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
if (pt->is_destroyed)
return;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
w = wsi_to_priv_event(wsi);
if (w->w_read.watcher) {
event_free(w->w_read.watcher);
w->w_read.watcher = NULL;
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if (w->w_write.watcher) {
event_free(w->w_write.watcher);
w->w_write.watcher = NULL;
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
}
}
static int
elops_wsi_logical_close_event(struct lws *wsi)
{
elops_destroy_wsi_event(wsi);
return 0;
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
static int
elops_init_vhost_listen_wsi_event(struct lws *wsi)
{
struct lws_context_per_thread *pt;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr;
struct lws_wsi_eventlibs_libevent *w;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
int fd;
if (!wsi) {
assert(0);
return 0;
}
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
w = wsi_to_priv_event(wsi);
w->w_read.context = wsi->a.context;
w->w_write.context = wsi->a.context;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
fakewsi: replace with smaller substructure Currently we always reserve a fakewsi per pt so events that don't have a related actual wsi, like vhost-protocol-init or vhost cert init via protocol callback can make callbacks that look reasonable to user protocol handler code expecting a valid wsi every time. This patch splits out stuff that user callbacks often unconditionally expect to be in a wsi, like context pointer, vhost pointer etc into a substructure, which is composed into struct lws at the top of it. Internal references (struct lws is opaque, so there are only internal references) are all updated to go via the substructre, the compiler should make that a NOP. Helpers are added when fakewsi is used and referenced. If not PLAT_FREERTOS, we continue to provide a full fakewsi in the pt as before, although the helpers improve consistency by zeroing down the substructure. There is a huge amount of user code out there over the last 10 years that did not always have the minimal examples to follow, some of it does some unexpected things. If it is PLAT_FREERTOS, that is a newer thing in lws and users have the benefit of being able to follow the minimal examples' approach. For PLAT_FREERTOS we don't reserve the fakewsi in the pt any more, saving around 800 bytes. The helpers then create a struct lws_a (the substructure) on the stack, zero it down (but it is only like 4 pointers) and prepare it with whatever we know like the context. Then we cast it to a struct lws * and use it in the user protocol handler call. In this case, the remainder of the struct lws is undefined. However the amount of old protocol handlers that might touch things outside of the substructure in PLAT_FREERTOS is very limited compared to legacy lws user code and the saving is significant on constrained devices. User handlers should not be touching everything in a wsi every time anyway, there are several cases where there is no valid wsi to do the call with. Dereference of things outside the substructure should only happen when the callback reason shows there is a valid wsi bound to the activity (as in all the minimal examples).
2020-07-19 08:33:46 +01:00
pt = &wsi->a.context->pt[(int)wsi->tsi];
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr = pt_to_priv_event(pt);
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
if (wsi->role_ops->file_handle)
fd = wsi->desc.filefd;
else
fd = wsi->desc.sockfd;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
w->w_read.watcher = event_new(ptpr->io_loop, fd, (EV_READ | EV_PERSIST),
lws_event_cb, &w->w_read);
w->w_write.watcher = event_new(ptpr->io_loop, fd,
(EV_WRITE | EV_PERSIST),
lws_event_cb, &w->w_write);
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
elops_io_event(wsi, LWS_EV_START | LWS_EV_READ);
return 0;
}
static int
elops_destroy_context2_event(struct lws_context *context)
{
struct lws_context_per_thread *pt;
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
struct lws_pt_eventlibs_libevent *ptpr;
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
int n, m;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
minimal-http-server-eventlib-smp
2019-03-21 09:27:45 +08:00
lwsl_debug("%s: in\n", __func__);
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
for (n = 0; n < context->count_threads; n++) {
int budget = 1000;
pt = &context->pt[n];
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
ptpr = pt_to_priv_event(pt);
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
/* only for internal loops... */
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
if (pt->event_loop_foreign || !ptpr->io_loop)
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
continue;
if (!context->finalize_destroy_after_internal_loops_stopped) {
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_base_loopexit(ptpr->io_loop, NULL);
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
continue;
}
while (budget-- &&
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
(m = event_base_loop(ptpr->io_loop, EVLOOP_NONBLOCK)))
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
;
#if 0
if (m) {
lwsl_err("%s: tsi %d: NOT everything closed\n",
__func__, n);
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_base_dump_events(ptpr->io_loop, stderr);
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
} else
lwsl_debug("%s: %d: everything closed OK\n", __func__, n);
#endif
event libs: context_destroy sequencing
2020-03-10 19:13:43 +00:00
lwsl_err("%s: event_base_free\n", __func__);
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
event_base_free(ptpr->io_loop);
ptpr->io_loop = NULL;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
}
minimal-http-server-eventlib-smp
2019-03-21 09:27:45 +08:00
lwsl_debug("%s: out\n", __func__);
hrtimer: add support for libevent and libev
2018-05-02 18:35:58 +08:00
return 0;
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
}
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
static const struct lws_event_loop_ops event_loop_ops_event = {
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
/* name */ "libevent",
/* init_context */ elops_init_context_event,
/* destroy_context1 */ NULL,
refactor: remove more test apps and replace with minimal-examples
2018-04-30 09:16:04 +08:00
/* destroy_context2 */ elops_destroy_context2_event,
/* init_vhost_listen_wsi */ elops_init_vhost_listen_wsi_event,
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
/* init_pt */ elops_init_pt_event,
event lib: update http client multi to work with it and clean destroy flow Add selectable event lib support to minimal-http-client-multi and clean up context destroy flow so we can use lws_destroy_context() from inside the callback to indicate we want to end the event loop, without using the traditional "interrupted" flag and in a way that works no matter which event loop backend is being used.
2020-01-23 11:12:28 +00:00
/* wsi_logical_close */ elops_wsi_logical_close_event,
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
/* check_client_connect_ok */ NULL,
/* close_handle_manually */ NULL,
/* accept */ elops_accept_event,
/* io */ elops_io_event,
/* run_pt */ elops_run_pt_event,
/* destroy_pt */ elops_destroy_pt_event,
/* destroy wsi */ elops_destroy_wsi_event,
event-lib-glib Adds support for glib event library.
2020-02-07 11:39:32 +00:00
/* flags */ 0,
event libs: default to building as dynamically loaded plugins Event lib support as it has been isn't scaling well, at the low level libevent and libev headers have a namespace conflict so they can't both be built into the same image, and at the distro level, binding all the event libs to libwebsockets.so makes a bloaty situation for packaging, lws will drag in all the event libs every time. This patch implements the plan discussed here https://github.com/warmcat/libwebsockets/issues/1980 and refactors the event lib support so they are built into isolated plugins and bound at runtime according to what the application says it wants to use. The event lib plugins can be packaged individually so that only the needed sets of support are installed (perhaps none of them if the user code is OK with the default poll() loop). And dependent user code can mark the specific event loop plugin package as required so pieces are added as needed. The eventlib-foreign example is also refactored to build the selected lib support isolated. A readme is added detailing the changes and how to use them. https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.event-libs.md
2020-08-27 15:37:14 +01:00
/* evlib_size_ctx */ 0,
/* evlib_size_pt */ sizeof(struct lws_pt_eventlibs_libevent),
/* evlib_size_vh */ 0,
/* evlib_size_wsi */ sizeof(struct lws_wsi_eventlibs_libevent),
};
#if defined(LWS_WITH_EVLIB_PLUGINS)
LWS_VISIBLE
#endif
const lws_plugin_evlib_t evlib_event = {
.hdr = {
"libevent event loop",
"lws_evlib_plugin",
LWS_PLUGIN_API_MAGIC
},
.ops = &event_loop_ops_event
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
};
Reference in a new issue Copy permalink