Repository: trafficserver Updated Branches: refs/heads/6.0.x 22e3282c8 -> a0b75bc8e
Revert "TS-3503: updated CHANGES" This reverts commit 46b4daa557026f84c7d93e2ba2bd0de016171e14. (cherry picked from commit bb6f9f34b381b38c2c918ea695cab7741c3c82c0) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a0b75bc8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a0b75bc8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a0b75bc8 Branch: refs/heads/6.0.x Commit: a0b75bc8e994c480a1cc151790cc1c20eb4d938d Parents: 22e3282 Author: Bryan Call <[email protected]> Authored: Fri Jul 17 22:39:20 2015 +0200 Committer: Bryan Call <[email protected]> Committed: Fri Jul 17 22:41:28 2015 +0200 ---------------------------------------------------------------------- proxy/logging/LogObject.cc | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a0b75bc8/proxy/logging/LogObject.cc ---------------------------------------------------------------------- diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc index be65070..3a26962 100644 --- a/proxy/logging/LogObject.cc +++ b/proxy/logging/LogObject.cc @@ -383,7 +383,6 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed) LogBuffer *buffer; LogBuffer *new_buffer; bool retry = true; - uint32_t count = 0; do { // To avoid a race condition, we keep a count of held references in @@ -391,7 +390,6 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed) head_p h; int result = 0; do { - ++count; INK_QUEUE_LD(h, m_log_buffer); head_p new_h; SET_FREELIST_POINTER_VERSION(new_h, FREELIST_POINTER(h), FREELIST_VERSION(h) + 1); @@ -490,9 +488,6 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed) if (result_code == LogBuffer::LB_BUFFER_TOO_SMALL) { buffer = NULL; } - if (count > 1) { - Error("spinning too much in logging %d", count); - } return buffer; }
