mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 00:40:26 +00:00
Code Issues 1 Releases Wiki Activity

More NetBSD fixes

Browse Source 
A comptime known value of 0 for data in EV_SET with EVFILT_TIMER causes
a complete compilation failure (fails to link). This fixes it by making
it a 1 instead of a 0 for amount of milliseconds in the interval to wait
under NetBSD.
This commit is contained in:
llmII 2021-09-05 21:17:41 -05:00
parent 43b48fdbea
commit bbc07c72d3
No known key found for this signature in database
GPG Key ID: E3AD2E259F58A9A0
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/ev.c
View File

@ -1589,6 +1589,20 @@ void janet_ev_deinit(void) {
#define NOTE_ABSTIME 0 #define NOTE_ABSTIME 0
#endif #endif
/* NOTE:
* NetBSD fails to link when the EVSETx call is with EVFILT_TIMER and the data
* field is 0. I believe NetBSD supports 0 intervaled timeouts but when the
* value is a static value known at compile time, the macro does something
* that is odd enough to cause an issue unrelated to ev.c elsewhere in shell.c
* where linking just fails awfully. This is a kludge to fix it until someone
* smarter who understands why this is happening can create a better fix.
*/
#ifdef __NetBSD__
#define JANET_KQUEUE_INITIAL_WAIT 1
#else
#define JANET_KQUEUE_INITIAL_WAIT 0
#endif
/* TODO: make this available be we using kqueue or epoll, instead of /* TODO: make this available be we using kqueue or epoll, instead of
* redefinining it for kqueue and epoll separately? */ * redefinining it for kqueue and epoll separately? */
static JanetTimestamp ts_now(void) { static JanetTimestamp ts_now(void) {
@ -1738,7 +1752,11 @@ void janet_ev_init(void) {
struct kevent events[2]; struct kevent events[2];
/* Don't use JANET_KQUEUE_TS here, as even under FreeBSD we use intervals /* Don't use JANET_KQUEUE_TS here, as even under FreeBSD we use intervals
* here. */ * here. */
EV_SETx(&events[0], JANET_KQUEUE_TIMER_IDENT, EVFILT_TIMER, JANET_KQUEUE_TF, NOTE_MSECONDS, 0, &janet_vm.timer); EV_SETx(&events[0],
JANET_KQUEUE_TIMER_IDENT,
EVFILT_TIMER,
JANET_KQUEUE_TF,
NOTE_MSECONDS, JANET_KQUEUE_INITIAL_WAIT, &janet_vm.timer);
EV_SETx(&events[1], janet_vm.selfpipe[0], EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, janet_vm.selfpipe); EV_SETx(&events[1], janet_vm.selfpipe[0], EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, janet_vm.selfpipe);
add_kqueue_events(events, 2); add_kqueue_events(events, 2);
return; return;