From: Alexey Gladkov <gladkov.alexey@gmail.com> To: make-initrd@lists.altlinux.org Subject: [make-initrd] [PATCH 2/3] ueventd: Rename fd_list to fd_handler_list Date: Sat, 20 May 2023 18:37:47 +0200 Message-ID: <20230520163748.177260-2-gladkov.alexey@gmail.com> (raw) In-Reply-To: <d26b7e31-fd63-8c30-8b7f-a471f5cce793@gmail.com> Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> --- datasrc/ueventd/ueventd.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/datasrc/ueventd/ueventd.c b/datasrc/ueventd/ueventd.c index 9c20594f..2d510d62 100644 --- a/datasrc/ueventd/ueventd.c +++ b/datasrc/ueventd/ueventd.c @@ -47,7 +47,7 @@ struct fd_handler { fdhandler_t fd_handler; }; -struct fd_handler fd_list[FD_MAX]; +struct fd_handler fd_handler_list[FD_MAX]; enum { PIPE_READ, @@ -428,8 +428,8 @@ pid_t spawn_worker(int epollfd, struct watch *queue) rd_fatal("prctl(PR_SET_PDEATHSIG): %m"); for (int i = 0; i < FD_MAX; i++) { - if (fd_list[i].fd >= 0) - close(fd_list[i].fd); + if (fd_handler_list[i].fd >= 0) + close(fd_handler_list[i].fd); } close(epollfd); @@ -501,18 +501,18 @@ int main(int argc, char **argv) uevent_confdb = get_param_dir("uevent_confdb"); handler_file = argv[optind++]; - setup_inotify_fd(&fd_list[FD_INOTIFY]); - setup_signal_fd(&fd_list[FD_SIGNAL]); - setup_pipe_fd(&fd_list[FD_PIPE]); + setup_inotify_fd(&fd_handler_list[FD_INOTIFY]); + setup_signal_fd(&fd_handler_list[FD_SIGNAL]); + setup_pipe_fd(&fd_handler_list[FD_PIPE]); - epollfd = setup_epoll_fd(fd_list); + epollfd = setup_epoll_fd(fd_handler_list); - watch_pauses(fd_list[FD_INOTIFY].fd); + watch_pauses(fd_handler_list[FD_INOTIFY].fd); - if (watch_path(fd_list[FD_INOTIFY].fd, filter_dir, ".", EV_ROOT_MASK, F_ROOT_DIR) < 0) + if (watch_path(fd_handler_list[FD_INOTIFY].fd, filter_dir, ".", EV_ROOT_MASK, F_ROOT_DIR) < 0) exit(EXIT_FAILURE); - watch_queues(fd_list[FD_INOTIFY].fd); + watch_queues(fd_handler_list[FD_INOTIFY].fd); apply_pause(); while (1) { @@ -550,15 +550,15 @@ done: n = e->next; if (e->q_pid) kill(e->q_pid, SIGKILL); - inotify_rm_watch(fd_list[FD_INOTIFY].fd, e->q_watchfd); + inotify_rm_watch(fd_handler_list[FD_INOTIFY].fd, e->q_watchfd); free(e); } for (i = 0; i < FD_MAX; i++) { - if (fd_list[i].fd >= 0) { - if (epoll_ctl(epollfd, EPOLL_CTL_DEL, fd_list[i].fd, NULL) < 0) + if (fd_handler_list[i].fd >= 0) { + if (epoll_ctl(epollfd, EPOLL_CTL_DEL, fd_handler_list[i].fd, NULL) < 0) rd_err("epoll_ctl: %m"); - close(fd_list[i].fd); + close(fd_handler_list[i].fd); } } close(epollfd); -- 2.33.8
next prev parent reply other threads:[~2023-05-20 16:37 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-04 13:42 [make-initrd] [PATCH 0/3] Reimplement ueventd Alexey Gladkov 2023-05-04 13:42 ` [make-initrd] [PATCH 1/3] " Alexey Gladkov 2023-05-05 3:08 ` Leonid Krivoshein 2023-05-05 17:02 ` Alexey Gladkov 2023-05-05 4:03 ` Leonid Krivoshein 2023-05-05 17:16 ` Alexey Gladkov 2023-05-05 5:21 ` Leonid Krivoshein 2023-05-05 17:24 ` Alexey Gladkov 2023-05-14 20:12 ` Leonid Krivoshein 2023-05-14 20:45 ` Alexey Gladkov 2023-05-14 20:57 ` Leonid Krivoshein 2023-05-15 8:52 ` Alexey Gladkov 2023-05-14 23:08 ` Leonid Krivoshein 2023-05-15 9:05 ` Alexey Gladkov 2023-05-15 0:47 ` Leonid Krivoshein 2023-05-15 9:12 ` Alexey Gladkov 2023-05-15 4:38 ` Leonid Krivoshein 2023-05-15 10:43 ` Alexey Gladkov 2023-05-18 6:39 ` Leonid Krivoshein 2023-05-18 7:05 ` Alexey Gladkov 2023-05-20 9:00 ` Leonid Krivoshein 2023-05-20 13:18 ` Alexey Gladkov 2023-05-20 15:17 ` Vladimir D. Seleznev 2023-05-20 17:23 ` Leonid Krivoshein 2023-05-20 18:51 ` Alexey Gladkov 2023-05-21 8:53 ` [make-initrd] [PATCH] ueventd: Don't use a epoll timeout when it's not needed Alexey Gladkov 2023-05-22 4:46 ` Leonid Krivoshein 2023-05-22 7:54 ` Alexey Gladkov 2023-05-22 9:19 ` Alexey Gladkov 2023-05-22 7:57 ` [make-initrd] [PATCH 1/2] ueventd: Fix memory leak Alexey Gladkov 2023-05-22 7:57 ` [make-initrd] [PATCH 2/2] ueventd: Change interface rd_asprintf_or_die Alexey Gladkov 2023-05-22 9:36 ` [make-initrd] [PATCH v2] " Alexey Gladkov 2023-05-20 16:37 ` [make-initrd] [PATCH 1/3] ueventd: Simplify call of the queue handler Alexey Gladkov 2023-05-20 16:37 ` Alexey Gladkov [this message] 2023-05-20 16:37 ` [make-initrd] [PATCH 3/3] ueventd: Drop obsolete declarations Alexey Gladkov 2023-05-04 13:42 ` [make-initrd] [PATCH 2/3] Replace polld by uevent queue Alexey Gladkov 2023-05-04 13:42 ` [make-initrd] [PATCH 3/3] feature/kickstart: Reset rootdelay timer after kickstart Alexey Gladkov 2023-05-06 19:45 ` [make-initrd] ueventd: Add a prefix to the logging functions to avoid name collisions Alexey Gladkov 2023-05-06 19:45 ` [make-initrd] ueventd: Allow to configure the log destination Alexey Gladkov 2023-05-06 19:45 ` [make-initrd] ueventd: Pass the program name when initializing the logger Alexey Gladkov 2023-05-06 19:45 ` [make-initrd] ueventd: Rewrite logging function to make it more atomic Alexey Gladkov 2023-05-07 12:48 ` [make-initrd] [PATCH 0/3] Reimplement ueventd Alexey Gladkov 2023-05-13 11:50 ` Alexey Gladkov 2023-05-14 20:15 ` Leonid Krivoshein 2023-05-14 20:49 ` Alexey Gladkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230520163748.177260-2-gladkov.alexey@gmail.com \ --to=gladkov.alexey@gmail.com \ --cc=make-initrd@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Make-initrd development discussion This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/make-initrd/0 make-initrd/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 make-initrd make-initrd/ http://lore.altlinux.org/make-initrd \ make-initrd@lists.altlinux.org make-initrd@lists.altlinux.ru make-initrd@lists.altlinux.com public-inbox-index make-initrd Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.make-initrd AGPL code for this site: git clone https://public-inbox.org/public-inbox.git