X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fpoll-loop.c;h=510903e46c9677d2dccbb8f171b017fa0cc0333a;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=6200507bc1e9e452bd11183caad0f9de42d7e191;hpb=8f6c3ad72f4b80070db753095f20a54f27b97042;p=sliver-openvswitch.git diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 6200507bc..510903e46 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,55 +25,102 @@ #include "dynamic-string.h" #include "fatal-signal.h" #include "list.h" +#include "ovs-thread.h" +#include "seq.h" #include "socket-util.h" #include "timeval.h" #include "vlog.h" - -#undef poll_fd_wait -#undef poll_timer_wait -#undef poll_timer_wait_until -#undef poll_immediate_wake +#include "hmap.h" +#include "hash.h" VLOG_DEFINE_THIS_MODULE(poll_loop); COVERAGE_DEFINE(poll_fd_wait); COVERAGE_DEFINE(poll_zero_timeout); -/* An event that will wake the following call to poll_block(). */ -struct poll_waiter { - const char *where; /* Where the waiter was created. */ +struct poll_node { + struct hmap_node hmap_node; + struct pollfd pollfd; /* Events to pass to time_poll(). */ + HANDLE wevent; /* Events for WaitForMultipleObjects(). */ + const char *where; /* Where poll_node was created. */ }; -/* All active poll waiters. */ -static struct poll_waiter *waiters; -static struct pollfd *pollfds; -static size_t n_waiters, allocated_waiters; +struct poll_loop { + /* All active poll waiters. */ + struct hmap poll_nodes; -/* Time at which to wake up the next call to poll_block(), in milliseconds as - * returned by time_msec(), LLONG_MIN to wake up immediately, or LLONG_MAX to - * wait forever. */ -static long long int timeout_when = LLONG_MAX; + /* Time at which to wake up the next call to poll_block(), LLONG_MIN to + * wake up immediately, or LLONG_MAX to wait forever. */ + long long int timeout_when; /* In msecs as returned by time_msec(). */ + const char *timeout_where; /* Where 'timeout_when' was set. */ +}; -/* Location where waiter created. */ -static const char *timeout_where; +static struct poll_loop *poll_loop(void); -static void new_waiter(int fd, short int events, const char *where); +/* Look up the node with same fd and wevent. */ +static struct poll_node * +find_poll_node(struct poll_loop *loop, int fd, uint32_t wevent) +{ + struct poll_node *node; + + HMAP_FOR_EACH_WITH_HASH (node, hmap_node, hash_2words(fd, wevent), + &loop->poll_nodes) { + if (node->pollfd.fd == fd && node->wevent == wevent) { + return node; + } + } + return NULL; +} -/* Registers 'fd' as waiting for the specified 'events' (which should be POLLIN - * or POLLOUT or POLLIN | POLLOUT). The following call to poll_block() will - * wake up when 'fd' becomes ready for one or more of the requested events. +/* On Unix based systems: * - * The event registration is one-shot: only the following call to poll_block() - * is affected. The event will need to be re-registered after poll_block() is - * called if it is to persist. + * Registers 'fd' as waiting for the specified 'events' (which should be + * POLLIN or POLLOUT or POLLIN | POLLOUT). The following call to + * poll_block() will wake up when 'fd' becomes ready for one or more of the + * requested events. the 'fd's are given to poll() function later. + * + * On Windows system: + * + * If both 'wevent' handle and 'fd' is specified, associate the 'fd' with + * with that 'wevent' for 'events' (implemented in poll_block()). + * In case of no 'fd' specified, wake up on any event on that 'wevent'. + * These wevents are given to the WaitForMultipleObjects() to be polled. + * The event registration is one-shot: only the following call to + * poll_block() is affected. The event will need to be re-registered after + * poll_block() is called if it is to persist. * - * Ordinarily the 'where' argument is supplied automatically; see poll-loop.h - * for more information. */ + * ('where' is used in debug logging. Commonly one would use poll_fd_wait() to + * automatically provide the caller's source file and line number for + * 'where'.) */ void -poll_fd_wait(int fd, short int events, const char *where) +poll_fd_wait_at(int fd, HANDLE wevent, short int events, const char *where) { + struct poll_loop *loop = poll_loop(); + struct poll_node *node; + COVERAGE_INC(poll_fd_wait); - new_waiter(fd, events, where); + +#ifdef _WIN32 + /* Null event cannot be polled. */ + if (wevent == 0) { + VLOG_ERR("No event to wait fd %d", fd); + return; + } +#endif + + /* Check for duplicate. If found, "or" the event. */ + node = find_poll_node(loop, fd, wevent); + if (node) { + node->pollfd.events |= events; + } else { + node = xzalloc(sizeof *node); + hmap_insert(&loop->poll_nodes, &node->hmap_node, + hash_2words(fd, wevent)); + node->pollfd.fd = fd; + node->pollfd.events = events; + node->wevent = wevent; + node->where = where; + } } /* Causes the following call to poll_block() to block for no more than 'msec' @@ -84,10 +131,11 @@ poll_fd_wait(int fd, short int events, const char *where) * is affected. The timer will need to be re-registered after poll_block() is * called if it is to persist. * - * Ordinarily the 'where' argument is supplied automatically; see poll-loop.h - * for more information. */ + * ('where' is used in debug logging. Commonly one would use poll_timer_wait() + * to automatically provide the caller's source file and line number for + * 'where'.) */ void -poll_timer_wait(long long int msec, const char *where) +poll_timer_wait_at(long long int msec, const char *where) { long long int now = time_msec(); long long int when; @@ -103,7 +151,7 @@ poll_timer_wait(long long int msec, const char *where) when = LLONG_MAX; } - poll_timer_wait_until(when, where); + poll_timer_wait_until_at(when, where); } /* Causes the following call to poll_block() to wake up when the current time, @@ -115,26 +163,29 @@ poll_timer_wait(long long int msec, const char *where) * is affected. The timer will need to be re-registered after poll_block() is * called if it is to persist. * - * Ordinarily the 'where' argument is supplied automatically; see poll-loop.h - * for more information. */ + * ('where' is used in debug logging. Commonly one would use + * poll_timer_wait_until() to automatically provide the caller's source file + * and line number for 'where'.) */ void -poll_timer_wait_until(long long int when, const char *where) +poll_timer_wait_until_at(long long int when, const char *where) { - if (when < timeout_when) { - timeout_when = when; - timeout_where = where; + struct poll_loop *loop = poll_loop(); + if (when < loop->timeout_when) { + loop->timeout_when = when; + loop->timeout_where = where; } } /* Causes the following call to poll_block() to wake up immediately, without * blocking. * - * Ordinarily the 'where' argument is supplied automatically; see poll-loop.h - * for more information. */ + * ('where' is used in debug logging. Commonly one would use + * poll_immediate_wake() to automatically provide the caller's source file and + * line number for 'where'.) */ void -poll_immediate_wake(const char *where) +poll_immediate_wake_at(const char *where) { - poll_timer_wait(0, where); + poll_timer_wait_at(0, where); } /* Logs, if appropriate, that the poll loop was awakened by an event @@ -198,58 +249,123 @@ log_wakeup(const char *where, const struct pollfd *pollfd, int timeout) ds_destroy(&s); } +static void +free_poll_nodes(struct poll_loop *loop) +{ + struct poll_node *node, *next; + + HMAP_FOR_EACH_SAFE (node, next, hmap_node, &loop->poll_nodes) { + hmap_remove(&loop->poll_nodes, &node->hmap_node); + free(node); + } +} + /* Blocks until one or more of the events registered with poll_fd_wait() * occurs, or until the minimum duration registered with poll_timer_wait() * elapses, or not at all if poll_immediate_wake() has been called. */ void poll_block(void) { + struct poll_loop *loop = poll_loop(); + struct poll_node *node; + struct pollfd *pollfds; + HANDLE *wevents = NULL; int elapsed; int retval; + int i; /* Register fatal signal events before actually doing any real work for * poll_block. */ fatal_signal_wait(); - if (timeout_when == LLONG_MIN) { + if (loop->timeout_when == LLONG_MIN) { COVERAGE_INC(poll_zero_timeout); } - retval = time_poll(pollfds, n_waiters, timeout_when, &elapsed); + + timewarp_wait(); + pollfds = xmalloc(hmap_count(&loop->poll_nodes) * sizeof *pollfds); + +#ifdef _WIN32 + wevents = xmalloc(hmap_count(&loop->poll_nodes) * sizeof *wevents); +#endif + + /* Populate with all the fds and events. */ + i = 0; + HMAP_FOR_EACH (node, hmap_node, &loop->poll_nodes) { + pollfds[i] = node->pollfd; +#ifdef _WIN32 + wevents[i] = node->wevent; + if (node->pollfd.fd && node->wevent) { + short int wsa_events = 0; + if (node->pollfd.events & POLLIN) { + wsa_events |= FD_READ | FD_ACCEPT | FD_CLOSE; + } + if (node->pollfd.events & POLLOUT) { + wsa_events |= FD_WRITE | FD_CONNECT | FD_CLOSE; + } + WSAEventSelect(node->pollfd.fd, node->wevent, wsa_events); + } +#endif + i++; + } + + retval = time_poll(pollfds, hmap_count(&loop->poll_nodes), wevents, + loop->timeout_when, &elapsed); if (retval < 0) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "poll: %s", ovs_strerror(-retval)); } else if (!retval) { - log_wakeup(timeout_where, NULL, elapsed); + log_wakeup(loop->timeout_where, NULL, elapsed); } else if (get_cpu_usage() > 50 || VLOG_IS_DBG_ENABLED()) { - size_t i; - - for (i = 0; i < n_waiters; i++) { + i = 0; + HMAP_FOR_EACH (node, hmap_node, &loop->poll_nodes) { if (pollfds[i].revents) { - log_wakeup(waiters[i].where, &pollfds[i], 0); + log_wakeup(node->where, &pollfds[i], 0); } + i++; } } - timeout_when = LLONG_MAX; - timeout_where = NULL; - n_waiters = 0; + free_poll_nodes(loop); + loop->timeout_when = LLONG_MAX; + loop->timeout_where = NULL; + free(pollfds); + free(wevents); /* Handle any pending signals before doing anything else. */ fatal_signal_run(); + + seq_woke(); } -/* Creates a new poll_waiter for 'fd' and 'events', recording 'where' as the - * location where the event was registered. */ static void -new_waiter(int fd, short int events, const char *where) +free_poll_loop(void *loop_) +{ + struct poll_loop *loop = loop_; + + free_poll_nodes(loop); + hmap_destroy(&loop->poll_nodes); + free(loop); +} + +static struct poll_loop * +poll_loop(void) { - if (n_waiters >= allocated_waiters) { - waiters = x2nrealloc(waiters, &allocated_waiters, sizeof *waiters); - pollfds = xrealloc(pollfds, allocated_waiters * sizeof *pollfds); + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static pthread_key_t key; + struct poll_loop *loop; + + if (ovsthread_once_start(&once)) { + xpthread_key_create(&key, free_poll_loop); + ovsthread_once_done(&once); } - waiters[n_waiters].where = where; - pollfds[n_waiters].fd = fd; - pollfds[n_waiters].events = events; - n_waiters++; + loop = pthread_getspecific(key); + if (!loop) { + loop = xzalloc(sizeof *loop); + hmap_init(&loop->poll_nodes); + xpthread_setspecific(key, loop); + } + return loop; } +