diff --git a/include/proto/fd.h b/include/proto/fd.h index b072b3044..4b932357f 100644 --- a/include/proto/fd.h +++ b/include/proto/fd.h @@ -104,31 +104,7 @@ void run_poller(); void fd_add_to_fd_list(volatile struct fdlist *list, int fd, int off); void fd_rm_from_fd_list(volatile struct fdlist *list, int fd, int off); - -/* Mark fd as updated for polling and allocate an entry in the update list - * for this if it was not already there. This can be done at any time. - */ -static inline void updt_fd_polling(const int fd) -{ - if ((fdtab[fd].thread_mask & all_threads_mask) == tid_bit) { - - /* note: we don't have a test-and-set yet in hathreads */ - - if (HA_ATOMIC_BTS(&fdtab[fd].update_mask, tid)) - return; - - fd_updt[fd_nbupdt++] = fd; - } else { - unsigned long update_mask = fdtab[fd].update_mask; - do { - if (update_mask == fdtab[fd].thread_mask) - return; - } while (!_HA_ATOMIC_CAS(&fdtab[fd].update_mask, &update_mask, - fdtab[fd].thread_mask)); - fd_add_to_fd_list(&update_list, fd, offsetof(struct fdtab, update)); - } - -} +void updt_fd_polling(const int fd); /* Called from the poller to acknoledge we read an entry from the global * update list, to remove our bit from the update_mask, and remove it from diff --git a/src/fd.c b/src/fd.c index 183c57375..6bfefdddc 100644 --- a/src/fd.c +++ b/src/fd.c @@ -337,6 +337,27 @@ void fd_remove(int fd) fd_dodelete(fd, 0); } +void updt_fd_polling(const int fd) +{ + if ((fdtab[fd].thread_mask & all_threads_mask) == tid_bit) { + + /* note: we don't have a test-and-set yet in hathreads */ + + if (HA_ATOMIC_BTS(&fdtab[fd].update_mask, tid)) + return; + + fd_updt[fd_nbupdt++] = fd; + } else { + unsigned long update_mask = fdtab[fd].update_mask; + do { + if (update_mask == fdtab[fd].thread_mask) + return; + } while (!_HA_ATOMIC_CAS(&fdtab[fd].update_mask, &update_mask, + fdtab[fd].thread_mask)); + fd_add_to_fd_list(&update_list, fd, offsetof(struct fdtab, update)); + } +} + /* Tries to send parts from followed by parts from * optionally followed by a newline if is non-null, to file descriptor * . The message is sent atomically using writev(). It may be truncated to