Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: chenshuo/muduo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: flycloud/muduo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 15 files changed
  • 3 contributors

Commits on Nov 17, 2016

  1. Fix Singleton.h for C++11

    chenshuo authored Nov 17, 2016
    Configuration menu
    Copy the full SHA
    3c64e20 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2016

  1. remove redundant semicolon

    huntinux committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    e209288 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2016

  1. Merge pull request #243 from huntinux/master

    remove redundant semicolon in buffer.h
    chenshuo authored Dec 6, 2016
    Configuration menu
    Copy the full SHA
    05b1cb3 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2016

  1. Configuration menu
    Copy the full SHA
    7267ff1 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2016

  1. Fix race condition of Tunnel.

    High watermark callback should only stop reading peer connection if its
    output buffer is not empty.
    
    Originally, the high watermark callback will stop reading the peer
    connection and register a write complete callback unconditionally.
    
    Consiter two events happening in the same EventLoop iteration:
      Connection C is readable
      Connection S is writable
    
    In C.onMessage(), it calls S.send(), then decides to queue a high
    watermark callback because S.outputBuffer is full.  S.HWM will be
    called after event handling.
    
    In S.handleWrite(), all data are sent, output buffer becomes empty,
    but it doesn't queue write complete callback of S because it's not
    registered yet.
    
    In doPendingFunctors(), S.HWM is called, stop reading C, and register a
    write complete callback for S to re-enable reading C.  This will never
    happen because S has nothing to send, it is already write complete.
    
    A false fix:
      Register write complete callback at beginning, never unregister it.
    This of course has some performance penalty, but appears to work
    because in the case of two events above, S.handleWrite() will queue its
    write complete callback after S.HWM.  In doPendingFunctors(), first call
    S.HWM to stop reading C, then call S.WC to re-enable reading C.
    
    This false fix has a subtle dependency on the execution sequence of
    muduo EventLoop::doPendingFunctors(), and if EventLoop replace the queue
    with a stack, the program breaks mystically.
    chenshuo committed Dec 23, 2016
    Configuration menu
    Copy the full SHA
    0502020 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2016

  1. Revert "remove package name in RpcMessage. PROTOCOL CHANGED"

    This reverts commit 0197724.
    chenshuo committed Dec 26, 2016
    Configuration menu
    Copy the full SHA
    27c063d View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2016

  1. Fix for gcc6

    Conflicts:
    	muduo/base/AsyncLogging.h
    chenshuo committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    4019439 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    219547f View commit details
    Browse the repository at this point in the history
  3. try clang on travis

    chenshuo committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    a5327ba View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2017

  1. fix typo

    chenshuo committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    98e027a View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. fix comment error

    mark committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    e7ea913 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #249 from Markliang1994/master

    fix comment error in Atomic.h
    chenshuo authored Jan 5, 2017
    Configuration menu
    Copy the full SHA
    8973d8f View commit details
    Browse the repository at this point in the history
Loading