Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Change how input/logging threads set their name.
  Fix bug when clearing Bloom filter contents.
This commit is contained in:
Robin Sommer 2014-04-17 17:48:17 -05:00
commit 1ef4daf0a7
9 changed files with 17 additions and 20 deletions

View file

@ -197,10 +197,6 @@ protected:
*/
virtual void Heartbeat();
/** Internal heartbeat processing. Called from child.
*/
void HeartbeatInChild();
/** Returns true if a child command has reported a failure. In that case, we'll
* be in the process of killing this thread and no further activity
* should carried out. To be called only from this child thread.