X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-eq.c;h=4ff2ba66209cd04b12572516d661947505d19361;hp=8e95154be2109d413530b884ae8e46de6019bc4d;hb=76adbed805e71995d521d1a26e1e3d93f3dfd7b7;hpb=e3705effd8d94be11493da754c5678de5523c877 diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index 8e95154..4ff2ba6 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -60,7 +56,7 @@ * \param handle On successful return, this location will hold a handle for * the newly created EQ. * - * \retval 0 On success. + * \retval 0 On success. * \retval -EINVAL If an parameter is not valid. * \retval -ENOMEM If memory for the EQ can't be allocated. * @@ -68,15 +64,15 @@ */ int LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, - lnet_handle_eq_t *handle) + lnet_handle_eq_t *handle) { - lnet_eq_t *eq; + lnet_eq_t *eq; - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_refcount > 0); - /* We need count to be a power of 2 so that when eq_{enq,deq}_seq - * overflow, they don't skip entries, so the queue has the same - * apparent capacity at all times */ + /* We need count to be a power of 2 so that when eq_{enq,deq}_seq + * overflow, they don't skip entries, so the queue has the same + * apparent capacity at all times */ if (count) count = roundup_pow_of_two(count); @@ -105,10 +101,10 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, * so all them should be earlier than eq_deq_seq */ } - eq->eq_deq_seq = 1; - eq->eq_enq_seq = 1; - eq->eq_size = count; - eq->eq_callback = callback; + eq->eq_deq_seq = 1; + eq->eq_enq_seq = 1; + eq->eq_size = count; + eq->eq_callback = callback; eq->eq_refs = cfs_percpt_alloc(lnet_cpt_table(), sizeof(*eq->eq_refs[0])); @@ -255,19 +251,19 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) CDEBUG(D_INFO, "event: %p, sequence: %lu, eq->size: %u\n", new_event, eq->eq_deq_seq, eq->eq_size); - /* ...but did it overwrite an event we've not seen yet? */ - if (eq->eq_deq_seq == new_event->sequence) { - rc = 1; - } else { - /* don't complain with CERROR: some EQs are sized small - * anyway; if it's important, the caller should complain */ - CDEBUG(D_NET, "Event Queue Overflow: eq seq %lu ev seq %lu\n", - eq->eq_deq_seq, new_event->sequence); - rc = -EOVERFLOW; - } - - eq->eq_deq_seq = new_event->sequence + 1; - RETURN(rc); + /* ...but did it overwrite an event we've not seen yet? */ + if (eq->eq_deq_seq == new_event->sequence) { + rc = 1; + } else { + /* don't complain with CERROR: some EQs are sized small + * anyway; if it's important, the caller should complain */ + CDEBUG(D_NET, "Event Queue Overflow: eq seq %lu ev seq %lu\n", + eq->eq_deq_seq, new_event->sequence); + rc = -EOVERFLOW; + } + + eq->eq_deq_seq = new_event->sequence + 1; + RETURN(rc); } /** @@ -279,8 +275,8 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) * \param event On successful return (1 or -EOVERFLOW), this location will * hold the next event in the EQ. * - * \retval 0 No pending event in the EQ. - * \retval 1 Indicates success. + * \retval 0 No pending event in the EQ. + * \retval 1 Indicates success. * \retval -ENOENT If \a eventq does not point to a valid EQ. * \retval -EOVERFLOW Indicates success (i.e., an event is returned) and that * at least one event between this event and the last event obtained from the @@ -289,10 +285,10 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) int LNetEQGet (lnet_handle_eq_t eventq, lnet_event_t *event) { - int which; + int which; - return LNetEQPoll(&eventq, 1, 0, - event, &which); + return LNetEQPoll(&eventq, 1, 0, + event, &which); } EXPORT_SYMBOL(LNetEQGet); @@ -306,7 +302,7 @@ EXPORT_SYMBOL(LNetEQGet); * \param event On successful return (1 or -EOVERFLOW), this location will * hold the next event in the EQ. * - * \retval 1 Indicates success. + * \retval 1 Indicates success. * \retval -ENOENT If \a eventq does not point to a valid EQ. * \retval -EOVERFLOW Indicates success (i.e., an event is returned) and that * at least one event between this event and the last event obtained from the @@ -315,46 +311,32 @@ EXPORT_SYMBOL(LNetEQGet); int LNetEQWait (lnet_handle_eq_t eventq, lnet_event_t *event) { - int which; + int which; - return LNetEQPoll(&eventq, 1, LNET_TIME_FOREVER, - event, &which); + return LNetEQPoll(&eventq, 1, MAX_SCHEDULE_TIMEOUT, + event, &which); } EXPORT_SYMBOL(LNetEQWait); static int -lnet_eq_wait_locked(int *timeout_ms) +lnet_eq_wait_locked(signed long *timeout) __must_hold(&the_lnet.ln_eq_wait_lock) { - int tms = *timeout_ms; - int wait; - wait_queue_t wl; - cfs_time_t now; + signed long tms = *timeout; + wait_queue_t wl; + int wait; if (tms == 0) return -ENXIO; /* don't want to wait and no new event */ init_waitqueue_entry(&wl, current); - set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&the_lnet.ln_eq_waitq, &wl); lnet_eq_wait_unlock(); - if (tms < 0) { - schedule(); - } else { - struct timeval tv; - - now = cfs_time_current(); - schedule_timeout(cfs_time_seconds(tms) / 1000); - cfs_duration_usec(cfs_time_sub(cfs_time_current(), now), &tv); - tms -= (int)(tv.tv_sec * 1000 + tv.tv_usec / 1000); - if (tms < 0) /* no more wait but may have new event */ - tms = 0; - } - + tms = schedule_timeout_interruptible(tms); wait = tms != 0; /* might need to call here again */ - *timeout_ms = tms; + *timeout = tms; lnet_eq_wait_lock(); remove_wait_queue(&the_lnet.ln_eq_waitq, &wl); @@ -374,33 +356,33 @@ __must_hold(&the_lnet.ln_eq_wait_lock) * fixed period, or block indefinitely. * * \param eventqs,neq An array of EQ handles, and size of the array. - * \param timeout_ms Time in milliseconds to wait for an event to occur on - * one of the EQs. The constant LNET_TIME_FOREVER can be used to indicate an + * \param timeout Time in jiffies to wait for an event to occur on + * one of the EQs. The constant MAX_SCHEDULE_TIMEOUT can be used to indicate an * infinite timeout. * \param event,which On successful return (1 or -EOVERFLOW), \a event will * hold the next event in the EQs, and \a which will contain the index of the * EQ from which the event was taken. * - * \retval 0 No pending event in the EQs after timeout. - * \retval 1 Indicates success. + * \retval 0 No pending event in the EQs after timeout. + * \retval 1 Indicates success. * \retval -EOVERFLOW Indicates success (i.e., an event is returned) and that * at least one event between this event and the last event obtained from the * EQ indicated by \a which has been dropped due to limited space in the EQ. * \retval -ENOENT If there's an invalid handle in \a eventqs. */ int -LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms, +LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, signed long timeout, lnet_event_t *event, int *which) { int wait = 1; int rc; int i; - ENTRY; + ENTRY; - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_refcount > 0); - if (neq < 1) - RETURN(-ENOENT); + if (neq < 1) + RETURN(-ENOENT); lnet_eq_wait_lock(); @@ -429,9 +411,9 @@ LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms, * -1 : did nothing and it's sure no new event * 1 : sleep inside and wait until new event * 0 : don't want to wait anymore, but might have new event - * so need to call dequeue again + * so need to call dequeue again */ - wait = lnet_eq_wait_locked(&timeout_ms); + wait = lnet_eq_wait_locked(&timeout); if (wait < 0) /* no new event */ break; }