lib: Substitute poll APIs with epoll APIs in thread management routine #18126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This is a bring forward of #12862 as that we should really get this in. I'm not the original author and I don't want to mess with the original PR so we have this one. |
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| @@ -60,7 +64,7 @@ DECLARE_HEAP(event_timer_list, struct event, timeritem, event_timer_cmp); | |||
| #define AWAKEN(m) \ | |||
| do { \ | |||
| const unsigned char wakebyte = 0x01; \ | |||
| write(m->io_pipe[1], &wakebyte, 1); \ | |||
| write((m)->io_pipe[1], &wakebyte, 1); \ | |||
There was a problem hiding this comment.
why the () around m? Donald to investigate
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| @@ -124,8 +128,7 @@ static void cpu_records_free(struct cpu_event_history **p) | |||
| static void vty_out_cpu_event_history(struct vty *vty, | |||
| struct cpu_event_history *a) | |||
| { | |||
| vty_out(vty, | |||
| "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu %9zu %9zu %10zu", | |||
| vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu %9zu %9zu %10zu", | |||
There was a problem hiding this comment.
whitespace changes need to be removed
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| atomic_load_explicit(&a->total_cpu_warn, memory_order_seq_cst); | ||
| copy.total_wall_warn = | ||
| atomic_load_explicit(&a->total_wall_warn, memory_order_seq_cst); | ||
| copy.total_active = atomic_load_explicit(&a->total_active, |
There was a problem hiding this comment.
more white space chagnes?
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| "Set up miscellaneous service\n" | ||
| "Warn for tasks exceeding CPU usage threshold\n" | ||
| "Warning threshold in milliseconds\n") | ||
| DEFPY(service_cputime_warning, service_cputime_warning_cmd, |
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| "Set up miscellaneous service\n" | ||
| "Warn for tasks exceeding total wallclock threshold\n" | ||
| "Warning threshold in milliseconds\n") | ||
| DEFPY(service_walltime_warning, service_walltime_warning_cmd, |
donaldsharp
commented
Feb 14, 2025
| thread = m->read[ev->data.fd]; | ||
|
|
||
| if (!thread) | ||
| vty_out(vty, "ERROR "); |
There was a problem hiding this comment.
make ERROR meaningful
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| SHOW_STR | ||
| "Event information\n" | ||
| "Event Poll Information\n") | ||
| DEFUN_NOSH(show_event_poll, show_event_poll_cmd, "show event poll", |
donaldsharp
commented
Feb 14, 2025
lib/event.c
Outdated
| SHOW_STR | ||
| "Event information\n" | ||
| "Show all timers and how long they have in the system\n") | ||
| DEFPY_NOSH(show_event_timers, show_event_timers_cmd, "show event timers", |
donaldsharp
commented
Feb 14, 2025
| @@ -515,11 +573,63 @@ static void initializer(void) | |||
| pthread_key_create(&thread_current, NULL); | |||
| } | |||
|
|
|||
| #if EPOLL_ENABLED | |||
| static struct epoll_event *epoll_event_new(int fd, uint32_t events) | |||
There was a problem hiding this comment.
note for donald -> Check to see if we leak this new memory
donaldsharp
commented
Feb 14, 2025
| *fd_closed = true; | ||
| return; | ||
| } | ||
| zlog_debug("[!] In %s, fstat failed unexpectedly, fd: %d, errno: %d)", |
There was a problem hiding this comment.
this should not be a debug
donaldsharp
commented
Feb 14, 2025
| set_ev.events = | ||
| (dir == EVENT_READ | ||
| ? EPOLLIN | ||
| : EPOLLOUT); // reset .events of new set_ev |
There was a problem hiding this comment.
fix double slash comment
donaldsharp
commented
Feb 14, 2025
| @@ -877,17 +1040,20 @@ static int fd_poll(struct event_loop *m, const struct timeval *timer_wait, | |||
| /* Don't make any changes for the non-main pthreads */ | |||
| pthread_sigmask(SIG_SETMASK, NULL, &origsigs); | |||
| } | |||
|
|
|||
| #if defined(HAVE_PPOLL) | |||
| struct timespec ts, *tsp; | |||
There was a problem hiding this comment.
If using poll we still need to figure out how long to wait
This commit substitutes poll APIs with epoll APIs for better performace. Note that epoll APIs are only available for Linux platforms. For BSD platforms which do not support epoll APIs, poll APIs are still used. Signed-off-by: Kaifei Peng <[email protected]>
donaldsharp
force-pushed
the
epoll_update
branch
from
a890f00 to
bb57436
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit substitutes poll APIs with epoll APIs for better performace. Note that epoll APIs are only available for Linux platforms. For BSD platforms which do not support epoll APIs, poll APIs are still used.