--- libaitsched/src/hooks.c 2023/08/17 14:14:24 1.42 +++ libaitsched/src/hooks.c 2026/11/13 10:07:22 1.43 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.42 2023/08/17 14:14:24 misho Exp $ +* $Id: hooks.c,v 1.43 2026/11/13 10:07:22 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2023 +Copyright 2004 - 2026 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -149,9 +149,9 @@ sched_hook_init(void *root, void *arg __unused) r->root_kq ^= r->root_kq; #endif - FD_ZERO(&r->root_fds[0]); - FD_ZERO(&r->root_fds[1]); - FD_ZERO(&r->root_fds[2]); + SCHED_FD_ZERO(&r->root_fds[0]); + SCHED_FD_ZERO(&r->root_fds[1]); + SCHED_FD_ZERO(&r->root_fds[2]); return NULL; } @@ -180,9 +180,9 @@ sched_hook_fini(void *root, void *arg __unused) r->root_kq ^= r->root_kq; #endif - FD_ZERO(&r->root_fds[2]); - FD_ZERO(&r->root_fds[1]); - FD_ZERO(&r->root_fds[0]); + SCHED_FD_ZERO(&r->root_fds[2]); + SCHED_FD_ZERO(&r->root_fds[1]); + SCHED_FD_ZERO(&r->root_fds[0]); return NULL; } @@ -238,28 +238,28 @@ sched_hook_cancel(void *task, void *arg __unused) #elif SUP_ENABLE == EP_SUPPORT ee.data.fd = TASK_FD(t); ee.events ^= ee.events; - if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[1])) ee.events |= EPOLLOUT; if (flg < 2) { - FD_CLR(TASK_FD(t), &r->root_fds[0]); - FD_CLR(TASK_FD(t), &r->root_fds[2]); + SCHED_FD_CLR(TASK_FD(t), &r->root_fds[0]); + SCHED_FD_CLR(TASK_FD(t), &r->root_fds[2]); } else { - if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[0])) ee.events |= EPOLLIN; - if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[2])) ee.events |= EPOLLPRI; } #else if (flg < 2) { - FD_CLR(TASK_FD(t), &r->root_fds[0]); - FD_CLR(TASK_FD(t), &r->root_fds[2]); + SCHED_FD_CLR(TASK_FD(t), &r->root_fds[0]); + SCHED_FD_CLR(TASK_FD(t), &r->root_fds[2]); /* optimize select */ for (i = r->root_kq - 1; i >= 0; i--) - if (FD_ISSET(i, &r->root_fds[0]) || - FD_ISSET(i, &r->root_fds[1]) || - FD_ISSET(i, &r->root_fds[2])) + if (SCHED_FD_ISSET(i, &r->root_fds[0]) || + SCHED_FD_ISSET(i, &r->root_fds[1]) || + SCHED_FD_ISSET(i, &r->root_fds[2])) break; r->root_kq = i + 1; } @@ -281,24 +281,24 @@ sched_hook_cancel(void *task, void *arg __unused) #elif SUP_ENABLE == EP_SUPPORT ee.data.fd = TASK_FD(t); ee.events ^= ee.events; - if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[0])) ee.events |= EPOLLIN; - if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[2])) ee.events |= EPOLLPRI; if (flg < 2) - FD_CLR(TASK_FD(t), &r->root_fds[1]); + SCHED_FD_CLR(TASK_FD(t), &r->root_fds[1]); else ee.events |= EPOLLOUT; #else if (flg < 2) { - FD_CLR(TASK_FD(t), &r->root_fds[1]); + SCHED_FD_CLR(TASK_FD(t), &r->root_fds[1]); /* optimize select */ for (i = r->root_kq - 1; i >= 0; i--) - if (FD_ISSET(i, &r->root_fds[0]) || - FD_ISSET(i, &r->root_fds[1]) || - FD_ISSET(i, &r->root_fds[2])) + if (SCHED_FD_ISSET(i, &r->root_fds[0]) || + SCHED_FD_ISSET(i, &r->root_fds[1]) || + SCHED_FD_ISSET(i, &r->root_fds[2])) break; r->root_kq = i + 1; } @@ -564,15 +564,15 @@ sched_hook_read(void *task, void *arg) mask = EPOLLIN | EPOLLPRI; ee.data.fd = TASK_FD(t); ee.events = mask; - if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) { + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[2])) { flg |= 4; ee.events |= EPOLLPRI; } - if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) { + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[0])) { flg |= 1; ee.events |= EPOLLIN; } - if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) { + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[1])) { flg |= 2; ee.events |= EPOLLOUT; } @@ -585,19 +585,19 @@ sched_hook_read(void *task, void *arg) return (void*) -1; } else { if (mask & EPOLLIN) - FD_SET(TASK_FD(t), &r->root_fds[0]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[0]); if (mask & EPOLLPRI) - FD_SET(TASK_FD(t), &r->root_fds[2]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[2]); } #else if (!mask) { - FD_SET(TASK_FD(t), &r->root_fds[0]); - FD_SET(TASK_FD(t), &r->root_fds[2]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[0]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[2]); } else { if (mask & 1) - FD_SET(TASK_FD(t), &r->root_fds[0]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[0]); if (mask & 2) - FD_SET(TASK_FD(t), &r->root_fds[2]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[2]); } if (TASK_FD(t) >= r->root_kq) @@ -654,15 +654,15 @@ sched_hook_write(void *task, void *arg) ee.data.fd = TASK_FD(t); ee.events = mask; - if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) { + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[2])) { flg |= 4; ee.events |= EPOLLPRI; } - if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) { + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[0])) { flg |= 1; ee.events |= EPOLLIN; } - if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) { + if (SCHED_FD_ISSET(TASK_FD(t), &r->root_fds[1])) { flg |= 2; ee.events |= EPOLLOUT; } @@ -675,13 +675,13 @@ sched_hook_write(void *task, void *arg) return (void*) -1; } else if (mask & EPOLLOUT) - FD_SET(TASK_FD(t), &r->root_fds[1]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[1]); #else if (!mask) - FD_SET(TASK_FD(t), &r->root_fds[1]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[1]); else if (mask & 1) - FD_SET(TASK_FD(t), &r->root_fds[1]); + SCHED_FD_SET(TASK_FD(t), &r->root_fds[1]); if (TASK_FD(t) >= r->root_kq) r->root_kq = TASK_FD(t) + 1; @@ -1156,18 +1156,18 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r insert_task_to(task, &r->root_ready); } - if (!(res[i].events & EPOLLOUT) && FD_ISSET(evt->data.fd, &r->root_fds[1])) { + if (!(res[i].events & EPOLLOUT) && SCHED_FD_ISSET(evt->data.fd, &r->root_fds[1])) { evt->events |= EPOLLOUT; wflg = 42; } if (rflg > 1) { - if (FD_ISSET(evt->data.fd, &r->root_fds[0])) + if (SCHED_FD_ISSET(evt->data.fd, &r->root_fds[0])) evt->events |= EPOLLIN; - if (FD_ISSET(evt->data.fd, &r->root_fds[2])) + if (SCHED_FD_ISSET(evt->data.fd, &r->root_fds[2])) evt->events |= EPOLLPRI; } else { - FD_CLR(evt->data.fd, &r->root_fds[0]); - FD_CLR(evt->data.fd, &r->root_fds[2]); + SCHED_FD_CLR(evt->data.fd, &r->root_fds[0]); + SCHED_FD_CLR(evt->data.fd, &r->root_fds[2]); } } } @@ -1200,18 +1200,18 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r insert_task_to(task, &r->root_ready); } - if (!(res[i].events & EPOLLIN) && FD_ISSET(evt->data.fd, &r->root_fds[0])) { + if (!(res[i].events & EPOLLIN) && SCHED_FD_ISSET(evt->data.fd, &r->root_fds[0])) { evt->events |= EPOLLIN; rflg = 42; } - if (!(res[i].events & EPOLLPRI) && FD_ISSET(evt->data.fd, &r->root_fds[2])) { + if (!(res[i].events & EPOLLPRI) && SCHED_FD_ISSET(evt->data.fd, &r->root_fds[2])) { evt->events |= EPOLLPRI; rflg = 42; } if (wflg > 1) evt->events |= EPOLLOUT; else - FD_CLR(evt->data.fd, &r->root_fds[1]); + SCHED_FD_CLR(evt->data.fd, &r->root_fds[1]); } } @@ -1231,7 +1231,7 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r #if SUP_ENABLE == NO_SUPPORT static inline void -fetch_hook_select_proceed(int en, fd_set rfd, fd_set wfd, fd_set xfd, sched_root_task_t *r) +fetch_hook_select_proceed(int en, sched_fd_set rfd, sched_fd_set wfd, sched_fd_set xfd, sched_root_task_t *r) { register int i, rflg, wflg; sched_task_t *t, *tmp, *task; @@ -1241,14 +1241,14 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w return; for (i = 0; i < r->root_kq; i++) { - if (!FD_ISSET(i, &r->root_fds[0]) && - !FD_ISSET(i, &r->root_fds[1]) && - !FD_ISSET(i, &r->root_fds[2])) + if (!SCHED_FD_ISSET(i, &r->root_fds[0]) && + !SCHED_FD_ISSET(i, &r->root_fds[1]) && + !SCHED_FD_ISSET(i, &r->root_fds[2])) continue; rflg = wflg = 0; - if (FD_ISSET(i, &rfd) || FD_ISSET(i, &xfd)) { + if (SCHED_FD_ISSET(i, &rfd) || SCHED_FD_ISSET(i, &xfd)) { task = NULL; TAILQ_FOREACH_SAFE(t, &r->root_read, task_node, tmp) { if (TASK_FD(t) == i) { @@ -1279,12 +1279,12 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w /* remove resouce */ if (rflg == 1) { - FD_CLR(i, &r->root_fds[0]); - FD_CLR(i, &r->root_fds[2]); + SCHED_FD_CLR(i, &r->root_fds[0]); + SCHED_FD_CLR(i, &r->root_fds[2]); } } } - if (FD_ISSET(i, &wfd)) { + if (SCHED_FD_ISSET(i, &wfd)) { task = NULL; TAILQ_FOREACH_SAFE(t, &r->root_write, task_node, tmp) { if (TASK_FD(t) == i) { @@ -1315,16 +1315,16 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w /* remove resouce */ if (wflg == 1) - FD_CLR(i, &r->root_fds[1]); + SCHED_FD_CLR(i, &r->root_fds[1]); } } } /* optimize select */ for (i = r->root_kq - 1; i >= 0; i--) - if (FD_ISSET(i, &r->root_fds[0]) || - FD_ISSET(i, &r->root_fds[1]) || - FD_ISSET(i, &r->root_fds[2])) + if (SCHED_FD_ISSET(i, &r->root_fds[0]) || + SCHED_FD_ISSET(i, &r->root_fds[1]) || + SCHED_FD_ISSET(i, &r->root_fds[2])) break; r->root_kq = i + 1; } @@ -1351,7 +1351,7 @@ sched_hook_fetch(void *root, void *arg __unused) u_long timeout = 0; #else struct timeval *timeout, tv; - fd_set rfd, wfd, xfd; + sched_fd_set rfd, wfd, xfd; #endif int en; @@ -1448,7 +1448,7 @@ sched_hook_fetch(void *root, void *arg __unused) xfd = r->root_fds[2]; rfd = r->root_fds[0]; wfd = r->root_fds[1]; - if ((en = select(r->root_kq, &rfd, &wfd, &xfd, timeout)) == -1) { + if ((en = select(r->root_kq, (fd_set*) &rfd, (fd_set*) &wfd, (fd_set*) &xfd, timeout)) == -1) { #endif /* KQ_SUPPORT */ if (r->root_hooks.hook_exec.exception) { if (r->root_hooks.hook_exec.exception(r, NULL))