• Alex Elder's avatar
    libceph: define and use in_msg_pos_next() · e788182f
    Alex Elder authored
    Define a new function in_msg_pos_next() to match out_msg_pos_next(),
    and use it in place of code at the end of read_partial_message_pages()
    and read_partial_message_bio().
    
    Note that the page number is incremented and offset reset under
    slightly different conditions from before.  The result is
    equivalent, however, as explained below.
    
    Each time an incoming message is going to arrive, we find out how
    much room is left--not surpassing the current page--and provide that
    as the number of bytes to receive.  So the amount we'll use is the
    lesser of:  all that's left of the entire request; and all that's
    left in the current page.
    
    If we received exactly how many were requested, we either reached
    the end of the request or the end of the page.  In the first case,
    we're done, in the second, we move onto the next page in the array.
    
    In all cases but (possibly) on the last page, after adding the
    number of bytes received, page_pos == PAGE_SIZE.  On the last page,
    it doesn't really matter whether we increment the page number and
    reset the page position, because we're done and we won't come back
    here again.  The code previously skipped over that last case,
    basically.  The new code handles that case the same as the others,
    incrementing and resetting.
    Signed-off-by: default avatarAlex Elder <elder@inktank.com>
    Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
    e788182f
messenger.c 71.8 KB