From d86d2884c83ad521550fd0a4c179e9cae06f1c2a Mon Sep 17 00:00:00 2001 From: Andy Green Date: Tue, 9 Feb 2021 22:43:09 +0000 Subject: [PATCH] libevent: use evutil_socket_t --- lib/event-libs/libevent/libevent.c | 6 ++++++ .../minimal-http-server-eventlib-foreign/libevent.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/event-libs/libevent/libevent.c b/lib/event-libs/libevent/libevent.c index 0311b9ca0..e9240a094 100644 --- a/lib/event-libs/libevent/libevent.c +++ b/lib/event-libs/libevent/libevent.c @@ -226,6 +226,12 @@ elops_init_pt_event(struct lws_context *context, void *_loop, int tsi) ptpr->idle_timer = event_new(loop, -1, 0, lws_event_idle_timer_cb, pt); + { + struct timeval tv; + tv.tv_sec = (long)0; + tv.tv_usec = (long)1000; + evtimer_add(ptpr->hrtimer, &tv); + } /* Register the signal watcher unless it's a foreign loop */ diff --git a/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c b/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c index 31d75872b..b68b04307 100644 --- a/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c +++ b/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c @@ -23,13 +23,13 @@ static struct event *timer_outer_event; static struct event *sighandler_event; static void -timer_cb_event(int fd, short event, void *arg) +timer_cb_event(evutil_socket_t fd, short event, void *arg) { foreign_timer_service(loop_event); } static void -signal_cb_event(int fd, short event, void *arg) +signal_cb_event(evutil_socket_t fd, short event, void *arg) { signal_cb((int)(lws_intptr_t)arg); } @@ -46,11 +46,11 @@ foreign_event_loop_init_and_run_libevent(void) loop_event = event_base_new(); - sighandler_event = evsignal_new(loop_event, SIGINT, signal_cb_event, - (void*)SIGINT); + sighandler_event = evsignal_new((struct event_base *)loop_event, SIGINT, signal_cb_event, + (void*)SIGINT); - timer_outer_event = event_new(loop_event, -1, EV_PERSIST, - timer_cb_event, NULL); + timer_outer_event = event_new((struct event_base *)loop_event, -1, EV_PERSIST, + timer_cb_event, NULL); //evtimer_new(loop_event, timer_cb_event, NULL); evtimer_add(timer_outer_event, &tv);