OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1314-g6b833f5

Gerrit Code Review
Tue, 21 Jun 2011 18:59:42 -0700 (PDT)

The following commit has been merged in the master branch:
commit 0b9c9e9973e8d32cdfe1fc884fb2c310cedc0404
Author: Simon Wilkinson <>
Date:   Sat Jun 18 13:01:35 2011 +0100

    rx: Don't wait for TQ busy when entering recovery
    Two different threads can cause a call to enter recovery. The event
    thread will move a call into recovery as a result of a timeout, or
    the listener thread will move it there following a fast retransmit.
    In both of these cases, recovery looks different. In the case of
    a timeout, we enter slow start, starting as if we were begininning
    transmission for the first time. Following fast retransmit, we enter
    fast recovery, with different starting parameters than those coming
    from slow start.
    As a reslt, the current behaviour, where either call sitting in
    FAST_RECOVERY_WAIT causes the other to simply return is inappropriate.
    Further investigation indiciates that FAST_RECOVER_WAIT is actually
    uncessary. There is no harm caused to a thread which is currently
    blocked on the network in the middle of a transmit, in adjusting the
    window size underneath it. As both of these states collapse the window,
    that thread will simply cease sending earlier.
    So, simplify the code, and remove the potential race between event and
    listener by removing the FAST_RECOVER_WAIT state.
    Change-Id: Ic2e7606136ca04c869685345b63101c346ce702b
    Reviewed-by: Derrick Brashear <>
    Reviewed-by: Jeffrey Altman <>
    Tested-by: Jeffrey Altman <>
    Tested-by: BuildBot <>

 src/rx/rx.c      |   50 ++++++++------------------------------------------
 src/rx/rx.h      |    2 +-
 src/rx/rx_rdwr.c |   21 +++++++++++++--------
 3 files changed, 22 insertions(+), 51 deletions(-)

OpenAFS Master Repository